run acceptance tests also for newer puppet versions (#220)

* run acceptance tests also for newer puppet versions

reusing the PUPPET_GEM_VERSION environment variable which is also taken
for rspec-puppet.

* switch from PUPPET_GEM_VERSION to installed puppet version

* remove pry

* smarter handling of installing specific puppet versions

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 * Your contribution here.
 
+* [#220](https://github.com/example42/psick/pull/220): Run acceptance tests also for newer puppet versions - [@tuxmea](https://github.com/tuxmea).
+
 ## Release 0.9.2 - Second alpha for version 1.0.0
 * Updated docs to reflect new separated psick module layout [@alvagante](https://github.com/alvagante)
 * Several fixes to data and samples [@alvagante](https://github.com/alvagante)

spec/spec_helper_acceptance.rb

@@ -1,10 +1,24 @@
 require 'beaker-rspec'
 require 'beaker-hiera'
 require 'beaker/puppet_install_helper'
+begin
+  require 'puppet'
+rescue TypeError
+end
 
 hosts.each do |host|
   # Install Puppet
-  install_puppet_agent_on(host)
+  # check for puppet version
+  case Puppet.version.to_i
+  when 4
+    version_to_install = '1.' + Puppet.version.split('.')[1..-1]*"."
+    install_puppet_agent_on(host, {:version => version_to_install})
+  when 5
+    install_puppet_agent_on(host, {:version => Puppet.version,:puppet_collection => 'puppet5'})
+  else
+    puts 'unsupported puppet version'
+    exit
+  end
 end
 
 RSpec.configure do |c|