Override new log_command_* methods in Dot and Pretty formatters

No longer rely on state in Command for determining log message type or std stream data

lib/sshkit/backends/local.rb

@@ -57,8 +57,6 @@ def execute_command(cmd)
           stderr_thread.join
 
           cmd.exit_status = wait_thr.value.to_i
-          cmd.clear_stdout_lines
-          cmd.clear_stderr_lines
 
           output.log_command_exit(cmd)
         end

lib/sshkit/formatters/dot.rb

@@ -4,11 +4,11 @@ module Formatter
 
     class Dot < Abstract
 
+      def log_command_exit(command)
+        original_output << colorize('.', command.failure? ? :red : :green)
+      end
+
       def write(obj)
-        return unless obj.is_a? SSHKit::Command
-        if obj.finished?
-          original_output << colorize('.', obj.failure? ? :red : :green)
-        end
       end
 
     end

lib/sshkit/formatters/pretty.rb

@@ -8,15 +8,36 @@ class Pretty < Abstract
       LEVEL_COLORS = [:black, :blue, :yellow, :red, :red].freeze
 
       def write(obj)
-        case obj
-        when SSHKit::Command    then write_command(obj)
-        when SSHKit::LogMessage then write_message(obj.verbosity, obj.to_s)
+        if obj.kind_of?(SSHKit::LogMessage)
+          write_message(obj.verbosity, obj.to_s)
         else
-          raise "Output formatter only supports formatting SSHKit::Command and SSHKit::LogMessage, " \
-                "called with #{obj.class}: #{obj.inspect}"
+          raise "write only supports formatting SSHKit::LogMessage, called with #{obj.class}: #{obj.inspect}"
         end
       end
 
+      def log_command_start(command)
+        host_prefix = command.host.user ? "as #{colorize(command.host.user, :blue)}@" : 'on '
+        message = "Running #{colorize(command, :yellow, :bold)} #{host_prefix}#{colorize(command.host, :blue)}"
+        write_message(command.verbosity, message, command.uuid)
+        write_message(Logger::DEBUG, "Command: #{colorize(command.to_command, :blue)}", command.uuid)
+      end
+
+      def log_command_data(command, stream_type, stream_data)
+        color = case stream_type
+          when :stdout then :green
+          when :stderr then :red
+          else raise "Unrecognised stream_type #{stream_type}, expected :stdout or :stderr"
+        end
+        write_message(Logger::DEBUG, colorize("\t#{stream_data}".chomp, color), command.uuid)
+      end
+
+      def log_command_exit(command)
+        runtime = sprintf('%5.3f seconds', command.runtime)
+        successful_or_failed =  command.failure? ? colorize('failed', :red, :bold) : colorize('successful', :green, :bold)
+        message = "Finished in #{runtime} with exit status #{command.exit_status} (#{successful_or_failed})."
+        write_message(command.verbosity, message, command.uuid)
+      end
+
       protected
 
       def format_message(verbosity, message, uuid=nil)
@@ -27,33 +48,6 @@ def format_message(verbosity, message, uuid=nil)
 
       private
 
-      def write_command(command)
-        uuid = command.uuid
-
-        unless command.started?
-          host_prefix = command.host.user ? "as #{colorize(command.host.user, :blue)}@" : 'on '
-          message = "Running #{colorize(command, :yellow, :bold)} #{host_prefix}#{colorize(command.host, :blue)}"
-          write_message(command.verbosity, message, uuid)
-          write_message(Logger::DEBUG, "Command: #{colorize(command.to_command, :blue)}", uuid)
-        end
-
-        write_std_stream_debug(command.clear_stdout_lines, :green, uuid)
-        write_std_stream_debug(command.clear_stderr_lines, :red, uuid)
-
-        if command.finished?
-          runtime = sprintf('%5.3f seconds', command.runtime)
-          successful_or_failed =  command.failure? ? colorize('failed', :red, :bold) : colorize('successful', :green, :bold)
-          message = "Finished in #{runtime} with exit status #{command.exit_status} (#{successful_or_failed})."
-          write_message(command.verbosity, message, uuid)
-        end
-      end
-
-      def write_std_stream_debug(lines, color, uuid)
-        lines.each do |line|
-          write_message(Logger::DEBUG, colorize("\t#{line}".chomp, color), uuid)
-        end
-      end
-
       def write_message(verbosity, message, uuid=nil)
         original_output << "#{format_message(verbosity, message, uuid)}\n" if verbosity >= SSHKit.config.output_verbosity
       end

test/unit/formatters/test_pretty.rb

@@ -88,7 +88,7 @@ def test_unsupported_class
       raised_error = assert_raises RuntimeError do
         pretty << Pathname.new('/tmp')
       end
-      assert_equal('Output formatter only supports formatting SSHKit::Command and SSHKit::LogMessage, called with Pathname: #<Pathname:/tmp>', raised_error.message)
+      assert_equal('write only supports formatting SSHKit::LogMessage, called with Pathname: #<Pathname:/tmp>', raised_error.message)
     end
 
     def test_does_not_log_message_when_verbosity_is_too_low

test/unit/formatters/test_simple_text.rb

@@ -61,7 +61,7 @@ def test_unsupported_class
       raised_error = assert_raises RuntimeError do
         simple << Pathname.new('/tmp')
       end
-      assert_equal('Output formatter only supports formatting SSHKit::Command and SSHKit::LogMessage, called with Pathname: #<Pathname:/tmp>', raised_error.message)
+      assert_equal('write only supports formatting SSHKit::LogMessage, called with Pathname: #<Pathname:/tmp>', raised_error.message)
     end
 
     def test_does_not_log_when_verbosity_is_too_low