Numerous changes to update testing gems.

This work updates a number of Gems to the latest versions (rspec,
rspec-puppet), and updates and tweaks a bunch of tests to work
with the updated gems.

1 files changed, 15 insertions, 35 deletions

diff --git a/Gemfile b/Gemfile
index 75c7d85..3d6d5ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,44 +1,24 @@
-source "https://rubygems.org"
-
-def location_for(place, fake_version = nil)
-  mdata = /^(git:[^#]*)#(.*)/.match(place)
-  if mdata
-    [fake_version, { :git => mdata[1], :branch => mdata[2], :require => false }].compact
-  elsif mdata = /^file:\/\/(.*)/.match(place)
-    ['>= 0', { :path => File.expand_path(mdata[1]), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-group :development do
-  gem 'watchr'
-end
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :development, :test do
-  gem 'rake'
-  gem 'puppetmodule-stdlib', ">= 1.0.0", :path => File.expand_path("..", __FILE__)
-  gem 'rspec', "~> 2.11.0", :require => false
-  gem 'mocha', "~> 0.10.5", :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', "~> 0.1.6", :require => false
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'rspec-system',            :require => false
+  gem 'rspec-system-puppet',     :require => false
+  gem 'rspec-system-serverspec', :require => false
+  gem 'serverspec',              :require => false
+  gem 'puppet-lint',             :require => false
+  gem 'pry',                     :require => false
+  gem 'simplecov',               :require => false
+  gem 'beaker',                  :require => false
+  gem 'beaker-rspec',            :require => false
 end
 
-facterversion = ENV['GEM_FACTER_VERSION']
-if facterversion
-  gem 'facter', *location_for(facterversion)
-else
-  gem 'facter', :require => false
-end
-
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
-if puppetversion
-  gem 'puppet', *location_for(puppetversion)
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end
 
-gem 'puppet-lint', '>= 0.3.2'
-
 # vim:ft=ruby