bosh_cli 1.5.0.pre.1623 → 1.5.0.pre.1633

data/lib/cli.rb

@@ -59,11 +59,8 @@ require 'cli/packaging_helper'
 require 'cli/package_builder'
 require 'cli/job_builder'
 require 'cli/changeset_helper'
-require 'cli/task_tracker'
-require 'cli/task_log_renderer'
-require 'cli/event_log_renderer'
-require 'cli/null_renderer'
 require 'cli/deployment_manifest_compiler'
+require 'cli/task_tracking'
 
 require 'cli/release'
 require 'cli/release_builder'

data/lib/cli/client/director.rb

@@ -570,7 +570,7 @@ module Bosh
             if location =~ /\/tasks\/(\d+)\/?$/ # Looks like we received task URI
               task_id = $1
               if @track_tasks
-                tracker = Bosh::Cli::TaskTracker.new(self, task_id, track_opts)
+                tracker = Bosh::Cli::TaskTracking::TaskTracker.new(self, task_id, track_opts)
                 status  = tracker.track
               else
                 status = :running

data/lib/cli/commands/task.rb

@@ -57,7 +57,7 @@ module Bosh::Cli::Command
         err("Task id must be a positive integer")
       end
 
-      tracker = Bosh::Cli::TaskTracker.new(director, task_id, track_options)
+      tracker = Bosh::Cli::TaskTracking::TaskTracker.new(director, task_id, track_options)
       tracker.track
     end
 
@@ -132,4 +132,4 @@ module Bosh::Cli::Command
       use_filter ? 1 : 2
     end
   end
-end
+end

data/lib/cli/director_task.rb

@@ -1,64 +1,57 @@
-# Copyright (c) 2009-2012 VMware, Inc.
+module Bosh::Cli
+  class DirectorTask
+    attr_accessor :offset
+
+    def initialize(director, task_id, log_type = nil)
+      @director = director
+      @task_id = task_id
+      @offset = 0
+      @log_type = log_type
+      @buf = ""
+    end
 
-module Bosh
-  module Cli
-    class DirectorTask
+    def state
+      @director.get_task_state(@task_id)
+    end
 
-      attr_accessor :offset
+    def result
+      @director.get_task_result(@task_id)
+    end
 
-      def initialize(director, task_id, log_type = nil)
-        @director = director
-        @task_id = task_id
-        @offset = 0
-        @log_type = log_type
-        @buf = ""
-      end
+    def output
+      body, new_offset = @director.get_task_output(@task_id, @offset, @log_type)
 
-      def state
-        @director.get_task_state(@task_id)
-      end
+      @buf << body if body
 
-      def result
-        @director.get_task_result(@task_id)
+      if new_offset
+        @offset = new_offset
+      else
+        return flush_output
       end
 
-      def output
-        body, new_offset = @director.get_task_output(@task_id, @offset,
-                                                     @log_type)
-
-        @buf << body if body
-
-        if new_offset
-          @offset = new_offset
-        else
-          return flush_output
-        end
-
-        last_nl = @buf.rindex("\n")
+      last_nl = @buf.rindex("\n")
 
-        if last_nl.nil?
-          result = nil
-        elsif last_nl != @buf.size - 1
-          result = @buf[0..last_nl]
-          @buf = @buf[last_nl+1..-1]
-        else
-          result = @buf
-          @buf = ""
-        end
-
-        result
-      end
-
-      def flush_output
-        out = @buf
+      if last_nl.nil?
+        result = nil
+      elsif last_nl != @buf.size - 1
+        result = @buf[0..last_nl]
+        @buf = @buf[last_nl+1..-1]
+      else
+        result = @buf
         @buf = ""
-        out.blank? ? nil : "#{out}\n"
       end
 
-      def cancel
-        @director.cancel_task(@task_id)
-      end
+      result
+    end
+
+    def flush_output
+      out = @buf
+      @buf = ""
+      out.blank? ? nil : "#{out}\n"
+    end
+
+    def cancel
+      @director.cancel_task(@task_id)
     end
   end
 end
-

data/lib/cli/task_tracking.rb

@@ -0,0 +1,9 @@
+module Bosh::Cli
+  module TaskTracking; end
+end
+
+require 'cli/task_tracking/task_tracker'
+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/event_log_renderer'

data/lib/cli/{event_log_renderer.rb → task_tracking/event_log_renderer.rb}

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Cli
+module Bosh::Cli::TaskTracking
   class EventLogRenderer < TaskLogRenderer
-
     class InvalidEvent < StandardError; end
 
     class Task
@@ -23,7 +20,7 @@ module Bosh::Cli
     attr_reader :events_count
     attr_reader :started_at, :finished_at
 
-    def initialize
+    def initialize(options={})
       @lock = Monitor.new
       @events_count = 0
       @seen_stages = Set.new
@@ -33,12 +30,11 @@ module Bosh::Cli
       @progress_bars = {}
       @pos = 0
       @time_adjustment = 0
+      @stages_without_progress_bar = options[:stages_without_progress_bar] || []
     end
 
     def add_output(output)
-      output.to_s.split("\n").each do |line|
-        add_event(line)
-      end
+      output.to_s.split("\n").each { |line| add_event(line) }
     end
 
     def add_event(event_line)
@@ -52,6 +48,16 @@ module Bosh::Cli
           return
         end
 
+        if can_handle_event_without_progress_bar?(event)
+          if @current_stage
+            done_with_stage
+            @current_stage = nil
+            @buffer.print "\n"
+          end
+          handle_event_without_progress_bar(event)
+          return
+        end
+
         # One way to handle old stages is to prevent them
         # from appearing on screen altogether. That means
         # that we can always render the current stage only
@@ -240,9 +246,9 @@ module Bosh::Cli
           # to only have canaries.
           @tasks_batch_size = @tasks.size
           @non_canary_event_start_time = task.start_time
-          @batches_count = ((total - @done_tasks.size) /
-              @tasks_batch_size.to_f).ceil
+          @batches_count = ((total - @done_tasks.size) / @tasks_batch_size.to_f).ceil
         end
+
       when "finished", "failed"
         @tasks.delete(event["index"])
         @done_tasks << task
@@ -256,13 +262,11 @@ module Bosh::Cli
         task_time = task.finish_time - task.start_time
 
         n_done_tasks = @done_tasks.size.to_f
-        @running_avg = @running_avg * (n_done_tasks - 1) / n_done_tasks +
-            task_time.to_f / n_done_tasks
+        @running_avg = @running_avg * (n_done_tasks - 1) / n_done_tasks + task_time.to_f / n_done_tasks
 
         progress = 1
         progress_bar.finished_steps += 1
         progress_bar.label = time_with_eta(task_time, @eta)
-
         progress_bar.clear_line
 
         task_name = task.name.to_s
@@ -277,13 +281,13 @@ module Bosh::Cli
           status = task_name.make_yellow
         end
         @buffer.puts("  #{status} (#{format_time(task_time)})")
+
       when "in_progress"
         progress = [event["progress"].to_f / 100, 1].min
       end
 
       if @batches_count > 0 && @non_canary_event_start_time
-        @eta = adjusted_time(@non_canary_event_start_time +
-                                 @running_avg * @batches_count)
+        @eta = adjusted_time(@non_canary_event_start_time + @running_avg * @batches_count)
       end
 
       progress_bar_gain = progress - task.progress
@@ -316,76 +320,39 @@ module Bosh::Cli
       end
     end
 
-    # Expects time and eta to be adjusted
     def time_with_eta(time, eta)
       time_fmt = format_time(time)
       eta_fmt = eta && eta > Time.now ? format_time(eta - Time.now) : "--:--:--"
-
       "#{time_fmt}  ETA: #{eta_fmt}"
     end
 
     def adjusted_time(time)
       time + @time_adjustment.to_f
     end
-  end
-
-  class StageProgressBar
-    attr_accessor :total
-    attr_accessor :title
-    attr_accessor :current
-    attr_accessor :label
-    attr_accessor :bar_visible
-    attr_accessor :finished_steps
-    attr_accessor :terminal_width
-
-    def initialize(output)
-      @output = output
-      @current = 0
-      @total = 100
-      @bar_visible = true
-      @finished_steps = 0
-      @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 : ""
-      title_width = (0.35 * @terminal_width).to_i
-      title = @title.truncate(title_width).ljust(title_width)
-      @output.print "#{title} #{bar_repr} #{@finished_steps}/#{@total}"
-      @output.print " #{@label}" if @label
+    def can_handle_event_without_progress_bar?(event)
+      @stages_without_progress_bar.include?(event["stage"])
     end
 
-    def bar
-      n_fillers = @total == 0 ? 0 : [(@bar_width *
-          (@current.to_f / @total.to_f)).floor, 0].max
+    def handle_event_without_progress_bar(event)
+      event_header = "#{event["stage"].downcase}#{header_for_tags(event["tags"])}: #{event["task"]}"
 
-      fillers = "#{@filler}" * n_fillers
-      spaces = " " * [(@bar_width - n_fillers), 0].max
-      "|#{fillers}#{spaces}|"
-    end
-
-    def clear_line
-      @output.print("\r")
-      @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?
-        width = `tput cols`
-        $?.exitstatus == 0 ? [width.to_i, 100].min : 80
-      else
-        80
+      case event["state"]
+        when "started"
+          @buffer.print("  Started #{event_header}\n")
+        when "finished"
+          @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
-    rescue
-      80
     end
 
+    def header_for_tags(tags)
+      tags = Array(tags)
+      tags.size > 0 ? " " + tags.sort.join(", ").make_green : ""
+    end
   end
-
 end

data/lib/cli/{null_renderer.rb → task_tracking/null_task_log_renderer.rb}

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Cli
-  class NullRenderer < TaskLogRenderer
-
+module Bosh::Cli::TaskTracking
+  class NullTaskLogRenderer < TaskLogRenderer
     def initialize
     end
 
@@ -14,6 +11,5 @@ module Bosh::Cli
 
     def finish(state)
     end
-
   end
 end

data/lib/cli/task_tracking/stage_progress_bar.rb

@@ -0,0 +1,59 @@
+module Bosh::Cli::TaskTracking
+  class StageProgressBar
+    attr_accessor :total
+    attr_accessor :title
+    attr_accessor :current
+    attr_accessor :label
+    attr_accessor :bar_visible
+    attr_accessor :finished_steps
+    attr_accessor :terminal_width
+
+    def initialize(output)
+      @output = output
+      @current = 0
+      @total = 100
+      @bar_visible = true
+      @finished_steps = 0
+      @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 : ""
+      title_width = (0.35 * @terminal_width).to_i
+      title = @title.truncate(title_width).ljust(title_width)
+      @output.print "#{title} #{bar_repr} #{@finished_steps}/#{@total}"
+      @output.print " #{@label}" if @label
+    end
+
+    def bar
+      n_fillers = @total == 0 ? 0 : [(@bar_width *
+        (@current.to_f / @total.to_f)).floor, 0].max
+
+      fillers = "#{@filler}" * n_fillers
+      spaces = " " * [(@bar_width - n_fillers), 0].max
+      "|#{fillers}#{spaces}|"
+    end
+
+    def clear_line
+      @output.print("\r")
+      @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?
+        width = `tput cols`
+        $?.exitstatus == 0 ? [width.to_i, 100].min : 80
+      else
+        80
+      end
+    rescue
+      80
+    end
+  end
+end

data/lib/cli/{task_log_renderer.rb → task_tracking/task_log_renderer.rb}

@@ -1,15 +1,16 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Cli
+module Bosh::Cli::TaskTracking
   class TaskLogRenderer
+    EVENT_LOG_STAGES_WITHOUT_PROGRESS_BAR = [
+      'Updating job',
+      'Deleting unneeded instances',
+    ]
 
     def self.create_for_log_type(log_type)
       if log_type == "event"
-        EventLogRenderer.new
+        EventLogRenderer.new(stages_without_progress_bar:
+          EVENT_LOG_STAGES_WITHOUT_PROGRESS_BAR)
       elsif log_type == "result" || log_type == "none"
-        # Null renderer doesn't output anything to screen, so it fits well
-        # in case we need to fetch task result log only, without rendering it
-        NullRenderer.new
+        NullTaskLogRenderer.new
       else
         TaskLogRenderer.new
       end
@@ -44,6 +45,5 @@ module Bosh::Cli
       refresh
       @done = true
     end
-
   end
 end

data/lib/cli/task_tracking/task_tracker.rb

@@ -0,0 +1,148 @@
+module Bosh::Cli::TaskTracking
+  # This class is responsible for tracking director tasks
+  class TaskTracker
+    MAX_POLLS = nil # not limited
+    DEFAULT_POLL_INTERVAL = 1 # second
+
+    attr_reader :output
+    attr_reader :renderer
+
+    # @param [Bosh::Cli::Client::Director] director
+    # @param [Integer] task_id
+    # @param [Hash] options
+    def initialize(director, task_id, options = {})
+      @director = director
+      @task_id = task_id
+      @options = options
+
+      @quiet = !!options[:quiet]
+      default_log_type = @quiet ? "none" : "event"
+
+      @log_type = options[:log_type] || default_log_type
+
+      @output = nil
+      @task = Bosh::Cli::DirectorTask.new(@director, @task_id, @log_type)
+
+      if options[:renderer]
+        @renderer = options[:renderer]
+      elsif options[:raw_output]
+        @renderer = TaskLogRenderer.new
+      else
+        @renderer = TaskLogRenderer.create_for_log_type(@log_type)
+      end
+
+      @poll_interval = Bosh::Cli::Config.poll_interval || DEFAULT_POLL_INTERVAL
+    end
+
+    # Tracks director task. Blocks until task is in one of the 'finished'
+    # states (done, error, cancelled). Handles Ctrl+C by prompting to cancel
+    # task.
+    # @return [Symbol] Task status
+    def track
+      nl
+      @renderer.time_adjustment = @director.get_time_difference
+      say("Director task #{@task_id.to_s.make_yellow}")
+      task_status = poll
+
+      print_task_summary(task_status)
+
+      task_status
+    end
+
+    def poll
+      polls = 0
+
+      while true
+        polls += 1
+        state = @task.state
+        output = @task.output
+
+        output_received(output)
+        @renderer.refresh
+
+        if finished?(state)
+          return state.to_sym
+        elsif MAX_POLLS && polls >= MAX_POLLS
+          return :track_timeout
+        end
+
+        sleep(@poll_interval)
+      end
+
+      :unknown
+    rescue Interrupt # Local ctrl-c handler
+      prompt_for_task_cancel
+    end
+
+    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]: ")
+      if confirm.empty? || confirm =~ /y(es)?/i
+        self.class.new(@director, @task_id,
+                       @options.merge(:log_type => "debug")).track
+      else
+        say("Please use 'bosh task #{@task_id}' command ".make_red +
+              "to see the debug log".make_red)
+      end
+    end
+
+    def prompt_for_task_cancel
+      return unless interactive?
+      nl
+      confirm = ask("Do you want to cancel task #{@task_id}? [yN] " +
+                      "(^C again to detach): ")
+
+      if confirm =~ /y(es)?/i
+        say("Cancelling task #{@task_id}...")
+        @director.cancel_task(@task_id)
+      end
+
+      poll
+    rescue Interrupt
+      nl
+      err("Task #{@task_id} is still running")
+    end
+
+    def print_task_summary(task_status)
+      output_received(@task.flush_output)
+      @renderer.finish(task_status)
+
+      nl
+      say("Task #{@task_id} #{task_status.to_s.make_yellow}")
+
+      if task_status == :done && @renderer.duration_known?
+        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}")
+      end
+    end
+
+    private
+
+    def nl
+      super unless @quiet
+    end
+
+    def say(*args)
+      super unless @quiet
+    end
+
+    # @param [String] output Output received from director task
+    def output_received(output)
+      return if output.nil?
+      @output ||= ""
+      @output << output
+      @renderer.add_output(output)
+    end
+
+    def finished?(state)
+      %(done error cancelled).include?(state)
+    end
+
+    def interactive?
+      Bosh::Cli::Config.interactive
+    end
+  end
+end

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = '1.5.0.pre.1623'
+    VERSION = '1.5.0.pre.1633'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1623
+  version: 1.5.0.pre.1633
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-23 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.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  bf7b9f'
+  72d86c'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -304,7 +304,6 @@ files:
 - lib/cli/director_task.rb
 - lib/cli/download_with_progress.rb
 - lib/cli/errors.rb
-- lib/cli/event_log_renderer.rb
 - lib/cli/file_with_progress_bar.rb
 - lib/cli/job_builder.rb
 - lib/cli/job_command_args.rb
@@ -313,7 +312,6 @@ files:
 - lib/cli/job_state.rb
 - lib/cli/line_wrap.rb
 - lib/cli/name_version_pair.rb
-- lib/cli/null_renderer.rb
 - lib/cli/package_builder.rb
 - lib/cli/packaging_helper.rb
 - lib/cli/public_stemcell.rb
@@ -326,8 +324,12 @@ files:
 - lib/cli/resurrection.rb
 - lib/cli/runner.rb
 - lib/cli/stemcell.rb
-- lib/cli/task_log_renderer.rb
-- lib/cli/task_tracker.rb
+- 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_progress_bar.rb
+- lib/cli/task_tracking/task_log_renderer.rb
+- lib/cli/task_tracking/task_tracker.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
 - lib/cli/version_calc.rb

data/lib/cli/task_tracker.rb

@@ -1,154 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh
-  module Cli
-    # This class is responsible for tracking director tasks
-    class TaskTracker
-
-      MAX_POLLS = nil # not limited
-      DEFAULT_POLL_INTERVAL = 1 # second
-
-      attr_reader :output
-
-      attr_reader :renderer
-
-      # @param [Bosh::Cli::Client::Director] director
-      # @param [Integer] task_id
-      # @param [Hash] options
-      def initialize(director, task_id, options = {})
-        @director = director
-        @task_id = task_id
-        @options = options
-
-        @quiet = !!options[:quiet]
-        default_log_type = @quiet ? "none" : "event"
-
-        @log_type = options[:log_type] || default_log_type
-
-        @output = nil
-        @task = Bosh::Cli::DirectorTask.new(@director, @task_id, @log_type)
-
-        if options[:renderer]
-          @renderer = options[:renderer]
-        elsif options[:raw_output]
-          @renderer = Bosh::Cli::TaskLogRenderer.new
-        else
-          @renderer = Bosh::Cli::TaskLogRenderer.create_for_log_type(@log_type)
-        end
-
-        @poll_interval = Config.poll_interval || DEFAULT_POLL_INTERVAL
-      end
-
-      # Tracks director task. Blocks until task is in one of the 'finished'
-      # states (done, error, cancelled). Handles Ctrl+C by prompting to cancel
-      # task.
-      # @return [Symbol] Task status
-      def track
-        nl
-        @renderer.time_adjustment = @director.get_time_difference
-        say("Director task #{@task_id.to_s.make_yellow}")
-        task_status = poll
-
-        print_task_summary(task_status)
-
-        task_status
-      end
-
-      def poll
-        polls = 0
-
-        while true
-          polls += 1
-          state = @task.state
-          output = @task.output
-
-          output_received(output)
-          @renderer.refresh
-
-          if finished?(state)
-            return state.to_sym
-          elsif MAX_POLLS && polls >= MAX_POLLS
-            return :track_timeout
-          end
-
-          sleep(@poll_interval)
-        end
-
-        :unknown
-      rescue Interrupt # Local ctrl-c handler
-        prompt_for_task_cancel
-      end
-
-      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]: ")
-        if confirm.empty? || confirm =~ /y(es)?/i
-          self.class.new(@director, @task_id,
-                         @options.merge(:log_type => "debug")).track
-        else
-          say("Please use 'bosh task #{@task_id}' command ".make_red +
-                "to see the debug log".make_red)
-        end
-      end
-
-      def prompt_for_task_cancel
-        return unless interactive?
-        nl
-        confirm = ask("Do you want to cancel task #{@task_id}? [yN] " +
-                        "(^C again to detach): ")
-
-        if confirm =~ /y(es)?/i
-          say("Cancelling task #{@task_id}...")
-          @director.cancel_task(@task_id)
-        end
-
-        poll
-      rescue Interrupt
-        nl
-        err("Task #{@task_id} is still running")
-      end
-
-      def print_task_summary(task_status)
-        output_received(@task.flush_output)
-        @renderer.finish(task_status)
-
-        nl
-        say("Task #{@task_id} #{task_status.to_s.make_yellow}")
-
-        if task_status == :done && @renderer.duration_known?
-          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}")
-        end
-      end
-
-      private
-
-      def nl
-        super unless @quiet
-      end
-
-      def say(*args)
-        super unless @quiet
-      end
-
-      # @param [String] output Output received from director task
-      def output_received(output)
-        return if output.nil?
-        @output ||= ""
-        @output << output
-        @renderer.add_output(output)
-      end
-
-      def finished?(state)
-        %(done error cancelled).include?(state)
-      end
-
-      def interactive?
-        Bosh::Cli::Config.interactive
-      end
-    end
-  end
-end