Skip to content

Commit 69449e9

Browse files
bastelfreakbastelfreak
committed
modulesync 2.7.0
1 parent bd2a571 commit 69449e9

6 files changed

Lines changed: 22 additions & 91 deletions

File tree

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.5.1'
1+
modulesync_config_version: '2.7.0'

‎.travis.yml‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ dist: xenial
33
language: ruby
44
cache: bundler
55
before_install:
6-
- sh ./.travis/setup.sh
6+
- gem update --system
7+
- gem update bundler
8+
- bundle --version
79
script:
810
- 'bundle exec rake $CHECK'
911
matrix:
@@ -61,11 +63,6 @@ matrix:
6163
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
6264
script: bundle exec rspec spec/acceptance/php56_spec.rb
6365
services: docker
64-
- rvm: 2.5.3
65-
bundler_args: --without development release
66-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
67-
script: bundle exec rspec spec/acceptance/php56_spec.rb
68-
services: docker
6966
- rvm: 2.5.3
7067
bundler_args: --without development release
7168
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -76,11 +73,6 @@ matrix:
7673
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
7774
script: bundle exec rspec spec/acceptance/php_spec.rb
7875
services: docker
79-
- rvm: 2.5.3
80-
bundler_args: --without development release
81-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
82-
script: bundle exec rspec spec/acceptance/php_spec.rb
83-
services: docker
8476
- rvm: 2.5.3
8577
bundler_args: --without development release
8678
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
@@ -94,53 +86,12 @@ matrix:
9486
- rvm: 2.5.3
9587
bundler_args: --without development release
9688
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
89+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
9790
script: bundle exec rspec spec/acceptance/php_spec.rb
9891
services: docker
9992
- rvm: 2.5.3
10093
bundler_args: --without development release
101-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
102-
script: bundle exec rspec spec/acceptance/php_spec.rb
103-
services: docker
104-
- rvm: 2.5.3
105-
bundler_args: --without development release
106-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
107-
script: bundle exec rspec spec/acceptance/php_spec.rb
108-
services: docker
109-
- rvm: 2.5.3
110-
bundler_args: --without development release
111-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
112-
script: bundle exec rspec spec/acceptance/php_spec.rb
113-
services: docker
114-
- rvm: 2.5.3
115-
bundler_args: --without development release
116-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
117-
script: bundle exec rspec spec/acceptance/php_spec.rb
118-
services: docker
119-
- rvm: 2.5.3
120-
bundler_args: --without development release
121-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
122-
script: bundle exec rspec spec/acceptance/php_spec.rb
123-
services: docker
124-
- rvm: 2.5.3
125-
bundler_args: --without development release
126-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
127-
script: bundle exec rspec spec/acceptance/php_spec.rb
128-
services: docker
129-
- rvm: 2.5.3
130-
bundler_args: --without development release
131-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
132-
script: bundle exec rspec spec/acceptance/php_spec.rb
133-
services: docker
134-
- rvm: 2.5.3
135-
bundler_args: --without development release
136-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
137-
script: bundle exec rspec spec/acceptance/php_spec.rb
138-
services: docker
139-
- rvm: 2.5.3
140-
bundler_args: --without development release
141-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
142-
script: bundle exec rspec spec/acceptance/php_spec.rb
143-
services: docker
94+
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
14495
branches:
14596
only:
14697
- master

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.1
1+
FROM ruby:2.5.3
22

33
WORKDIR /opt/puppet
44

‎Gemfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
14+
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
1515
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
1616
gem 'rspec-puppet-utils', :require => false
1717
gem 'puppet-lint-leading_zero-check', :require => false
@@ -20,6 +20,7 @@ group :test do
2020
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
2121
gem 'puppet-lint-unquoted_string-check', :require => false
2222
gem 'puppet-lint-variable_contains_upcase', :require => false
23+
gem 'puppet-lint-absolute_classname-check', :require => false
2324
gem 'metadata-json-lint', :require => false
2425
gem 'redcarpet', :require => false
2526
gem 'rubocop', '~> 0.49.1', :require => false
@@ -64,7 +65,7 @@ group :release do
6465
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/github-changelog-generator/github-changelog-generator'
6566
gem 'puppet-blacksmith', :require => false
6667
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
67-
gem 'puppet-strings', '>= 1.0', :require => false
68+
gem 'puppet-strings', '>= 2.2', :require => false
6869
end
6970

7071

‎Rakefile‎

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
33
# load optional tasks for releases
44
# only available if gem group releases is installed
55
begin
6-
require 'puppet_blacksmith/rake_tasks'
76
require 'voxpupuli/release/rake_tasks'
8-
require 'puppet-strings/tasks'
97
rescue LoadError
108
end
119

1210
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
13-
PuppetLint.configuration.fail_on_warnings = true
14-
PuppetLint.configuration.send('relative')
15-
PuppetLint.configuration.send('disable_140chars')
16-
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
17-
PuppetLint.configuration.send('disable_documentation')
18-
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
11+
PuppetLint.configuration.absolute_classname_reverse = true
1912

2013
exclude_paths = %w(
2114
pkg/**/*
@@ -28,19 +21,16 @@ PuppetSyntax.exclude_paths = exclude_paths
2821

2922
desc 'Auto-correct puppet-lint offenses'
3023
task 'lint:auto_correct' do
31-
PuppetLint.configuration.fix = true
32-
Rake::Task[:lint].invoke
24+
Rake::Task[:lint_fix].invoke
3325
end
3426

3527
desc 'Run acceptance tests'
3628
RSpec::Core::RakeTask.new(:acceptance) do |t|
3729
t.pattern = 'spec/acceptance'
3830
end
3931

40-
desc 'Run tests release_checks'
41-
task test: [
42-
:release_checks,
43-
]
32+
desc 'Run tests'
33+
task test: [:release_checks]
4434

4535
namespace :check do
4636
desc 'Check for trailing whitespace'
@@ -69,25 +59,10 @@ task test_with_coveralls: [:test] do
6959
end
7060
end
7161

72-
desc "Print supported beaker sets"
73-
task 'beaker_sets', [:directory] do |t, args|
74-
directory = args[:directory]
75-
76-
metadata = JSON.load(File.read('metadata.json'))
77-
78-
(metadata['operatingsystem_support'] || []).each do |os|
79-
(os['operatingsystemrelease'] || []).each do |release|
80-
if directory
81-
beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
82-
else
83-
beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
84-
end
85-
86-
filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
87-
88-
puts beaker_set if File.exists? filename
89-
end
90-
end
62+
desc 'Generate REFERENCE.md'
63+
task :reference, [:debug, :backtrace] do |t, args|
64+
patterns = ''
65+
Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
9166
end
9267

9368
begin

‎spec/spec_helper.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# This file is managed via modulesync
22
# https://github.com/voxpupuli/modulesync
33
# https://github.com/voxpupuli/modulesync_config
4+
RSpec.configure do |c|
5+
c.mock_with :rspec
6+
end
7+
48
require 'puppetlabs_spec_helper/module_spec_helper'
59
require 'rspec-puppet-facts'
610
include RspecPuppetFacts

0 commit comments

Comments
 (0)