bosh_cli 1.3016.0 → 1.3022.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b607dc8ab9aeeb90179e6ef059af96cb5a3f918
-  data.tar.gz: 095a9a73de111b6db264a3b1b8593ac199d3c996
+  metadata.gz: 6aa4b94a31d6b9cb57254332d70d2ecba1705b7e
+  data.tar.gz: 01fc768fedefe96eb9429c85717fac4ec420416c
 SHA512:
-  metadata.gz: 40d909ef8dfd025a620e97589b080cc5c604080f27359d370502a2e000308a991ffe38ee1238de5e4d4147731d9d2597dca3dabcdca039b8f647ca4207f7dfd7
-  data.tar.gz: 8e007a9ced2e7393ae3cd3878d5c1db7ba6958c463b47250fa317fdad6022394d77235a70b025e4f4bf041d6db2c2cbc30b06f1155614e77b8a52e7a7e4ef756
+  metadata.gz: 7da0c31dd8af0357a07af50bb6c986f57e60ac16dde1dad720816e4f820fa5dfd82391df514380e0558db6fec28ce905259ff75e0be2050d9eda822b06040c03
+  data.tar.gz: 7d7b108c19c985b0a874920c2085d5e77ebba323dbd8cb5a284458da4311a41cb46e147a034cee735795e3a20756869f97f46150bc3e816bd31f4b5a77497be3

data/lib/cli/archive_builder.rb

@@ -55,7 +55,7 @@ module Bosh::Cli
           FileUtils.mkdir_p(dest_path)
         else
           FileUtils.mkdir_p(dest_path.parent)
-          FileUtils.cp(src, dest_path, :preserve => true)
+          FileUtils.cp(src, dest_path, preserve: true)
         end
       end
     end
@@ -118,8 +118,6 @@ module Bosh::Cli
       Dir.chdir(staging_dir) { yield }
     end
 
-    private
-
     def safe_temp_file(prefix, suffix, dir = Dir.tmpdir)
       Dir::Tmpname.create([prefix, suffix], dir) do |tmpname, _, _|
         File.open(tmpname, File::RDWR|File::CREAT|File::EXCL).close

data/lib/cli/base_command.rb

@@ -127,7 +127,7 @@ module Bosh::Cli
       msg = "Acting as #{user_desc} '#{credentials.username.to_s.make_green}'"
       msg += " on deployment '#{deployment_name.make_green}'" if deployment_name
       msg += " on '#{target_name.make_green}'" if target_name
-      say(msg)
+      warn(msg)
     end
 
     protected

data/lib/cli/client/director.rb

@@ -613,7 +613,7 @@ module Bosh
 
         def releases_path(options = {})
           path = '/releases'
-          params = [:rebase, :skip_if_exists].select { |p| options[p] }.map { |p| "#{p}=true" }
+          params = [:rebase, :skip_if_exists, :compiled].select { |p| options[p] }.map { |p| "#{p}=true" }
           path << "?#{params.join('&')}" unless params.empty?
           path
         end

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

@@ -1,5 +1,6 @@
 require 'cli/name_version_pair'
 require 'cli/client/export_release_client'
+require 'json'
 
 module Bosh::Cli::Command
   module Release
@@ -21,6 +22,33 @@ module Bosh::Cli::Command
         client = Bosh::Cli::Client::ExportReleaseClient.new(director)
         status, task_id = client.export(manifest.name, release.name, release.version, stemcell_os, stemcell.version)
         task_report(status, task_id)
+
+        task_result_file = director.get_task_result_log(task_id)
+        task_result = JSON.parse(task_result_file)
+        tarball_blobstore_id = task_result['blobstore_id']
+        tarball_sha1 = task_result['sha1']
+
+        tarball_file_name = "release-#{release.name}-#{release.version}-on-#{stemcell_os}-stemcell-#{stemcell.version}.tgz"
+        tarball_file_path = File.join(Dir.pwd, tarball_file_name)
+
+        nl
+        progress_renderer.start(tarball_file_name, "downloading...")
+        tmpfile = director.download_resource(tarball_blobstore_id)
+        File.open(tarball_file_path, "wb") do |file|
+          file << File.open(tmpfile).read
+        end
+        progress_renderer.finish(tarball_file_name, "downloaded")
+
+        if file_checksum(tarball_file_path) != tarball_sha1
+          err("Checksum mismatch for downloaded blob `#{tarball_file_path}'")
+        end
+
+      end
+
+      # Returns file SHA1 checksum
+      # @param [String] path File path
+      def file_checksum(path)
+        Digest::SHA1.file(path).hexdigest
       end
     end
   end

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

@@ -132,9 +132,10 @@ module Bosh::Cli::Command
           report = 'Release rebased'
         else
           say("\nUploading release\n")
-          report = 'Release uploaded'
+          report = tarball.compiled_release? ? 'Compiled Release uploaded' : 'Release uploaded'
         end
-        status, task_id = director.upload_release(tarball_path, rebase: rebase)
+
+        status, task_id = director.upload_release(tarball_path, {rebase: rebase, compiled: tarball.compiled_release?})
         task_report(status, task_id, report)
       end
 

data/lib/cli/release_tarball.rb

@@ -6,11 +6,20 @@ module Bosh::Cli
     attr_reader :release_name, :jobs, :packages, :version
     attr_reader :skipped, :unpack_dir # Mostly for tests
 
+    @compiled_release = false
+    @packages_folder = "packages"
+
     def initialize(tarball_path)
       @tarball_path = File.expand_path(tarball_path, Dir.pwd)
       @unpack_dir   = Dir.mktmpdir
       @jobs = []
       @packages = []
+
+      if compiled_release?
+        @packages_folder = "compiled_packages"
+      else
+        @packages_folder = "packages"
+      end
     end
 
     # Unpacks tarball to @unpack_dir, returns true if succeeded, false if failed
@@ -36,6 +45,11 @@ module Bosh::Cli
       File.read(File.join(@unpack_dir, "release.MF"))
     end
 
+    def compiled_release?
+      unpack
+      File.exists?(File.expand_path("compiled_packages", @unpack_dir))
+    end
+
     def replace_manifest(hash)
       return nil unless valid?
       unpack
@@ -91,7 +105,7 @@ module Bosh::Cli
 
       manifest = load_yaml_file(File.join(@unpack_dir, "release.MF"))
 
-      local_packages = manifest["packages"]
+      local_packages = manifest[@packages_folder]
       local_jobs = manifest["jobs"]
 
       @skipped = 0
@@ -99,7 +113,8 @@ module Bosh::Cli
       Dir.chdir(@unpack_dir) do
         local_packages.each do |package|
           say("#{package["name"]} (#{package["version"]})".ljust(30), " ")
-          if package_matches.include?(package["sha1"]) ||
+
+          if  package_matches and package_matches.include?(package["sha1"]) ||
              (package["fingerprint"] &&
               package_matches.include?(package["fingerprint"]))
             say("SKIP".make_green)
@@ -157,15 +172,14 @@ module Bosh::Cli
       @version = manifest["version"].to_s
 
       # Check packages
-      total_packages = manifest["packages"].size
+      total_packages = manifest[@packages_folder].size
       available_packages = {}
 
-      manifest["packages"].each_with_index do |package, i|
+      manifest[@packages_folder].each_with_index do |package, i|
         @packages << package
         name, version = package['name'], package['version']
 
-        package_file   = File.expand_path(name + ".tgz",
-                                          @unpack_dir + "/packages")
+        package_file   = File.expand_path(name + ".tgz", File.join(@unpack_dir, @packages_folder))
         package_exists = File.exists?(package_file)
 
         step("Read package '%s' (%d of %d)" % [name, i+1, total_packages],
@@ -190,7 +204,7 @@ module Bosh::Cli
         step("Package dependencies",
              "Package dependencies couldn't be resolved") do
           begin
-            tsort_packages(manifest["packages"].inject({}) { |h, p|
+            tsort_packages(manifest[@packages_folder].inject({}) { |h, p|
               h[p["name"]] = p["dependencies"] || []; h })
             true
           rescue Bosh::Cli::CircularDependency,
@@ -328,11 +342,11 @@ module Bosh::Cli
 
       say("\nPackages")
 
-      if manifest["packages"].empty?
+      if manifest[@packages_folder].empty?
         say("  - none")
       end
 
-      for package in manifest["packages"]
+      for package in manifest[@packages_folder]
         say("  - #{package["name"]} (#{package["version"]})")
       end
 

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3016.0'
+    VERSION = '1.3022.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3016.0
+  version: 1.3022.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-23 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.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.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.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  10557b
+  6073a7
 email: support@cloudfoundry.com
 executables:
 - bosh