From 1089bf192413a9b6f64d1087cc623d6532477337 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Thu, 19 Mar 2015 16:22:07 -0700
Subject: Unpin rspec-puppet and remove unneeded deps

puppetlabs_spec_helper takes care of these for us.
---
 Gemfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 62c5693..cc77f38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,8 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
-  gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
-- 
cgit v1.2.3


From 6ec1fc6a118579c4983aecf5275dbfdd00f59392 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 23 Mar 2015 12:04:20 -0700
Subject: Keep testing on puppet 2.7

The modulesync config repo is dropping universal support for puppet
2.7, but individual repos should still keep support until the next
naturally-occuring major release.
---
 .sync.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.sync.yml b/.sync.yml
index 6fa460a..02c6c83 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,6 +1,11 @@
 ---
 .travis.yml:
   script: "\"bundle exec rake spec SPEC_OPTS='--format documentation'\""
+  extras:
+  - 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"
 Rakefile:
   unmanaged: true
 spec/spec_helper.rb:
-- 
cgit v1.2.3


From 7dc0025a0c8f3ddea12bf642a69a62e22daef071 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Mon, 23 Mar 2015 12:30:36 -0700
Subject: Update .travis.yml

This commit makes the following changes to the test matrix:

- Runs tests on ruby 2.1.5 instead of 2.0.0
- Runs tests on ruby 1.8.7 with puppet 3.x
- Adds an environment to run on an intermediate 3.x puppet version
  instead of latest (specifically 3.4.x)
- Adds an environment to run with the future parser on latest puppet.
  This would affect the test runs for the validate and spec checks.
- Runs the tests on docker
---
 .travis.yml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8cfaf23..0fc75e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,28 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - 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"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - 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"
 notifications:
   email: false
-- 
cgit v1.2.3