X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fconcat%2FGemfile;h=cc4048aec40175547d9c697de74b570d1f89bf40;hb=917f80937c03a7f486d25fa70373f1f4d4b02958;hp=5eb00e1df9c7f3cf0171f50c9a907c4930e3c15b;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/concat/Gemfile b/3rdparty/modules/concat/Gemfile
index 5eb00e1df..cc4048aec 100644
--- a/3rdparty/modules/concat/Gemfile
+++ b/3rdparty/modules/concat/Gemfile
@@ -11,20 +11,23 @@ def location_for(place, fake_version = nil)
 end
 
 group :development, :unit_tests do
+  gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 2.0',  :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
-  gem 'pry'
 end
 
+beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  if beaker_version = ENV['BEAKER_VERSION']
+  if beaker_version
     gem 'beaker', *location_for(beaker_version)
   end
-  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+  if beaker_rspec_version
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
@@ -32,16 +35,14 @@ group :system_tests do
   gem 'serverspec',    :require => false
 end
 
-
-
 if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
+  gem 'facter', *location_for(facterversion)
 else
   gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
+  gem 'puppet', *location_for(puppetversion)
 else
   gem 'puppet', :require => false
 end