Merge pull request #38 from jhoblitt/feature/puppet-4.0

Feature/puppet 4.0
jhoblitt · Apr 23, 2015 · 8422351 · 8422351
2 parents 456cf28 + e9a3823
commit 8422351
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,17 +7,12 @@ rvm:
   - 2.0
   - 2.1
 env:
-  - PUPPET_GEM_VERSION="~> 2.7"
-  - PUPPET_GEM_VERSION="~> 3.3"
-  - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
+  - PUPPET_GEM_VERSION="~> 3.7"
+  - PUPPET_GEM_VERSION="~> 4.0"
 matrix:
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.0
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.1
-      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.0"
   fast_finish: true
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,7 @@ group :development, :test do
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint', '>= 1.1.0', :require => false
   gem 'puppet-syntax',           :require => false
-  gem 'rspec-puppet', '~> 2.0.0', :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
 end
 
 group :beaker do