Merge pull request #50 from HAIL9000/maint/master/please_let_this_end

(maint) Correct gem installation conditional
puppetlabs · Nov 14, 2016 · bcae16d · bcae16d
2 parents be6d43c + cba035b
commit bcae16d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -7,9 +7,9 @@
   hosts.each do |host|
     puppet_version = (on default, puppet('--version')).output.chomp
 
-    if ENV['PUPPET_INSTALL_TYPE'] == 'pe' && Gem::Version.new(puppet_version) < Gem::Version.new('4.0.0')
+    if Gem::Version.new(puppet_version).to_s =~ /Puppet Enterprise /
       on host, puppet('resource package hocon provider=pe_gem')
-    elsif Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0')
+    elsif ENV['PUPPET_INSTALL_TYPE'] != 'foss' && Gem::Version.new(puppet_version) >= Gem::Version.new('4.0.0')
       on host, puppet('resource package hocon provider=puppet_gem')
     else
       on host, puppet('resource package hocon provider=gem')