Merge pull request #791 from voxpupuli/modulesync

modulesync 2.7.0

.github/CONTRIBUTING.md

@@ -51,19 +51,19 @@ You can install all needed gems for spec tests into the modules directory by
 running:
 
 ```sh
-bundle install --path .vendor/ --without development --without system_tests --without release
+bundle install --path .vendor/ --without development system_tests release
 ```
 
 If you also want to run acceptance tests:
 
 ```sh
-bundle install --path .vendor/ --without development --with system_tests --without release
+bundle install --path .vendor/ --with system_tests --without development release
 ```
 
 Our all in one solution if you don't know if you need to install or update gems:
 
 ```sh
-bundle install --path .vendor/ --without development --with system_tests --without release; bundle update; bundle clean
+bundle install --path .vendor/ --with system_tests --without development release; bundle update; bundle clean
 ```
 
 ## Syntax and style

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.5.1'
+modulesync_config_version: '2.7.0'

.travis.yml

@@ -3,7 +3,9 @@ dist: xenial
 language: ruby
 cache: bundler
 before_install:
- - sh ./.travis/setup.sh
+ - gem update --system
+ - gem update bundler
+ - bundle --version
 script:
  - 'bundle exec rake $CHECK'
 matrix:
@@ -25,109 +27,58 @@ matrix:
  bundler_args: --without development release
  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
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- 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
- services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- 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
- services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
- services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- 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
- services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.1
+ - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.1
- bundler_args: --without development release
- 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
- services: docker
- sudo: required
- - rvm: 2.5.1
+ - rvm: 2.5.3
  bundler_args: --without development release
  env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker
- services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
  - rvm: 2.5.3
  bundler_args: --without development release
  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
  services: docker
- sudo: required
- - rvm: 2.5.3
- bundler_args: --without development release
- 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
- services: docker
- sudo: required
- allow_failures:
- - env: BEAKER_PUPPET_COLLECTION=puppet6-nightly
 branches:
  only:
  - master

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.5.3
 
 WORKDIR /opt/puppet
 

Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
- gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
+ gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
  gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
  gem 'rspec-puppet-utils', :require => false
  gem 'puppet-lint-leading_zero-check', :require => false
@@ -20,6 +20,7 @@ group :test do
  gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
  gem 'puppet-lint-unquoted_string-check', :require => false
  gem 'puppet-lint-variable_contains_upcase', :require => false
+ gem 'puppet-lint-absolute_classname-check', :require => false
  gem 'metadata-json-lint', :require => false
  gem 'redcarpet', :require => false
  gem 'rubocop', '~> 0.49.1', :require => false
@@ -64,7 +65,7 @@ group :release do
  gem 'github_changelog_generator', :require => false, :git => 'https:/github-changelog-generator/github-changelog-generator'
  gem 'puppet-blacksmith', :require => false
  gem 'voxpupuli-release', :require => false, :git => 'https:/voxpupuli/voxpupuli-release-gem'
- gem 'puppet-strings', '>= 1.0', :require => false
+ gem 'puppet-strings', '>= 2.2', :require => false
 end
 
 

Rakefile

@@ -3,19 +3,12 @@ require 'puppetlabs_spec_helper/rake_tasks'
 # load optional tasks for releases
 # only available if gem group releases is installed
 begin
- require 'puppet_blacksmith/rake_tasks'
  require 'voxpupuli/release/rake_tasks'
- require 'puppet-strings/tasks'
 rescue LoadError
 end
 
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_140chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.absolute_classname_reverse = true
 
 exclude_paths = %w(
  pkg/**/*
@@ -28,19 +21,16 @@ PuppetSyntax.exclude_paths = exclude_paths
 
 desc 'Auto-correct puppet-lint offenses'
 task 'lint:auto_correct' do
- PuppetLint.configuration.fix = true
- Rake::Task[:lint].invoke
+ Rake::Task[:lint_fix].invoke
 end
 
 desc 'Run acceptance tests'
 RSpec::Core::RakeTask.new(:acceptance) do |t|
  t.pattern = 'spec/acceptance'
 end
 
-desc 'Run tests release_checks'
-task test: [
- :release_checks,
-]
+desc 'Run tests'
+task test: [:release_checks]
 
 namespace :check do
  desc 'Check for trailing whitespace'
@@ -69,25 +59,10 @@ task test_with_coveralls: [:test] do
  end
 end
 
-desc "Print supported beaker sets"
-task 'beaker_sets', [:directory] do |t, args|
- directory = args[:directory]
-
- metadata = JSON.load(File.read('metadata.json'))
-
- (metadata['operatingsystem_support'] || []).each do |os|
- (os['operatingsystemrelease'] || []).each do |release|
- if directory
- beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
- else
- beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
- end
-
- filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
-
- puts beaker_set if File.exists? filename
- end
- end
+desc 'Generate REFERENCE.md'
+task :reference, [:debug, :backtrace] do |t, args|
+ patterns = ''
+ Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace])
 end
 
 begin

examples/repo/apt.pp

@@ -1,2 +1,2 @@
 # requires pupetlabs-apt
-include ::rabbitmq::repo::apt
+include rabbitmq::repo::apt