bosh_cli 1.2969.0 → 1.2972.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cli/commands/release/finalize_release.rb +12 -3
  3. data/lib/cli/release_tarball.rb +2 -7
  4. data/lib/cli/version.rb +1 -1
  5. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bca484fd3573f9323ce14f24614e26988ab171ed
4
- data.tar.gz: f4a18ffaf0afb52bc31082006c3a93c93a2c21de
3
+ metadata.gz: 8ad24cbeb2cc87e8704a51f81b6a76170429f011
4
+ data.tar.gz: b20fcab3d126d561872730d9ad8b0d2dd57fb4fd
5
5
  SHA512:
6
- metadata.gz: 3951286bd552835ed6067f12cb0ced82739deb700361542e59c278daef6b0858675c2402296f58d3cbd7dbcb6de02d10e9a3ae3b47e421e29400e90b8dd217c1
7
- data.tar.gz: 1a74dbff26b64ff6941110897d38567cecbd9e3630644d971cbb64d5c899fede81e9ad992062630ea91eff474358c9f3b46fa9651a9917669d83d18934c1f47a
6
+ metadata.gz: 0a2e3b8cd852683a7693ed3e331a53ba5ec2114b82421edeea8ba111eb220541429de9229663c050109f7a46b56995add6e8291d29d94597ec36e9f7bec89e3b
7
+ data.tar.gz: 01a414df0b7c81cd9f47e0b28b49def64fb5526b9bc76a7cda36cf6beede60bdcab55ffcbbbab12d199141d7d53053cf6067ab2a2b24bc7030b6bb1f6742739a
data/lib/cli/commands/release/finalize_release.rb CHANGED
@@ -86,9 +86,9 @@ module Bosh::Cli::Command
86
86
  end
87
87
 
88
88
  if manifest['license']
89
- license_metadata = manifest['license'].clone
90
- license_metadata['name'] = 'license'
91
- upload_to_blobstore(license_metadata, '', tarball.license_tarball_path)
89
+ # the licence is different from packages and jobs: it has to be rebuilt from the
90
+ # raw LICENSE and/or NOTICE files in the dev release tarball
91
+ archive_builder.build(tarball.license_resource)
92
92
  end
93
93
  end
94
94
 
@@ -138,6 +138,15 @@ module Bosh::Cli::Command
138
138
  })
139
139
  @progress_renderer.finish(artifact['name'], "uploaded")
140
140
  end
141
+
142
+ def archive_builder
143
+ @archive_builder ||= Bosh::Cli::ArchiveBuilder.new(archive_repository_provider,
144
+ :final => true, :dry_run => false)
145
+ end
146
+
147
+ def archive_repository_provider
148
+ @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
149
+ end
141
150
  end
142
151
  end
143
152
  end
data/lib/cli/release_tarball.rb CHANGED
@@ -55,15 +55,10 @@ module Bosh::Cli
55
55
  File.join(@unpack_dir, 'packages', "#{name}.tgz")
56
56
  end
57
57
 
58
- def license_tarball_path
58
+ def license_resource
59
59
  return nil unless valid?
60
60
  unpack
61
- l = Resources::License.new(@unpack_dir)
62
- if l.files
63
- l.files[0][0]
64
- else
65
- nil
66
- end
61
+ return Resources::License.new(@unpack_dir)
67
62
  end
68
63
 
69
64
  def convert_to_old_format
data/lib/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Cli
3
- VERSION = '1.2969.0'
3
+ VERSION = '1.2972.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2969.0
4
+ version: 1.2972.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-07 00:00:00.000000000 Z
11
+ date: 2015-05-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.2969.0
19
+ version: 1.2972.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.2969.0
26
+ version: 1.2972.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh-template
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2969.0
33
+ version: 1.2972.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2969.0
40
+ version: 1.2972.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cf-uaa-lib
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.2969.0
131
+ version: 1.2972.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.2969.0
138
+ version: 1.2972.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: net-ssh
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
306
306
  version: '0'
307
307
  description: |-
308
308
  BOSH CLI
309
- a2411c
309
+ a6d1e9
310
310
  email: support@cloudfoundry.com
311
311
  executables:
312
312
  - bosh