From d5daf1e6c14d7ed64ea54ff6ad45bb38294b90b3 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <josh@hoblitt.com>
Date: Mon, 17 Nov 2014 23:45:42 -0700
Subject: [PATCH] add future parser to travis matrix

---
 .travis.yml | 12 +++++-------
 Gemfile     | 14 ++++++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9322f7..35b84bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,23 @@
 language: ruby
 rvm:
-  # Workaround for travis-ci/travis-ci#2217, we support 1.8.7 MRI generally
-  - 1.8.7-p374
+  - 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
index f22caae..e1d4000 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,15 @@ 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 '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
 
 # vim:ft=ruby