beaker-puppet_install_helper 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3d3a1e3151b4148cdb24e298c8e89ad4d0e6cf
-  data.tar.gz: f200b28636bf0f7e4fae22c56255d82155183b4b
+  metadata.gz: 86bc47a968d6ea84a458a08390c720a2364d196d
+  data.tar.gz: d5d09f0f78c80e1c6c45189d4d9e6675be768544
 SHA512:
-  metadata.gz: d5ee9086a1545129ed9e0aea4b3c3eb1c687fa6381197f102a251162d33b4dbbf1224813c408588701d6c192ac0d8b16a171b8c2898b0bb9b9f756eba9bee4ea
-  data.tar.gz: ce04589ec9651e3acb833cb9e958fd90ab93456da26509614e36933f82891b20b5d656f6e45c03b7c9940a581eac0873defff92ee327de208ff7e92e42fa5daf
+  metadata.gz: 697bd7bb1d43090f83bdfaa6b98adccddfd53f6d723d20de6690763c3cc395cc9fd914a1a555cc67045e08418c1bc3a38f210432470db4ddf89757860a9538f5
+  data.tar.gz: 33b6b68a7eb197e00323474dbef24b7447871decb3e76c58d3e96d90b353458b3219a3e80a8550e78478ced74d3b1202d4f53ad4be5a6cb60ae1a17c14eb13d2

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.4.3'
+  s.version     = '0.4.4'
   s.authors     = ["Puppetlabs"]
   s.email       = ["hunter@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-puppet_install_helper"

data/lib/beaker/ca_cert_helper.rb

@@ -19,15 +19,13 @@ module Beaker::CaCertHelper
   ##
   def install_ca_certs_on(hosts)
     [hosts].flatten.each do |host|
-      if host['pe_ver'] and version_is_less(host['pe_ver'], '4.0.0')
-        get_cert_hash.each do |cert_name, ca|
-          if host['platform'] =~ /windows/i
-            create_cert_on_host(host, cert_name, ca)
-            add_windows_cert host, cert_name
-          elsif host['platform'] =~ /solaris/i
-            create_cert_on_host(host, cert_name, ca)
-            add_solaris_cert host, cert_name
-          end
+      get_cert_hash.each do |cert_name, ca|
+        if host['platform'] =~ /windows/i
+          create_cert_on_host(host, cert_name, ca)
+          add_windows_cert host, cert_name
+        elsif host['platform'] =~ /solaris/i and host['pe_ver'] and version_is_less(host['pe_ver'], '4.0.0')
+          create_cert_on_host(host, cert_name, ca)
+          add_solaris_cert host, cert_name
         end
       end
     end

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -56,6 +56,8 @@ describe 'beaker::puppet_install_helper' do
         win_hosts = [ w2k3 ]
         expect(subject).to receive(:default).and_return(double(:is_pe? => true))
         expect(subject).to receive(:install_pe_on).with([w2k3.merge({'install_32' => true})], {"pe_ver" => nil})
+        expect(subject).to receive(:create_cert_on_host).exactly(3).times
+        expect(subject).to receive(:add_windows_cert).exactly(3).times
         subject.run_puppet_install_helper_on(win_hosts)
       end
       it "uses PE by default for PE nodes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec