bosh_cli 1.1782.0 → 1.1798.0

data/lib/cli/client/director.rb

@@ -594,6 +594,10 @@ module Bosh
 
         private
 
+        def director_name
+          @director_name ||= get_status['name']
+        end
+
         def request(method, uri, content_type = nil, payload = nil,
           headers = {}, options = {})
           headers  = headers.dup
@@ -620,9 +624,9 @@ module Bosh
 
           if DIRECTOR_HTTP_ERROR_CODES.include?(response.code)
             if response.code == 404
-              raise ResourceNotFound, parse_error_message(response.code, body)
+              raise ResourceNotFound, parse_error_message(response.code, body, uri)
             else
-              raise DirectorError, parse_error_message(response.code, body)
+              raise DirectorError, parse_error_message(response.code, body, uri)
             end
           end
 
@@ -641,12 +645,15 @@ module Bosh
           raise DirectorError, "System call error while talking to director: #{e}"
         end
 
-        def parse_error_message(status, body)
+        def parse_error_message(status, body, uri)
           parsed_body = JSON.parse(body.to_s) rescue {}
 
           if parsed_body['code'] && parsed_body['description']
             'Error %s: %s' % [parsed_body['code'],
                               parsed_body['description']]
+          elsif status == 404
+            "The #{director_name} bosh director doesn't understand the following API call: #{uri}." +
+              " The bosh deployment may need to be upgraded."
           else
             'HTTP %s: %s' % [status, body]
           end

data/lib/cli/task_tracking.rb

@@ -7,4 +7,5 @@ require 'cli/task_tracking/total_duration'
 require 'cli/task_tracking/task_log_renderer'
 require 'cli/task_tracking/null_task_log_renderer'
 require 'cli/task_tracking/stage_progress_bar'
+require 'cli/task_tracking/stage_collection'
 require 'cli/task_tracking/event_log_renderer'

data/lib/cli/task_tracking/event_log_renderer.rb

@@ -317,26 +317,51 @@ module Bosh::Cli::TaskTracking
     end
 
     def handle_event_without_progress_bar(event)
-      event_header = "#{event['stage'].downcase}#{header_for_tags(event['tags'])}: #{event['task']}"
+      @total_duration.started_at = event['time']
+      @total_duration.finished_at = event['time']
+      stage_collection.update_with_event(event)
+    end
 
-      case event['state']
-        when 'started'
-          @total_duration.started_at = event['time']
-          @buffer.print("  Started #{event_header}\n")
-        when 'finished'
-          @total_duration.finished_at = event['time']
-          @buffer.print("     Done #{event_header}\n")
-        when 'failed'
-          event_data = event['data'] || {}
-          data_error = event_data['error']
-          error_msg = data_error ? ": #{data_error.make_red}" : ''
-          @buffer.print("   Failed #{event_header}#{error_msg}\n")
-      end
+    def stage_collection
+      @stage_collection ||= StageCollection.new(
+        stage_started: ->(stage){
+          @buffer.print("  Started #{header_for_stage(stage)}\n")
+        },
+        stage_finished: ->(stage){
+          duration = stage.duration ? " (#{format_time(stage.duration)})" : ''
+          @buffer.print("     Done #{header_for_stage(stage)}#{duration}\n")
+        },
+        stage_failed: ->(stage){
+          duration = stage.duration ? " (#{format_time(stage.duration)})" : ''
+          @buffer.print("   Failed #{header_for_stage(stage)}#{duration}\n")
+        },
+
+        task_started: ->(task){
+          @buffer.print("  Started #{header_for_task(task)}\n")
+        },
+        task_finished: ->(task){
+          duration = task.duration ? " (#{format_time(task.duration)})" : ''
+          @buffer.print("     Done #{header_for_task(task)}#{duration}\n")
+        },
+        task_failed: ->(task){
+          error_msg = task.error
+          error_msg = ": #{error_msg.make_red}" if error_msg
+          duration = task.duration ? " (#{format_time(task.duration)})" : ''
+          @buffer.print("   Failed #{header_for_task(task)}#{duration}#{error_msg}\n")
+        },
+      )
+    end
+
+    def header_for_stage(stage)
+      tags = stage.tags
+      tags_str = tags.size > 0 ? ' ' + tags.sort.join(', ').make_green : ''
+      "#{stage.name.downcase}#{tags_str}"
     end
 
-    def header_for_tags(tags)
-      tags = Array(tags)
-      tags.size > 0 ? ' ' + tags.sort.join(', ').make_green : ''
+    def header_for_task(task)
+      tags = task.stage.tags
+      tags_str = tags.size > 0 ? ' ' + tags.sort.join(', ').make_green : ''
+      "#{task.stage.name.downcase}#{tags_str}: #{task.name}"
     end
 
     class Task

data/lib/cli/task_tracking/stage_collection.rb

@@ -0,0 +1,119 @@
+module Bosh::Cli::TaskTracking
+  class StageCollection
+    attr_reader :stages
+
+    def initialize(callbacks)
+      @stages = []
+      @callbacks = callbacks
+    end
+
+    def update_with_event(event)
+      new_stage = Stage.new(event['stage'], event['tags'], event['total'], @callbacks)
+      unless found_stage = @stages.find { |s| s.name == new_stage.name && s.tags == new_stage.tags }
+        found_stage = new_stage
+        @stages << new_stage
+      end
+      found_stage.update_with_event(event)
+      found_stage
+    end
+  end
+
+  class Stage
+    attr_reader :name, :tags, :total, :tasks
+
+    def initialize(name, tags, total, callbacks)
+      @name = name
+      @tags = Array(tags)
+      @total = total
+      @callbacks = callbacks
+      @tasks = []
+    end
+
+    def update_with_event(event)
+      new_task = Task.new(self, event['task'], event['progress'], @callbacks)
+      unless found_task = @tasks.find { |t| t.name == new_task.name }
+        found_task = new_task
+        @tasks << new_task
+      end
+      fire_started_callback(event)
+      found_task.update_with_event(event)
+      fire_finished_callback(event)
+      fire_failed_callback(event)
+      found_task
+    end
+
+    def duration
+      total_duration = TotalDuration.new
+
+      task_start_times = @tasks.map(&:started_at)
+      task_end_times = @tasks.map(&:finished_at)
+
+      # If any task start time is nil, the start time for the entire stage is unknown.
+      total_duration.started_at = task_start_times.min unless task_start_times.include?(nil)
+      total_duration.finished_at = task_end_times.max unless task_end_times.include?(nil)
+
+      total_duration.duration
+    end
+
+    private
+
+    def fire_started_callback(event)
+      if event['state'] == 'started' && event['index'] == 1
+        callback = @callbacks[:stage_started]
+        callback.call(self) if callback
+      end
+    end
+
+    def fire_finished_callback(event)
+      if event['state'] == 'finished' && ((event['index'] == event['total']) || event['total'].nil?)
+        callback = @callbacks[:stage_finished]
+        callback.call(self) if callback
+      end
+    end
+
+    def fire_failed_callback(event)
+      if event['state'] == 'failed'
+        # If there are multiple failures do we need to only fire on the first one?
+        callback = @callbacks[:stage_failed]
+        callback.call(self) if callback
+      end
+    end
+  end
+
+  class Task
+    attr_reader :stage, :name, :state, :progress, :error
+
+    extend Forwardable
+    def_delegators :@total_duration, :duration, :started_at, :finished_at
+
+    def initialize(stage, name, progress, callbacks)
+      @stage = stage
+      @name = name
+      @progress = progress
+      @callbacks = callbacks
+      @total_duration = TotalDuration.new
+    end
+
+    def update_with_event(event)
+      @state    = event['state']
+      @progress = event['progress']
+      @error    = (event['data'] || {})['error']
+
+      @total_duration.started_at  = event['time'] if @state == 'started'
+      @total_duration.finished_at = event['time'] if @state == 'finished' || @state == 'failed'
+
+      call_state_callback
+    end
+
+    private
+
+    def call_state_callback
+      callback = case @state
+        when 'started'  then @callbacks[:task_started]
+        when 'finished' then @callbacks[:task_finished]
+        when 'failed'   then @callbacks[:task_failed]
+      end
+      callback.call(self) if callback
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.1782.0'
+    VERSION = '1.1798.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.1782.0
+  version: 1.1798.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-18 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.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.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.1782.0
+        version: 1.1798.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1782.0
+        version: 1.1798.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  5aedfc'
+  4c516b'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -343,6 +343,7 @@ files:
 - lib/cli/task_tracking.rb
 - lib/cli/task_tracking/event_log_renderer.rb
 - lib/cli/task_tracking/null_task_log_renderer.rb
+- lib/cli/task_tracking/stage_collection.rb
 - lib/cli/task_tracking/stage_progress_bar.rb
 - lib/cli/task_tracking/task_log_renderer.rb
 - lib/cli/task_tracking/task_tracker.rb
@@ -375,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1526214907771034034
+      hash: 2560420917753689708
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23