beaker-pe 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 472cb8527da6bbb6256c8342fff325b91dfe0d62
4
- data.tar.gz: 75b005236142feec1df7954cac688d4d4f9f613c
3
+ metadata.gz: 50ab622f7e8f6f4242ce6616fc903c5ae81d2eef
4
+ data.tar.gz: 2f2484aa5fee75589d5d79658210b46ed0b7b3b4
5
5
  SHA512:
6
- metadata.gz: 24d74792e19f75a3d33f30de4644878dcc742a00b872775c8e30965a891e86641a89fff1a106cdf0a6b8fd9260dfb886890c013ac908f55e609d709419d5e554
7
- data.tar.gz: 05daf324e0665af413f85c35dbefc81e2cc1e310bfb734328f93adb02ba4298993f4c41843a299e41200f36040efa8b9dd6e6c1d82319c99110337b79ca73a8b
6
+ metadata.gz: a694aefb0b0c243400137e53086ba5dea4b68f6c57cb6419157955fe2fecf4e5a1a37145fef08236955141c8f7819b960abeeb1f1ee880a5f11ce44465c22651
7
+ data.tar.gz: 488cd674d291454079307b4751beede9b29287b0693f8cbd391e9a1349f5cc172f2e1fdb75f3c1432f5840e51686297fda786b1f92b90eb2d5b38fd29869869e
@@ -33,16 +33,17 @@ module Beaker
33
33
  generic_install_msi_on(host, File.join(release_path, package_name), {}, {:debug => true})
34
34
  when /osx/
35
35
  release_path = "#{opts[:dev_builds_url]}/#{product}/#{directory}/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
36
- package_base = product.dup
37
- package_base << "-#{opts[:pe_client_tools_version]}"
38
- package_name = package_base.dup
39
- package_name << '-1' if opts[:pe_client_tools_version]
40
- installer = package_name + '-installer.pkg'
41
- package_name << ".#{variant}#{version}.dmg"
36
+ package_base = "#{product}-#{opts[:pe_client_tools_version]}"
37
+ package_base << '-1' if opts[:pe_client_tools_version]
38
+
39
+ dmg = package_base + ".#{variant}#{version}.dmg"
42
40
  copy_dir_local = File.join('tmp', 'repo_configs')
43
- fetch_http_file(release_path, package_name, copy_dir_local)
44
- scp_to host, File.join(copy_dir_local, package_name), host.external_copy_base
45
- host.generic_install_dmg(package_name, package_base, installer)
41
+ fetch_http_file(release_path, dmg, copy_dir_local)
42
+ scp_to host, File.join(copy_dir_local, dmg), host.external_copy_base
43
+
44
+ package_name = package_base + '*'
45
+ installer = package_name + '-installer.pkg'
46
+ host.generic_install_dmg(dmg, package_name, installer)
46
47
  else
47
48
  install_dev_repos_on(product, host, directory, '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
48
49
  host.install_package('pe-client-tools')
@@ -3,7 +3,7 @@ module Beaker
3
3
  module PE
4
4
 
5
5
  module Version
6
- STRING = '2.0.3'
6
+ STRING = '2.0.4'
7
7
  end
8
8
 
9
9
  end
@@ -102,7 +102,7 @@ describe ClassPEClientToolsMixedWithPatterns do
102
102
  hosts.each do |host|
103
103
  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")
104
104
  allow(host).to receive(:external_copy_base)
105
- 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")
105
+ 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")
106
106
  subject.install_pe_client_tools_on(host, opts)
107
107
  end
108
108
  end
@@ -111,7 +111,7 @@ describe ClassPEClientToolsMixedWithPatterns do
111
111
  hosts.each do |host|
112
112
  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")
113
113
  allow(host).to receive(:external_copy_base)
114
- 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")
114
+ 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")
115
115
 
116
116
  subject.install_pe_client_tools_on(host, tag_opts)
117
117
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-pe
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-16 00:00:00.000000000 Z
11
+ date: 2018-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec