bosh_cli 1.3122.0 → 1.3123.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7be75f81fdec3bf4a7f8461b49c0611eef227a5d
-  data.tar.gz: 42fd19e5c80ae92551bbb3292c0e9155e646fa14
+  metadata.gz: 9195a3624e8837dab1659d3d9bce8c49da5743f6
+  data.tar.gz: 49d81aded03be583e22fec042d9aa2c09d99e5e5
 SHA512:
-  metadata.gz: 05faf5599cd614fb231ce54ea98988cef9dc0a8b6199f2ace40ba48b35d28de8dd8dfe1c9d60472779962c759461b83854e15d970808570e9099d5642659a780
-  data.tar.gz: 82c7b48e1af5942bac441706e4ea6bdb47e7d3bc773b4c700cfccbf6622c3523db19f4ec74984db6d62b5e81f6fec1a3301f6bb765ab392def9625f51c803b44
+  metadata.gz: 3ae89f95679f63debcdbef18b336c37d23a9149393f16d904f707a32982ae40cda342e785349833b12c993038b3043087987592ed8c2bdc3161fa0947ed4bd68
+  data.tar.gz: 5fcc9e11fb01d3604b41d4afbe7e63059c03e37265ea58419e10a2feb27e702d394e288e584e7c9b007db9fb041256b4f0444a62c36dca60315939746d210f0b

data/lib/cli/client/director.rb

@@ -641,7 +641,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, :fix].select { |p| options[p] }.map { |p| "#{p}=true" }
           params.push "sha1=#{options[:sha1]}" unless options[:sha1].blank?
           path << "?#{params.join('&')}" unless params.empty?
           path

data/lib/cli/commands/instances.rb

@@ -30,6 +30,7 @@ module Bosh::Cli::Command
 
     def show_deployment(name, options={})
       instances = director.fetch_vm_state(name)
+      instance_count = instances.size
 
       if instances.empty?
         nl
@@ -71,9 +72,15 @@ module Bosh::Cli::Command
           if options[:failing]
             if options[:ps]
               instance['processes'].keep_if { |p| p['state'] != 'running' }
-              next if instance['processes'].size == 0 && instance['job_state'] != 'failing'
+              if instance['processes'].size == 0 && instance['job_state'] == 'running'
+                instance_count -= 1
+                next
+              end
             else
-              next if instance['job_state'] != 'failing'
+              if instance['job_state'] == 'running'
+                instance_count -= 1
+                next
+              end
             end
           end
 
@@ -137,7 +144,7 @@ module Bosh::Cli::Command
               t << process_row
             end
 
-            t << :separator if row_count < instances.size
+            t << :separator if row_count < instance_count
           end
         end
       end

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

@@ -14,6 +14,7 @@ If --name & --version are provided, they will be used for checking if release ex
       option '--sha1 SHA1', 'SHA1 of the remote release'
       option '--name NAME', 'name of the release'
       option '--version VERSION', 'version of the release'
+      option '--fix', 'verify blobstore contents and replace with correct versions'
 
       def upload(release_file = nil)
         auth_required
@@ -23,7 +24,8 @@ If --name & --version are provided, they will be used for checking if release ex
         upload_options = {
           :rebase => options[:rebase],
           :repack => true,
-          :sha1 => options[:sha1]
+          :sha1 => options[:sha1],
+          :fix => options[:fix],
         }
 
         #only check release_dir if not compiled release tarball
@@ -43,14 +45,19 @@ If --name & --version are provided, they will be used for checking if release ex
           end
         end
 
-        if options[:name] && options[:version]
+        if !options[:fix] && options[:name] && options[:version]
+          say("Checking whether release #{options[:name]}/#{options[:version]} already exists...".make_green, '')
           director.list_releases.each do |release|
             if release['name'] == options[:name]
               release['release_versions'].each do |version|
-                return if version['version'] == options[:version]
+                if version['version'] == options[:version]
+                  say('YES'.make_yellow)
+                  return
+                end
               end
             end
           end
+          say('NO'.make_yellow)
         end
 
         if release_file =~ /^#{URI::regexp}$/
@@ -98,6 +105,7 @@ If --name & --version are provided, they will be used for checking if release ex
         # Trying to repack release by default
         repack = upload_options[:repack]
         rebase = upload_options[:rebase]
+        fix = upload_options[:fix]
 
         say("\nVerifying manifest...")
         tarball.validate_manifest
@@ -116,7 +124,7 @@ If --name & --version are provided, they will be used for checking if release ex
         Bosh::Common::Version::ReleaseVersion.parse(tarball.version) if new_director?
 
         begin
-          if repack
+          if repack && !fix
             if tarball.compiled_release?
               package_matches = match_remote_compiled_packages(tarball.manifest)
             else
@@ -156,7 +164,7 @@ If --name & --version are provided, they will be used for checking if release ex
           report = 'Release uploaded'
         end
 
-        status, task_id = director.upload_release(tarball_path, {rebase: rebase})
+        status, task_id = director.upload_release(tarball_path, rebase: rebase, fix: fix)
         task_report(status, task_id, report)
       end
 
@@ -172,7 +180,8 @@ If --name & --version are provided, they will be used for checking if release ex
         status, task_id = director.upload_remote_release(
           release_location,
           rebase: upload_options[:rebase],
-          sha1: upload_options[:sha1]
+          sha1: upload_options[:sha1],
+          fix: upload_options[:fix]
         )
         task_report(status, task_id, report)
       end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3122.0'
+    VERSION = '1.3123.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3122.0
+  version: 1.3123.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-04 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.3122.0
+        version: 1.3123.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3122.0
+        version: 1.3123.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3122.0
+        version: 1.3123.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3122.0
+        version: 1.3123.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.3122.0
+        version: 1.3123.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3122.0
+        version: 1.3123.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement