From 8524a17e0f51a36c6c7b518bb41f8bb80c2c96dd Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Thu, 12 Feb 2015 11:19:53 -0800
Subject: Fix Travis builds

The release of rspec 3.2.0 broke a lot of tests. Pinning to rspec 3.1.0
provides a temporary fix.
---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index 74a16f3..e2cd97d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,7 @@ end
 
 group :development, :unit_tests do
   gem 'rake', '~> 10.1.0',       :require => false
+  gem 'rspec', '~> 3.1.0',       :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
-- 
cgit v1.2.3


From f9855d99ec117d336aa3860e2118f29ddfd10c35 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Thu, 12 Feb 2015 11:43:34 -0800
Subject: Have Travis actually test Facter 1.6/1.7

The Gemfile didn't actually specify which version to use for Facter,
even when there was an environment variable to that effect.
---
 Gemfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index e2cd97d..fa2a31c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,8 +25,14 @@ group :system_tests do
   gem 'serverspec',              :require => false
 end
 
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
+facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
+if facterversion
+  gem 'facter', *location_for(facterversion)
+else
+  gem 'facter', :require => false
+end
+
+puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
 if puppetversion
   gem 'puppet', *location_for(puppetversion)
 else
-- 
cgit v1.2.3