beaker-pe 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 472cb8527da6bbb6256c8342fff325b91dfe0d62
-  data.tar.gz: 75b005236142feec1df7954cac688d4d4f9f613c
+  metadata.gz: 50ab622f7e8f6f4242ce6616fc903c5ae81d2eef
+  data.tar.gz: 2f2484aa5fee75589d5d79658210b46ed0b7b3b4
 SHA512:
-  metadata.gz: 24d74792e19f75a3d33f30de4644878dcc742a00b872775c8e30965a891e86641a89fff1a106cdf0a6b8fd9260dfb886890c013ac908f55e609d709419d5e554
-  data.tar.gz: 05daf324e0665af413f85c35dbefc81e2cc1e310bfb734328f93adb02ba4298993f4c41843a299e41200f36040efa8b9dd6e6c1d82319c99110337b79ca73a8b
+  metadata.gz: a694aefb0b0c243400137e53086ba5dea4b68f6c57cb6419157955fe2fecf4e5a1a37145fef08236955141c8f7819b960abeeb1f1ee880a5f11ce44465c22651
+  data.tar.gz: 488cd674d291454079307b4751beede9b29287b0693f8cbd391e9a1349f5cc172f2e1fdb75f3c1432f5840e51686297fda786b1f92b90eb2d5b38fd29869869e

data/lib/beaker-pe/pe-client-tools/install_helper.rb

@@ -33,16 +33,17 @@ module Beaker
                 generic_install_msi_on(host, File.join(release_path, package_name), {}, {:debug => true})
               when /osx/
                 release_path = "#{opts[:dev_builds_url]}/#{product}/#{directory}/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
-                package_base = product.dup
-                package_base << "-#{opts[:pe_client_tools_version]}"
-                package_name = package_base.dup
-                package_name << '-1' if opts[:pe_client_tools_version]
-                installer    = package_name + '-installer.pkg'
-                package_name << ".#{variant}#{version}.dmg"
+                package_base = "#{product}-#{opts[:pe_client_tools_version]}"
+                package_base << '-1' if opts[:pe_client_tools_version]
+
+                dmg = package_base + ".#{variant}#{version}.dmg"
                 copy_dir_local = File.join('tmp', 'repo_configs')
-                fetch_http_file(release_path, package_name, copy_dir_local)
-                scp_to host, File.join(copy_dir_local, package_name), host.external_copy_base
-                host.generic_install_dmg(package_name, package_base, installer)
+                fetch_http_file(release_path, dmg, copy_dir_local)
+                scp_to host, File.join(copy_dir_local, dmg), host.external_copy_base
+
+                package_name = package_base + '*'
+                installer = package_name + '-installer.pkg'
+                host.generic_install_dmg(dmg, package_name, installer)
               else
                 install_dev_repos_on(product, host, directory, '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
                 host.install_package('pe-client-tools')

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.0.3'
+        STRING = '2.0.4'
       end
 
     end

data/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb

@@ -102,7 +102,7 @@ describe ClassPEClientToolsMixedWithPatterns do
         hosts.each do |host|
           allow(subject).to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/apple/1111/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
           allow(host).to receive(:external_copy_base)
-          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{opts[:pe_client_tools_version]}", "pe-client-tools-#{opts[:pe_client_tools_version]}-1-installer.pkg")
+          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{opts[:pe_client_tools_version]}-1*", "pe-client-tools-#{opts[:pe_client_tools_version]}-1*-installer.pkg")
           subject.install_pe_client_tools_on(host, opts)
         end
       end
@@ -111,7 +111,7 @@ describe ClassPEClientToolsMixedWithPatterns do
         hosts.each do |host|
           allow(subject).to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{tag_opts[:pe_client_tools_version]}/artifacts/apple/1111/PC1/x86_64", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
           allow(host).to receive(:external_copy_base)
-          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1-installer.pkg")
+          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1*", "pe-client-tools-#{tag_opts[:pe_client_tools_version]}-1*-installer.pkg")
 
           subject.install_pe_client_tools_on(host, tag_opts)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec