bosh_cli 1.1761.0 → 1.1777.0

data/lib/cli/runner.rb

@@ -56,20 +56,24 @@ module Bosh::Cli
         exit_code = command.run(@args, @options)
         exit(exit_code)
       rescue OptionParser::ParseError => e
-        say_err e.message
-        say_err "Usage: bosh #{command.usage_with_params.columnize(60, 7)}"
+        say_err(e.message)
+        nl
+        say_err("Usage: bosh #{command.usage_with_params.columnize(60, 7)}")
+        nl
         if command.has_options?
           say(command.options_summary.indent(7))
         end
+        exit(1)
       end
 
     rescue OptionParser::ParseError => e
-      say_err e.message
-      say_err @option_parser.to_s
+      say_err(e.message)
+      say_err(@option_parser.to_s)
       exit(1)
+
     rescue Bosh::Cli::CliError => e
-      say_err e.message
-      puts ""
+      say_err(e.message)
+      nl
       exit(e.exit_code)
     end
 

data/lib/cli/task_tracking.rb

@@ -3,6 +3,7 @@ module Bosh::Cli
 end
 
 require 'cli/task_tracking/task_tracker'
+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'

data/lib/cli/task_tracking/event_log_renderer.rb

@@ -2,25 +2,14 @@ module Bosh::Cli::TaskTracking
   class EventLogRenderer < TaskLogRenderer
     class InvalidEvent < StandardError; end
 
-    class Task
-      attr_accessor :name
-      attr_accessor :progress
-      attr_accessor :start_time
-      attr_accessor :finish_time
-
-      def initialize(name)
-        @name = name
-        @progress = 0
-        @start_time = nil
-        @finish_time = nil
-      end
-    end
+    extend Forwardable
+    def_delegators :@total_duration, :duration, :duration_known?, :started_at, :finished_at
 
     attr_reader :current_stage
     attr_reader :events_count
-    attr_reader :started_at, :finished_at
 
     def initialize(options={})
+      @total_duration = TotalDuration.new
       @lock = Monitor.new
       @events_count = 0
       @seen_stages = Set.new
@@ -42,7 +31,7 @@ module Bosh::Cli::TaskTracking
 
       @lock.synchronize do
         # Handling the special "error" event
-        if event["error"]
+        if event['error']
           done_with_stage if @current_stage
           add_error(event)
           return
@@ -66,11 +55,11 @@ module Bosh::Cli::TaskTracking
         # resuming the older stages rendering if we feel
         # that it's valuable.
 
-        tags = event["tags"].is_a?(Array) ? event["tags"] : []
-        stage_header = event["stage"]
+        tags = event['tags'].is_a?(Array) ? event['tags'] : []
+        stage_header = event['stage']
 
         if tags.size > 0
-          stage_header += " " + tags.sort.join(", ").make_green
+          stage_header += ' ' + tags.sort.join(', ').make_green
         end
 
         unless @seen_stages.include?(stage_header)
@@ -91,7 +80,7 @@ module Bosh::Cli::TaskTracking
       @current_stage = header
       @seen_stages << @current_stage
 
-      @stage_start_time = Time.at(event["time"]) rescue Time.now
+      @stage_start_time = Time.at(event['time']) rescue Time.now
       @local_start_time = adjusted_time(@stage_start_time)
 
       @tasks = {}
@@ -120,11 +109,11 @@ module Bosh::Cli::TaskTracking
     end
 
     def add_error(event)
-      error = event["error"] || {}
-      code = error["code"]
-      message = error["message"]
+      error = event['error'] || {}
+      code = error['code']
+      message = error['message']
 
-      error = "Error"
+      error = 'Error'
       error += " #{code}" if code
       error += ": #{message}" if message
 
@@ -153,15 +142,6 @@ module Bosh::Cli::TaskTracking
       end
     end
 
-    def duration_known?
-      @started_at && @finished_at
-    end
-
-    def duration
-      return unless duration_known?
-      @finished_at - @started_at
-    end
-
     private
 
     def append_stage_header
@@ -172,23 +152,23 @@ module Bosh::Cli::TaskTracking
       return unless @in_progress
 
       if @last_event
-        completion_time = Time.at(@last_event["time"]) rescue Time.now
+        completion_time = Time.at(@last_event['time']) rescue Time.now
       else
         completion_time = Time.now
       end
 
       if state.nil?
-        state = @stage_has_error ? "error" : "done"
+        state = @stage_has_error ? 'error' : 'done'
       end
 
       case state.to_s
-      when "done"
-        progress_bar.title = "Done".make_green
+      when 'done'
+        progress_bar.title = 'Done'.make_green
         progress_bar.finished_steps = progress_bar.total
-      when "error"
-        progress_bar.title = "Error".make_red
+      when 'error'
+        progress_bar.title = 'Error'.make_red
       else
-        progress_bar.title = "Not done".make_yellow
+        progress_bar.title = 'Not done'.make_yellow
       end
 
       progress_bar.bar_visible = false
@@ -208,34 +188,34 @@ module Bosh::Cli::TaskTracking
       validate_event(event)
 
       progress = 0
-      total = event["total"].to_i
+      total = event['total'].to_i
 
-      if event["state"] == "started"
-        task = Task.new(event["task"])
+      if event['state'] == 'started'
+        task = Task.new(event['task'])
       else
-        task = @tasks[event["index"]]
+        task = @tasks[event['index']]
       end
 
-      event_data = event["data"] || {}
+      event_data = event['data'] || {}
       # Ignoring out-of-order events
       return if task.nil?
 
       @events_count += 1
       @last_event = event
 
-      case event["state"]
-      when "started"
+      case event['state']
+      when 'started'
+        @total_duration.started_at = event['time']
+
         begin
-          task.start_time = Time.at(event["time"])
-          # Treat first "started" event as task start time
-          @started_at = task.start_time if @started_at.nil?
+          task.start_time = Time.at(event['time'])
         rescue
           task.start_time = Time.now
         end
 
         task.progress = 0
 
-        @tasks[event["index"]] = task
+        @tasks[event['index']] = task
 
         if @tasks.size > @tasks_batch_size
           # Heuristics here: we assume that local maximum of
@@ -249,12 +229,14 @@ module Bosh::Cli::TaskTracking
           @batches_count = ((total - @done_tasks.size) / @tasks_batch_size.to_f).ceil
         end
 
-      when "finished", "failed"
-        @tasks.delete(event["index"])
+      when 'finished', 'failed'
+        @tasks.delete(event['index'])
         @done_tasks << task
 
+        @total_duration.finished_at = event['time']
+
         begin
-          task.finish_time = @finished_at = Time.at(event["time"])
+          task.finish_time = Time.at(event['time'])
         rescue
           task.finish_time = Time.now
         end
@@ -274,16 +256,16 @@ module Bosh::Cli::TaskTracking
           task_name = task_name[0..0].to_s.downcase + task_name[1..-1].to_s
         end
 
-        if event["state"] == "failed"
-          status = [task_name.make_red, event_data["error"]].compact.join(": ")
+        if event['state'] == 'failed'
+          status = [task_name.make_red, event_data['error']].compact.join(': ')
           @stage_has_error = true
         else
           status = task_name.make_yellow
         end
         @buffer.puts("  #{status} (#{format_time(task_time)})")
 
-      when "in_progress"
-        progress = [event["progress"].to_f / 100, 1].min
+      when 'in_progress'
+        progress = [event['progress'].to_f / 100, 1].min
       end
 
       if @batches_count > 0 && @non_canary_event_start_time
@@ -294,7 +276,7 @@ module Bosh::Cli::TaskTracking
       task.progress = progress
 
       progress_bar.total = total
-      progress_bar.title = @tasks.values.map { |t| t.name }.sort.join(", ")
+      progress_bar.title = @tasks.values.map { |t| t.name }.sort.join(', ')
 
       progress_bar.current += progress_bar_gain
       progress_bar.refresh
@@ -309,20 +291,20 @@ module Bosh::Cli::TaskTracking
       end
       event
     rescue JSON::JSONError
-      raise InvalidEvent, "Cannot parse event, invalid JSON"
+      raise InvalidEvent, 'Cannot parse event, invalid JSON'
     end
 
     def validate_event(event)
-      unless event["time"] && event["stage"] && event["task"] &&
-        event["index"] && event["total"] && event["state"]
-        raise InvalidEvent, "Invalid event structure: stage, time, task, " +
-                            "index, total, state are all required"
+      unless event['time'] && event['stage'] && event['task'] &&
+        event['index'] && event['total'] && event['state']
+        raise InvalidEvent, 'Invalid event structure: stage, time, task, ' +
+          'index, total, state are all required'
       end
     end
 
     def time_with_eta(time, eta)
       time_fmt = format_time(time)
-      eta_fmt = eta && eta > Time.now ? format_time(eta - Time.now) : "--:--:--"
+      eta_fmt = eta && eta > Time.now ? format_time(eta - Time.now) : '--:--:--'
       "#{time_fmt}  ETA: #{eta_fmt}"
     end
 
@@ -331,28 +313,44 @@ module Bosh::Cli::TaskTracking
     end
 
     def can_handle_event_without_progress_bar?(event)
-      @stages_without_progress_bar.include?(event["stage"])
+      @stages_without_progress_bar.include?(event['stage'])
     end
 
     def handle_event_without_progress_bar(event)
-      event_header = "#{event["stage"].downcase}#{header_for_tags(event["tags"])}: #{event["task"]}"
+      event_header = "#{event['stage'].downcase}#{header_for_tags(event['tags'])}: #{event['task']}"
 
-      case event["state"]
-        when "started"
+      case event['state']
+        when 'started'
+          @total_duration.started_at = event['time']
           @buffer.print("  Started #{event_header}\n")
-        when "finished"
+        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}" : ""
+        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
     end
 
     def header_for_tags(tags)
       tags = Array(tags)
-      tags.size > 0 ? " " + tags.sort.join(", ").make_green : ""
+      tags.size > 0 ? ' ' + tags.sort.join(', ').make_green : ''
+    end
+
+    class Task
+      attr_accessor :name
+      attr_accessor :progress
+      attr_accessor :start_time
+      attr_accessor :finish_time
+
+      def initialize(name)
+        @name = name
+        @progress = 0
+        @start_time = nil
+        @finish_time = nil
+      end
     end
   end
 end

data/lib/cli/task_tracking/stage_progress_bar.rb

@@ -14,14 +14,14 @@ module Bosh::Cli::TaskTracking
       @total = 100
       @bar_visible = true
       @finished_steps = 0
-      @filler = "o"
+      @filler = 'o'
       @terminal_width = calculate_terminal_width
       @bar_width = (0.24 * @terminal_width).to_i # characters
     end
 
     def refresh
       clear_line
-      bar_repr = @bar_visible ? bar : ""
+      bar_repr = @bar_visible ? bar : ''
       title_width = (0.35 * @terminal_width).to_i
       title = @title.truncate(title_width).ljust(title_width)
       @output.print "#{title} #{bar_repr} #{@finished_steps}/#{@total}"
@@ -33,20 +33,20 @@ module Bosh::Cli::TaskTracking
         (@current.to_f / @total.to_f)).floor, 0].max
 
       fillers = "#{@filler}" * n_fillers
-      spaces = " " * [(@bar_width - n_fillers), 0].max
+      spaces = ' ' * [(@bar_width - n_fillers), 0].max
       "|#{fillers}#{spaces}|"
     end
 
     def clear_line
       @output.print("\r")
-      @output.print(" " * @terminal_width)
+      @output.print(' ' * @terminal_width)
       @output.print("\r")
     end
 
     def calculate_terminal_width
-      if ENV["COLUMNS"].to_s =~ /^\d+$/
-        ENV["COLUMNS"].to_i
-      elsif !ENV["TERM"].blank?
+      if ENV['COLUMNS'].to_s =~ /^\d+$/
+        ENV['COLUMNS'].to_i
+      elsif !ENV['TERM'].blank?
         width = `tput cols`
         $?.exitstatus == 0 ? [width.to_i, 100].min : 80
       else

data/lib/cli/task_tracking/task_log_renderer.rb

@@ -6,10 +6,10 @@ module Bosh::Cli::TaskTracking
     ]
 
     def self.create_for_log_type(log_type)
-      if log_type == "event"
+      if log_type == 'event'
         EventLogRenderer.new(stages_without_progress_bar:
           EVENT_LOG_STAGES_WITHOUT_PROGRESS_BAR)
-      elsif log_type == "result" || log_type == "none"
+      elsif log_type == 'result' || log_type == 'none'
         NullTaskLogRenderer.new
       else
         TaskLogRenderer.new
@@ -23,7 +23,7 @@ module Bosh::Cli::TaskTracking
       @out = Bosh::Cli::Config.output || $stdout
       @out.sync = true
       @lock = Mutex.new
-      @output = ""
+      @output = ''
       @time_adjustment = 0
       @duration = nil
     end
@@ -38,7 +38,7 @@ module Bosh::Cli::TaskTracking
 
     def refresh
       @out.print(@output)
-      @output = ""
+      @output = ''
     end
 
     def finish(state)

data/lib/cli/task_tracking/task_tracker.rb

@@ -16,7 +16,7 @@ module Bosh::Cli::TaskTracking
       @options = options
 
       @quiet = !!options[:quiet]
-      default_log_type = @quiet ? "none" : "event"
+      default_log_type = @quiet ? 'none' : 'event'
 
       @log_type = options[:log_type] || default_log_type
 
@@ -77,14 +77,14 @@ module Bosh::Cli::TaskTracking
     def prompt_for_debug_log
       return unless interactive?
       nl
-      confirm = ask("The task has returned an error status, " +
-                      "do you want to see debug log? [Yn]: ")
+      confirm = ask('The task has returned an error status, ' +
+        'do you want to see debug log? [Yn]: ')
       if confirm.empty? || confirm =~ /y(es)?/i
         self.class.new(@director, @task_id,
-                       @options.merge(:log_type => "debug")).track
+                       @options.merge(:log_type => 'debug')).track
       else
         say("Please use 'bosh task #{@task_id}' command ".make_red +
-              "to see the debug log".make_red)
+              'to see the debug log'.make_red)
       end
     end
 
@@ -92,7 +92,7 @@ module Bosh::Cli::TaskTracking
       return unless interactive?
       nl
       confirm = ask("Do you want to cancel task #{@task_id}? [yN] " +
-                      "(^C again to detach): ")
+        '(^C again to detach): ')
 
       if confirm =~ /y(es)?/i
         say("Cancelling task #{@task_id}...")
@@ -113,6 +113,7 @@ module Bosh::Cli::TaskTracking
       say("Task #{@task_id} #{task_status.to_s.make_yellow}")
 
       if task_status == :done && @renderer.duration_known?
+        nl
         say("Started\t\t#{@renderer.started_at.utc.to_s}")
         say("Finished\t#{@renderer.finished_at.utc.to_s}")
         say("Duration\t#{format_time(@renderer.duration).make_yellow}")
@@ -132,13 +133,13 @@ module Bosh::Cli::TaskTracking
     # @param [String] output Output received from director task
     def output_received(output)
       return if output.nil?
-      @output ||= ""
+      @output ||= ''
       @output << output
       @renderer.add_output(output)
     end
 
     def finished?(state)
-      %(done error cancelled).include?(state)
+      'done error cancelled'.include?(state)
     end
 
     def interactive?

data/lib/cli/task_tracking/total_duration.rb

@@ -0,0 +1,23 @@
+module Bosh::Cli::TaskTracking
+  class TotalDuration
+    attr_reader :started_at, :finished_at
+
+    def started_at=(time)
+      if !@started_at
+        @started_at = Time.at(time) rescue nil
+      end
+    end
+
+    def finished_at=(time)
+      (@finished_at = Time.at(time)) rescue nil
+    end
+
+    def duration
+      @finished_at - @started_at if duration_known?
+    end
+
+    def duration_known?
+      !!(@finished_at && @started_at)
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.1761.0'
+    VERSION = '1.1777.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.1761.0
+  version: 1.1777.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-15 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.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.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.1761.0
+        version: 1.1777.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1761.0
+        version: 1.1777.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  826c69'
+  0308a9'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -346,6 +346,7 @@ files:
 - lib/cli/task_tracking/stage_progress_bar.rb
 - lib/cli/task_tracking/task_log_renderer.rb
 - lib/cli/task_tracking/task_tracker.rb
+- lib/cli/task_tracking/total_duration.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
 - lib/cli/version_calc.rb
@@ -374,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -459032974552856888
+      hash: 4248709114918295253
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23