bosh_cli 1.2969.0 → 1.2972.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca484fd3573f9323ce14f24614e26988ab171ed
-  data.tar.gz: f4a18ffaf0afb52bc31082006c3a93c93a2c21de
+  metadata.gz: 8ad24cbeb2cc87e8704a51f81b6a76170429f011
+  data.tar.gz: b20fcab3d126d561872730d9ad8b0d2dd57fb4fd
 SHA512:
-  metadata.gz: 3951286bd552835ed6067f12cb0ced82739deb700361542e59c278daef6b0858675c2402296f58d3cbd7dbcb6de02d10e9a3ae3b47e421e29400e90b8dd217c1
-  data.tar.gz: 1a74dbff26b64ff6941110897d38567cecbd9e3630644d971cbb64d5c899fede81e9ad992062630ea91eff474358c9f3b46fa9651a9917669d83d18934c1f47a
+  metadata.gz: 0a2e3b8cd852683a7693ed3e331a53ba5ec2114b82421edeea8ba111eb220541429de9229663c050109f7a46b56995add6e8291d29d94597ec36e9f7bec89e3b
+  data.tar.gz: 01a414df0b7c81cd9f47e0b28b49def64fb5526b9bc76a7cda36cf6beede60bdcab55ffcbbbab12d199141d7d53053cf6067ab2a2b24bc7030b6bb1f6742739a

data/lib/cli/commands/release/finalize_release.rb

@@ -86,9 +86,9 @@ module Bosh::Cli::Command
         end
 
         if manifest['license']
-          license_metadata = manifest['license'].clone
-          license_metadata['name'] = 'license'
-          upload_to_blobstore(license_metadata, '', tarball.license_tarball_path)
+          # the licence is different from packages and jobs: it has to be rebuilt from the
+          # raw LICENSE and/or NOTICE files in the dev release tarball
+          archive_builder.build(tarball.license_resource)
         end
       end
 
@@ -138,6 +138,15 @@ module Bosh::Cli::Command
           })
         @progress_renderer.finish(artifact['name'], "uploaded")
       end
+
+      def archive_builder
+        @archive_builder ||= Bosh::Cli::ArchiveBuilder.new(archive_repository_provider,
+                                                           :final => true, :dry_run => false)
+      end
+
+      def archive_repository_provider
+        @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
+      end
     end
   end
 end

data/lib/cli/release_tarball.rb

@@ -55,15 +55,10 @@ module Bosh::Cli
       File.join(@unpack_dir, 'packages', "#{name}.tgz")
     end
 
-    def license_tarball_path
+    def license_resource
       return nil unless valid?
       unpack
-      l = Resources::License.new(@unpack_dir)
-      if l.files
-        l.files[0][0]
-      else
-        nil
-      end
+      return Resources::License.new(@unpack_dir)
     end
 
     def convert_to_old_format

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2969.0'
+    VERSION = '1.2972.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2969.0
+  version: 1.2972.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2969.0
+        version: 1.2972.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  a2411c
+  a6d1e9
 email: support@cloudfoundry.com
 executables:
 - bosh