packaging 0.110.0 → 0.110.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/packaging/platforms.rb +12 -5
  3. data/lib/packaging/util/net.rb +1 -1
  4. data/spec/lib/packaging/artifactory_spec.rb +0 -11
  5. data/spec/lib/packaging/config_spec.rb +0 -2
  6. data/spec/lib/packaging/paths_spec.rb +0 -8
  7. data/spec/lib/packaging/platforms_spec.rb +1 -5
  8. data/spec/lib/packaging/retrieve_spec.rb +1 -2
  9. data/spec/lib/packaging/util/ship_spec.rb +0 -4
  10. metadata +16 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9d2201555910a89425cf802f7b7126d167c2e2cb8d0c7ada3adeb7ba7dc29f05
4
- data.tar.gz: 929d502f2ac04d67578be5cbde92915093ec8d70491f0e83127d72528dcb2fe5
3
+ metadata.gz: f531bbfb5a05625e55cdf14b09928314d13999addf12b7c77ddb8ed954c187e1
4
+ data.tar.gz: f7fc4ca10a227835456ac481b71b14adc916d55e218dc975bcb0c3e6ebd92859
5
5
  SHA512:
6
- metadata.gz: 2daf0d7f45ec14f6c1a6fc92dcf1899e5fc916e32f9190285381c9fccde816a23aabff6367ab8abad6c6d71ffcc339d2a1cbaf8769ec53bab19d40b28ed41419
7
- data.tar.gz: ceb3b6e5aa2c3cd6c0d097feb7b08d22e569e175ba10c395f6dfd732e3a438224bbd17065710235f8a36cb11917a5e07f89de19d5ac8b04bc13412b63a482021
6
+ metadata.gz: 98aa70e3f509f803d1e0e2d65d2121ab81197b9d412ea57ab8c3e8750d68374e87b81a89d10d2597b5b4b58f01873985c21a47047c9df70c63cafae7d9e3d855
7
+ data.tar.gz: 60d5a3851e2765a421327cb7ac105e4f132b1d96d91731eef10da0e39a44976c940360f6ae5effe9869cc230924d1b1d09dce8162cbd0a762826a7ef06a02a0c
data/lib/packaging/platforms.rb CHANGED
@@ -18,6 +18,13 @@ module Pkg
18
18
  source_package_formats: ['src.rpm'],
19
19
  repo: false,
20
20
  },
21
+ '7.2' => {
22
+ architectures: ['power'],
23
+ source_architecture: 'SRPMS',
24
+ package_format: 'rpm',
25
+ source_package_formats: ['src.rpm'],
26
+ repo: false,
27
+ },
21
28
  },
22
29
 
23
30
  'debian' => {
@@ -49,7 +56,7 @@ module Pkg
49
56
  repo: true,
50
57
  },
51
58
  '7' => {
52
- architectures: ['x86_64', 'ppc64le', 'aarch64'],
59
+ architectures: ['x86_64', 'ppc64le'],
53
60
  source_architecture: 'SRPMS',
54
61
  package_format: 'rpm',
55
62
  source_package_formats: ['src.rpm'],
@@ -86,17 +93,17 @@ module Pkg
86
93
  },
87
94
 
88
95
  'osx' => {
89
- '10.15' => {
90
- architectures: ['x86_64'],
96
+ '11' => {
97
+ architectures: ['x86_64', 'arm64'],
91
98
  package_format: 'dmg',
92
99
  repo: false,
93
100
  },
94
- '11' => {
101
+ '12' => {
95
102
  architectures: ['x86_64', 'arm64'],
96
103
  package_format: 'dmg',
97
104
  repo: false,
98
105
  },
99
- '12' => {
106
+ '13' => {
100
107
  architectures: ['x86_64', 'arm64'],
101
108
  package_format: 'dmg',
102
109
  repo: false,
data/lib/packaging/util/net.rb CHANGED
@@ -184,7 +184,7 @@ module Pkg::Util::Net
184
184
  target_host: nil,
185
185
  extra_flags: nil,
186
186
  dryrun: ENV['DRYRUN']
187
- }.merge(opts.delete_if { |_, value| value.nil? })
187
+ }.merge(opts.compact)
188
188
 
189
189
  stdout, = Pkg::Util::Execution.capture3(rsync_cmd(source, options), true)
190
190
  stdout
data/spec/lib/packaging/artifactory_spec.rb CHANGED
@@ -36,11 +36,6 @@ describe 'artifactory.rb' do
36
36
  :repo_config => '',
37
37
  :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
38
38
  },
39
- 'osx-10.15-x86_64' => {
40
- :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
41
- :repo_config => '',
42
- :additional_artifacts => ["./apple/10.15/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg"],
43
- },
44
39
  'osx-11-x86_64' => {
45
40
  :artifact => "./apple/11/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx11.dmg",
46
41
  :repo_config => '',
@@ -89,12 +84,6 @@ describe 'artifactory.rb' do
89
84
  :package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
90
85
  :all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
91
86
  },
92
- 'osx-10.15-x86_64' => {
93
- :toplevel_repo => 'generic',
94
- :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.15-x86_64",
95
- :package_name => 'path/to/an/osx/10.15/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg',
96
- :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg']
97
- },
98
87
  'osx-11-x86_64' => {
99
88
  :toplevel_repo => 'generic',
100
89
  :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-11-x86_64",
data/spec/lib/packaging/config_spec.rb CHANGED
@@ -203,7 +203,6 @@ describe 'Pkg::Config' do
203
203
 
204
204
  describe '#platform_data' do
205
205
  platform_tags = %w[
206
- osx-10.15-x86_64
207
206
  osx-11-x86_64
208
207
  ubuntu-18.04-amd64
209
208
  el-6-x86_64
@@ -212,7 +211,6 @@ describe 'Pkg::Config' do
212
211
  ]
213
212
 
214
213
  artifacts =
215
- "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
216
214
  "./artifacts/apple/11/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx11.dmg\n" \
217
215
  "./artifacts/deb/bionic/PC1/puppet-agent_5.3.2-1bionic_amd64.deb\n" \
218
216
  "./artifacts/el/6/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.el6.x86_64.rpm\n" \
data/spec/lib/packaging/paths_spec.rb CHANGED
@@ -31,7 +31,6 @@ describe 'Pkg::Paths' do
31
31
  'pkg/deb/buster/pe-r10k_3.5.2.0-1buster_amd64.deb' => 'debian-10-amd64',
32
32
  'pkg/pe/deb/bionic/pe-puppetserver_2019.8.2.32-1bionic_all.deb' => 'ubuntu-18.04-amd64',
33
33
  'artifacts/deb/focal/puppet6/puppetdb_6.13.0-1focal_all.deb' => 'ubuntu-20.04-amd64',
34
- 'pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
35
34
  'pkg/apple/11/puppet6/x86_64/puppet-agent-6.19.0-1.osx11.dmg' => 'osx-11-x86_64',
36
35
  'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
37
36
  'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.src.rpm' => 'el-6-SRPMS',
@@ -118,11 +117,6 @@ describe 'Pkg::Paths' do
118
117
  .to eq('artifacts/solaris/puppet6/11')
119
118
  end
120
119
 
121
- it 'should be correct for osx' do
122
- expect(Pkg::Paths.artifacts_path('osx-10.15-x86_64'))
123
- .to eq('artifacts/mac/puppet6/10.15/x86_64')
124
- end
125
-
126
120
  it 'should be correct for osx11' do
127
121
  expect(Pkg::Paths.artifacts_path('osx-11-x86_64'))
128
122
  .to eq('artifacts/mac/puppet6/11/x86_64')
@@ -376,7 +370,6 @@ describe 'Pkg::Paths' do
376
370
  .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
377
371
  end
378
372
  it 'returns nil for package formats that do not have release packages' do
379
- expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
380
373
  expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
381
374
  expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
382
375
  end
@@ -414,7 +407,6 @@ describe 'Pkg::Paths' do
414
407
  .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
415
408
  end
416
409
  it 'returns nil for package formats that do not have release packages' do
417
- expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
418
410
  expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
419
411
  expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
420
412
  end
data/spec/lib/packaging/platforms_spec.rb CHANGED
@@ -97,7 +97,7 @@ describe 'Pkg::Platforms' do
97
97
  end
98
98
 
99
99
  describe '#platform_lookup' do
100
- ['osx-10.15-x86_64', 'osx-11-x86_64', 'osx-12-x86_64'].each do |platform|
100
+ ['osx-11-x86_64', 'osx-12-x86_64'].each do |platform|
101
101
  it 'should return a hash of platform info' do
102
102
  expect(Pkg::Platforms.platform_lookup(platform)).to be_instance_of(Hash)
103
103
  end
@@ -113,10 +113,6 @@ describe 'Pkg::Platforms' do
113
113
  it 'returns info about a given platform' do
114
114
  expect(Pkg::Platforms.get_attribute('el-6-x86_64', :signature_format)).to eq('v4')
115
115
  end
116
-
117
- it 'fails with a reasonable error when specified attribute is not defined' do
118
- expect { Pkg::Platforms.get_attribute('osx-10.15-x86_64', :signature_format) }.to raise_error(/doesn't have information/)
119
- end
120
116
  end
121
117
 
122
118
  describe '#package_format_for_tag' do
data/spec/lib/packaging/retrieve_spec.rb CHANGED
@@ -7,11 +7,10 @@ describe 'Pkg::Retrieve' do
7
7
  remote_target = 'repos'
8
8
  project = 'puppet-agent'
9
9
  ref = 'b25e64984dd505391f248fe5501ad81e2645b6d2'
10
- foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64', 'osx-10.15-x86_64', 'osx-11-x86_64', 'windows-2012-x64']
10
+ foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64','osx-11-x86_64', 'windows-2012-x64']
11
11
  platform_data = {:platform_data => {
12
12
  'aix-7.1-power' => {:artifact => './aix/7.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix7.1.ppc.rpm'},
13
13
  'el-7-x86_64' => {:artifact => './el/7/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.el7.x86_64.rpm'},
14
- 'osx-10.15-x86_64' => {:artifact => './apple/10.15/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.15.dmg'},
15
14
  'osx-11-x86_64' => {:artifact => './apple/11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx11.dmg'},
16
15
  'sles-11-i386' => {:artifact => './sles/11/PC1/i386/puppet-agent-5.3.2.155.gb25e649-1.sles11.i386.rpm'},
17
16
  'solaris-10-sparc' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2.155.gb25e649-1.sparc.pkg.gz'},
data/spec/lib/packaging/util/ship_spec.rb CHANGED
@@ -45,13 +45,11 @@ describe '#Pkg::Util::Ship' do
45
45
  # Sample data for #reorganize_packages and #ship_pkgs specs
46
46
  retrieved_packages = %w[
47
47
  pkg/deb/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
48
- pkg/el/7/puppet6/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
49
48
  pkg/el/7/puppet6/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
50
49
  pkg/el/7/puppet6/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
51
50
  pkg/sles/12/puppet6/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
52
51
  pkg/sles/12/puppet6/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
53
52
  pkg/sles/15/puppet6/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
54
- pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
55
53
  pkg/fedora/36/puppet6/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
56
54
  pkg/windows/puppet-agent-6.19.0-x64.msi
57
55
  pkg/windows/puppet-agent-6.19.0-x86.msi
@@ -64,13 +62,11 @@ describe '#Pkg::Util::Ship' do
64
62
  # Beware apple->mac transforms.
65
63
  expected_reorganized_packages = %w[
66
64
  pkg/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
67
- pkg/puppet6/el/7/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
68
65
  pkg/puppet6/el/7/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
69
66
  pkg/puppet6/el/7/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
70
67
  pkg/puppet6/sles/12/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
71
68
  pkg/puppet6/sles/12/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
72
69
  pkg/puppet6/sles/15/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
73
- pkg/mac/puppet6/10.15/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
74
70
  pkg/puppet6/fedora/36/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
75
71
  pkg/windows/puppet6/puppet-agent-6.19.0-x64.msi
76
72
  pkg/windows/puppet6/puppet-agent-6.19.0-x86.msi
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: packaging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.110.0
4
+ version: 0.110.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet By Perforce
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-05-09 00:00:00.000000000 Z
11
+ date: 2023-07-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: debug
@@ -308,27 +308,27 @@ specification_version: 4
308
308
  summary: Puppet by Perforce packaging automation
309
309
  test_files:
310
310
  - spec/lib/packaging_spec.rb
311
- - spec/lib/packaging/deb/repo_spec.rb
312
- - spec/lib/packaging/rpm/repo_spec.rb
311
+ - spec/lib/packaging/tar_spec.rb
312
+ - spec/lib/packaging/repo_spec.rb
313
313
  - spec/lib/packaging/sign_spec.rb
314
- - spec/lib/packaging/deb_spec.rb
314
+ - spec/lib/packaging/deb/repo_spec.rb
315
315
  - spec/lib/packaging/artifactory_spec.rb
316
- - spec/lib/packaging/paths_spec.rb
317
316
  - spec/lib/packaging/config_spec.rb
318
- - spec/lib/packaging/repo_spec.rb
317
+ - spec/lib/packaging/platforms_spec.rb
318
+ - spec/lib/packaging/deb_spec.rb
319
+ - spec/lib/packaging/rpm/repo_spec.rb
319
320
  - spec/lib/packaging/util/jenkins_spec.rb
320
- - spec/lib/packaging/util/git_spec.rb
321
+ - spec/lib/packaging/util/file_spec.rb
321
322
  - spec/lib/packaging/util/misc_spec.rb
322
- - spec/lib/packaging/util/version_spec.rb
323
+ - spec/lib/packaging/util/git_spec.rb
324
+ - spec/lib/packaging/util/git_tag_spec.rb
323
325
  - spec/lib/packaging/util/execution_spec.rb
324
- - spec/lib/packaging/util/ship_spec.rb
325
- - spec/lib/packaging/util/rake_utils_spec.rb
326
- - spec/lib/packaging/util/file_spec.rb
327
- - spec/lib/packaging/util/gpg_spec.rb
328
326
  - spec/lib/packaging/util/os_spec.rb
329
- - spec/lib/packaging/util/git_tag_spec.rb
327
+ - spec/lib/packaging/util/gpg_spec.rb
328
+ - spec/lib/packaging/util/version_spec.rb
330
329
  - spec/lib/packaging/util/net_spec.rb
330
+ - spec/lib/packaging/util/ship_spec.rb
331
+ - spec/lib/packaging/util/rake_utils_spec.rb
331
332
  - spec/lib/packaging/retrieve_spec.rb
333
+ - spec/lib/packaging/paths_spec.rb
332
334
  - spec/lib/packaging/gem_spec.rb
333
- - spec/lib/packaging/tar_spec.rb
334
- - spec/lib/packaging/platforms_spec.rb