Puppet5

.fixtures.yml

@@ -1,5 +1,7 @@
 fixtures:
   repositories:
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdlib:
+      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.16.0'
   symlinks:
     sssd: "#{source_dir}"

.travis.yml

@@ -1,26 +1,6 @@
 ---
 language: ruby
 
-rvm:
-  - 2.1.9
-  - 2.3.1
-
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 4.0.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.1.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.2.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.3.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.4.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.5.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.5.0" CHECK=build DEPLOY_TO_FORGE=yes
-    - PUPPET_GEM_VERSION="~> 4.6.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.7.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.8.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.9.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4.10.0" CHECK=test
-    - PUPPET_GEM_VERSION="~> 4" CHECK=test
-
 sudo: false
 
 bundler_args: '--without system_tests development'
@@ -29,9 +9,24 @@ script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'
 
 matrix:
   fast_finish: true
-  exclude:
-    - rvm: 2.3.1
-      env: PUPPET_GEM_VERSION="~> 4.5.0" CHECK=build DEPLOY_TO_FORGE=yes
+  include:
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.6.0" CHECK=test
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.7.0" CHECK=test
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.8.0" CHECK=test
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.9.0" CHECK=test
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.10.0" CHECK=test
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.10.0" CHECK=build DEPLOY_TO_FORGE=yes
+  - rvm: 2.4.1
+    env: PUPPET_GEM_VERSION="~> 5.1.0" CHECK=test
+  - rvm: 2.4.1
+    env: PUPPET_GEM_VERSION="~> 5" CHECK=test
+
 
 notifications:
   email: false

Gemfile

@@ -1,5 +1,17 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
+if (facterversion = ENV['FACTER_GEM_VERSION'])
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
+if (puppetversion = ENV['PUPPET_GEM_VERSION'])
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
 group :unit_tests do
   gem 'puppet-lint-absolute_classname-check',             :require => false
   gem 'puppet-lint-absolute_template_path',               :require => false
@@ -19,11 +31,6 @@ group :unit_tests do
   gem 'rspec-puppet-facts',                               :require => false
 end
 
-gem 'json', '<= 1.8', :require => false               if RUBY_VERSION < '2.0.0'
-gem 'json_pure', '<= 2.0.1', :require => false        if RUBY_VERSION < '2.0.0'
-gem 'rake', '~> 10.0', :require => false              if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
-gem 'rspec', '~> 2.0', :require => false              if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
-
 group :development do
   gem 'simplecov', :require => false
   # gem 'guard-rake',       :require => false
@@ -35,30 +42,12 @@ group :system_tests do
   gem 'serverspec', :require => false
 end
 
-if (facterversion = ENV['FACTER_GEM_VERSION'])
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if (puppetversion = ENV['PUPPET_GEM_VERSION'])
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', '~> 4.9', :require => false
-end
-
-if RUBY_VERSION < '1.9'
-  gem 'metadata-json-lint', '0.0.11', :require => false
-  gem 'public_suffix',                :require => false
-else
-  gem 'metadata-json-lint',           :require => false
-  gem 'public_suffix', '1.4.6',        :require => false
+if puppetversion && puppetversion < '5.0'
+  gem 'semantic_puppet', :require => false
 end
 
-if RUBY_VERSION < '2.1.0'
-  # nokogiri 1.7+ requires ruby >= 2.1.0.  Lock to 1.6
-  gem 'nokogiri', '~> 1.6.8', :require => false
-end
+gem 'metadata-json-lint',           :require => false
+gem 'public_suffix', '1.4.6',        :require => false
 
 if RUBY_VERSION < '2.2.5'
   # beaker 3.1+ requires ruby 2.2.5.  Lock to 2.0

Rakefile

@@ -13,6 +13,7 @@ exclude_paths = [
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths

metadata.json

@@ -35,9 +35,9 @@
     }
   ],
   "requirements": [
-    {"name":"puppet","version_requirement":">= 4.0.0 < 5.0.0" }
+    {"name":"puppet","version_requirement":">= 4.0.0 < 6.0.0" }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0 < 5.0.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.16.0 < 5.0.0"}
   ]
 }