Merge pull request #17 from mhaskel/puppet_install_helper

Switch to using puppet_install_helper to support AIO testing

Gemfile

@@ -1,16 +1,17 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec',                   :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec', '>= 2.2',  :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
+  gem 'rake',                         :require => false
+  gem 'rspec',                        :require => false
+  gem 'rspec-puppet',                 :require => false
+  gem 'puppetlabs_spec_helper',       :require => false
+  gem 'serverspec',                   :require => false
+  gem 'puppet-lint',                  :require => false
+  gem 'beaker',                       :require => false
+  gem 'beaker-rspec', '>= 2.2',       :require => false
+  gem 'pry',                          :require => false
+  gem 'simplecov',                    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']

spec/spec_helper_acceptance.rb

@@ -1,18 +1,10 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
+require 'beaker/puppet_install_helper'
 
 unless ENV['RS_PROVISION'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
-
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
+  run_puppet_install_helper
   hosts.each do |host|
-    if host['platform'] =~ /debian/
-      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
     on host, "gem install hocon"
   end
 end