Merge pull request puppetlabs#480 from mhaskel/spec_updates

Update spec_helper for more consistency

Author: hunner

spec/spec_helper_acceptance.rb

@@ -35,11 +35,12 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0,1], &block)
 end
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
+  # 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
+
   hosts.each do |host|
     shell("mkdir -p #{host['distmoduledir']}")
     if ! host.is_pe?