Merge pull request #22 from jhoblitt/feature/future_parser

add future parser to travis matrix
jhoblitt · Nov 18, 2014 · 62f74d6 · 62f74d6
2 parents aaa9adc + 37d72d4
commit 62f74d6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,21 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.4
 env:
-  - PUPPET_GEM_VERSION="2.7.14"
   - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION="~> 3.3"
+  - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
 matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="2.7.14"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="2.7.14"
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7"
     - rvm: 2.0.0
       env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: 2.1.4
+      env: PUPPET_GEM_VERSION="~> 2.7"
+  fast_finish: true
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -6,11 +6,16 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake',                    :require => false
-gem 'puppetlabs_spec_helper',  :require => false
-gem 'puppet-lint',             :require => false
-gem 'puppet-syntax',           :require => false
-gem 'rspec-puppet',            :require => false
+gem 'rake',                   :require => false
+gem 'puppetlabs_spec_helper', :require => false
+gem 'puppet-lint',            :require => false
+gem 'puppet-syntax',          :require => false
+gem 'rspec-puppet',
+  :git => 'https://github.com/rodjek/rspec-puppet.git',
+  :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
+  :require => false
+# rspec 3 spews warnings with rspec-puppet 1.0.1
+# gem 'rspec-core', '~> 2.0',   :require => false
 gem 'beaker',                  :require => false
 gem 'beaker-rspec',            :require => false
 gem 'serverspec',              :require => false