Merge pull request #154 from solarkennedy/updated_gemfile_for_beaker

Update the gemfile, hopefully to something beaker and puppet-rspec can tolerate

.gitignore

@@ -3,3 +3,4 @@ pkg
 spec/fixtures
 .rspec_system
 Gemfile.lock
+log/

.travis.yml

@@ -4,16 +4,16 @@ bundler_args: --without development
 before_install: rm Gemfile.lock || true
 sudo: false
 rvm:
-  - 1.8.7
+#  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
 script: bundle exec rake test
 env:
-  - PUPPET_VERSION="~> 2.7.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.1.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.3.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes
+#  - PUPPET_VERSION="~> 2.7.0"
+  - PUPPET_VERSION="~> 3.1.0"
+  - PUPPET_VERSION="~> 3.3.0"
+  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
 matrix:

Gemfile

@@ -1,23 +1,27 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
+
+group :development do
+  gem "beaker", "> 2.0.0"
+  gem "beaker-rspec", ">= 5.1.0"
+  gem "pry"
+  gem "puppet-blacksmith"
+  gem "serverspec"
+  gem "vagrant-wrapper"
+end
 
 group :test do
+  gem "json"
   gem "rake"
-  gem 'beaker', '~> 1.11.0'
-  gem "retriable", '~> 1.4.1'
-  gem "rest-client", '<= 1.7.0'
-  gem "puppet-blacksmith", '~> 2.3.1'
-  gem "puppet", '~> 3.7.0'
+  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
   gem "puppet-lint"
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "rspec", '~> 3.1.0'
-  gem "rspec-core", '~> 3.1.7'
+
+  # Pin for 1.8.7 compatibility for now
+  gem "rspec", '< 3.2.0'
+  gem "rspec-core", "3.1.7"
+  gem "rspec-puppet", "~> 2.1"
+
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"
+  gem "hiera"
   gem "hiera-puppet-helper"
-  gem "nokogiri", '~> 1.5.10'
-end
-
-group :development do
-  gem 'json'
-  gem 'beaker-rspec'
 end