Merge pull request #17 from mmckinst/puppet4

add official puppet 4 support
voxpupuli · Feb 25, 2016 · 1a379a9 · 1a379a9
2 parents f7b7fcd + c0a0acb
commit 1a379a9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 404 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ spec/fixtures
 .bundle
 vendor
 .ruby-version
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -7,32 +7,52 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
 script: bundle exec rake test
 env:
-  - PUPPET_VERSION="~> 2.7.0"
   - PUPPET_VERSION="~> 3.2.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.4.0"
   - PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
+  - PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
 matrix:
   exclude:
-  # Ruby 1.9.3
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
-
-  # Ruby 2.0.0
-  - rvm: 2.0.0
-    env: PUPPET_VERSION="~> 2.7.0"
+  # ruby 2.2.0
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.2.0"
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.3.0"
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.4.0"
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
+  - rvm: 2.2.0
+    env: PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes
 
-  # Ruby 2.1.0
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 2.7.0"
+  # ruby 2.1.0
   - rvm: 2.1.0
     env: PUPPET_VERSION="~> 3.2.0"
   - rvm: 2.1.0
     env: PUPPET_VERSION="~> 3.3.0"
   - rvm: 2.1.0
     env: PUPPET_VERSION="~> 3.4.0"
+
+  # ruby 1.8.7
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,8 @@ group :test do
   gem "rake"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
   gem "rspec", '< 3.2.0'
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "puppetlabs_spec_helper"
+  gem "rspec-puppet", '>= 2.1.0'
+  gem "puppetlabs_spec_helper", '>= 0.10'
   gem "metadata-json-lint"
   gem "rspec-puppet-facts"
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ spec/fixtures @@
     .bundle
     vendor
     .ruby-version
+    Gemfile.lock