From 2a77cafaeb64056df1dd4aeaba0f1b86000a0164 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Fri, 27 Jun 2014 09:33:10 -0700
Subject: [PATCH 1/3] Update .sync.yml to support new .travis.yml configs

---
 .sync.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index eda81b1d9..66a03c649 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,21 +1,3 @@
 ---
-.travis.yml:
-  env_matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-  excludes:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.1.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
 spec/spec_helper.rb:
   unmanaged: true

From 3a4bfb921c376278c2353bed280b041861a7c487 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Fri, 27 Jun 2014 10:54:56 -0700
Subject: [PATCH 2/3] Synchronize .travis.yml

---
 .travis.yml | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51529efea..c72d5e20f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,17 @@
 ---
-branches:
-  only:
-    - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
 matrix:
   fast_finish: true
-  exclude:
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.1.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false

From d7f0353587d78e6a55efd729c89ee154a53266f0 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 30 Jun 2014 10:57:55 -0700
Subject: [PATCH 3/3] Update Gemfile for .travis.yml defaults

---
 Gemfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 9074f1e75..e960f7c4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,12 @@ group :development, :test do
   gem 'simplecov',               :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else