bosh_cli 1.1868.0 → 1.1975.0

data/lib/cli/commands/stemcell.rb

@@ -4,6 +4,7 @@ require 'cli/public_stemcells'
 module Bosh::Cli
   class Command::Stemcell < Command::Base
     include Bosh::Cli::VersionCalc
+    STEMCELL_EXISTS_ERROR_CODE = 50002
 
     usage 'verify stemcell'
     desc 'Verify stemcell'
@@ -28,6 +29,7 @@ module Bosh::Cli
 
     usage 'upload stemcell'
     desc 'Upload stemcell (stemcell_location can be a local file or a remote URI)'
+    option '--skip-if-exists', 'skips upload if stemcell already exists'
     def upload(stemcell_location)
       auth_required
 
@@ -49,8 +51,12 @@ module Bosh::Cli
         version = stemcell.manifest['version']
 
         if exists?(name, version)
-          err("Stemcell `#{name}/#{version}' already exists, " +
-                'increment the version if it has changed')
+          if options[:skip_if_exists]
+            say("Stemcell `#{name}/#{version}' already exists. Skipping upload.")
+            return
+          else
+            err("Stemcell `#{name}/#{version}' already exists. Increment the version if it has changed.")
+          end
         else
           say('No')
         end
@@ -65,13 +71,15 @@ module Bosh::Cli
         say("Using remote stemcell `#{stemcell_location}'")
       end
 
-      if stemcell_type == 'local'
-        status, task_id = director.upload_stemcell(stemcell_location)
-      else
-        status, task_id = director.upload_remote_stemcell(stemcell_location)
+      status, task_id = apply_upload_stemcell_strategy(stemcell_type, stemcell_location)
+      success_message = 'Stemcell uploaded and created.'
+
+      if status == :error && options[:skip_if_exists] && last_event(task_id)['error']['code'] == STEMCELL_EXISTS_ERROR_CODE
+        status = :done
+        success_message = skip_existing_stemcell_message(stemcell_type, stemcell_location)
       end
 
-      task_report(status, task_id, 'Stemcell uploaded and created')
+      task_report(status, task_id, success_message)
     end
 
     usage 'stemcells'
@@ -146,6 +154,27 @@ module Bosh::Cli
 
     private
 
+    def skip_existing_stemcell_message(stemcell_type, stemcell_location)
+      if stemcell_type == 'local'
+        'Stemcell already exists. Skipping upload.'
+      else
+        "Stemcell at #{stemcell_location} already exists."
+      end
+    end
+
+    def apply_upload_stemcell_strategy(stemcell_type, stemcell_location)
+      if stemcell_type == 'local'
+        director.upload_stemcell(stemcell_location)
+      else
+        director.upload_remote_stemcell(stemcell_location)
+      end
+    end
+
+    def last_event(task_id)
+      event_log, _ = director.get_task_output(task_id, 0, 'event')
+      JSON.parse(event_log.split("\n").last)
+    end
+
     def exists?(name, version)
       existing = director.list_stemcells.select do |sc|
         sc['name'] == name && sc['version'] == version

data/lib/cli/task_tracking/event_log_renderer.rb

@@ -30,6 +30,11 @@ module Bosh::Cli::TaskTracking
       event = parse_event(event_line)
 
       @lock.synchronize do
+        if event['type'] == 'deprecation'
+          @buffer.puts("Deprecation: #{event['message']}".make_red)
+          return
+        end
+
         # Handling the special "error" event
         if event['error']
           done_with_stage if @current_stage

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.1868.0'
+    VERSION = '1.1975.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.1868.0
+  version: 1.1975.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1868.0
+        version: 1.1975.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  f69423'
+  9c66c4'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3291058498486643832
+      hash: 3035706384650308221
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23