Merge branch 'master' into fix_many_files_tidy

.travis.yml

@@ -5,7 +5,7 @@ cache: bundler
 before_install:
  - bundle -v
  - rm -f Gemfile.lock
- - gem update --system
+ - gem update --system $RUBYGEMS_VERSION
  - gem --version
  - bundle -v
 script:
@@ -26,9 +26,6 @@ matrix:
  -
  env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
  rvm: 2.4.4
- -
- env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
- rvm: 2.1.9
 branches:
  only:
  - master

Gemfile

@@ -21,7 +21,8 @@ group :development do
  gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
  gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
  gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
- gem "json", '<= 2.0.4', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.4.4')
+ gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+ gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
  gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby]
  gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]

metadata.json

@@ -68,7 +68,7 @@
  "version_requirement": ">= 4.2.1"
  }
  ],
- "pdk-version": "1.9.0.pre (heads/master-0-g24ff96b)",
+ "pdk-version": "1.9.0.pre (heads/master-0-g7b2950b)",
  "template-url": "https://github.com/puppetlabs/pdk-templates",
- "template-ref": "heads/master-0-gbf720df"
+ "template-ref": "heads/master-0-g7281db5"
 }

spec/spec_helper.rb

@@ -36,6 +36,9 @@
  # by default Puppet runs at warning level
  Puppet.settings[:strict] = :warning
  end
+ c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+ c.after(:suite) do
+ end
 end
 
 def ensure_module_defined(module_name)