From 9699b42d976256b460dbd67cc8b7249912ba26d9 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 7 May 2015 09:48:33 -0700
Subject: [PATCH] Add gem to sync.yml

---
 .sync.yml   | 20 +++++++++++++++++---
 .travis.yml |  6 +++---
 Gemfile     | 18 +-----------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 59b44a0..3c87782 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -2,10 +2,24 @@
 .travis.yml:
   includes:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" ORDERING="random"
+Gemfile:
+  required:
+    ':development, :unit_tests':
+      - gem: rspec-puppet
+        version: '~> 2.1'
+      - gem: rspec-core
+        version: '3.1.7'
+      - gem: puppetlabs_spec_helper
+      - gem: simplecov
+      - gem: puppet_facts
+      - gem: json
+    ':system_tests':
+      - gem: beaker-rspec
+      - gem: serverspec
diff --git a/.travis.yml b/.travis.yml
index 76217a1..a4bcba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,11 @@ matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" ORDERING="random"
 notifications:
diff --git a/Gemfile b/Gemfile
index 2b1b7cd..9f4f7b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,23 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
-  gem 'rspec-core', '3.1.7',     :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'simplecov',               :require => false
-  gem 'puppet_facts',            :require => false
-  gem 'json',                    :require => false
-end
-
-group :system_tests do
-  if beaker_version = ENV['BEAKER_VERSION']
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
-    gem 'beaker-rspec', *location_for(beaker_rspec_version)
-  else
-    gem 'beaker-rspec',  :require => false
-  end
-  gem 'serverspec',    :require => false
+  gem 'rspec-puppet', '~> 2.1',  :require => false
 end
 
 
-- 
2.45.2