airbrussh 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f8a8dfe9592ad3823bc7888584fe7be83252cb
-  data.tar.gz: f87ce479163f998b0b8c05baa26d8979656bad94
+  metadata.gz: e0a386319a132a613b48624a83110acc398c36b4
+  data.tar.gz: ae0e818ca6931928500bf516bed0a8f542c6a53f
 SHA512:
-  metadata.gz: d02fbf942e4fc78aab225897b09e34827ee47759d912ef773b964c05d6a2f536e83b3834561bfb990dcd27a5492557d5660b9a9c7a31845cf26581cd12f356b8
-  data.tar.gz: f265dda3cc676f575684b56561f760309175a879b5dc6f5439da6a29baaf28ad6dcf2a5e9f008086f537efb9161c25b1cb083e691451f452d61d19a9d02ca15e
+  metadata.gz: e372e78dd7f096b2602c998ed5178409978f8f0e6be17a5034c202c8e05a666ab9ccf61ab15a1bed01d9b2f141035c25fbe67b7e605ce5c251d9fe67b14c858c
+  data.tar.gz: 771b4bf163c6c2b59bacc25bfc6f4d7fe9931121ba3280587e403b42ee5633518c6c4d0bcd1b3c8dc9d01a6432ade255d48d1f92d3a9e614d11c72f63a971af6

data/.rubocop.yml

@@ -0,0 +1,35 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - "*.gemspec"
+
+Metrics/AbcSize:
+  Exclude:
+    - "test/**/*"
+
+Metrics/MethodLength:
+  Exclude:
+    - "test/**/*"
+
+Metrics/ClassLength:
+  Exclude:
+    - "test/**/*"
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.rubocop_todo.yml

@@ -0,0 +1,21 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-05-10 16:52:41 -0700 using RuboCop version 0.31.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 168
+
+# Offense count: 5
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 15
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+env:
+  - sshkit="master"
+  # This is the old master before https://github.com/capistrano/sshkit/pull/257 was merged
+  - sshkit="ea211bcbbb71dab0152a18c2774922b7017e4edc"
+  - sshkit="= 1.7.1"
+  - sshkit="= 1.6.1"
 before_install: gem install bundler --conservative --version '~> 1.8'

data/CHANGELOG.md

@@ -1,29 +1,57 @@
-## Next release
+# Airbrussh Change Log
+
+All notable changes to this project will be documented in this file.
+
+Airbrussh is in a pre-1.0 state. This means that its APIs and behavior are subject to breaking changes without deprecation notices. Until 1.0, version numbers will follow a [Semver][]-ish `0.y.z` format, where `y` is incremented when new features or breaking changes are introduced, and `z` is incremented for lesser changes or bug fixes.
+
+## [Unreleased]
 
 * Your contribution here!
 
-## 0.4.1 (2015-05-06)
+## [0.5.0][] (2015-06-24)
+
+There are no changes to the actual behavior and feature set of Airbrussh in this release.
+
+There are, however, many behind-the-scenes changes and improvements to overall code quality. This release also adds support for upcoming versions of SSHKit.
+
+* Added Rubocop enforcement to Travis
+* Added Code Climate and Coveralls checks (see badges in the README)
+* Airbrussh now has good test coverage, and is tested by Travis against a matrix of Ruby and SSHKit versions ([@robd](https://github.com/robd))
+* Changes to support the new SSHKit formatter API, as introduced in [SSHKit #257](https://github.com/capistrano/sshkit/pull/257) ([@robd](https://github.com/robd))
+* `Airbrussh.reset` has been removed
+* Airbrussh now has its own ANSI color code; it no longer relies on a third-party gem (i.e. `colorize`)
+
+## [0.4.1][] (2015-05-06)
 
 * Fix `Marshal.dump` warnings by removing `deep_copy` workaround that it is no longer needed for the latest SSHKit ([#10](https://github.com/mattbrictson/airbrussh/issues/10)).
 
-## 0.4.0 (2015-05-03)
+## [0.4.0][] (2015-05-03)
 
 * Changes to ensure compatibility with the upcoming version of SSHKit ([ec3122b](https://github.com/mattbrictson/airbrussh/commit/ec3122b101de53f2304723da842d5c8b6f70f4f3)).
 * Explicitly specify UTF-8 encoding for source files, for Ruby 1.9.3 compatibility ([#9](https://github.com/mattbrictson/airbrussh/issues/9)).
 
-## 0.3.0 (2015-03-28)
+## [0.3.0][] (2015-03-28)
 
 * New `config.banner` option allows startup message to be disabled or changed (suggestion from [@justindowning](https://github.com/justindowning))
 * New `config.command_output` option gives full control of whether airbrussh shows or hides the stderr and stdout data received from remote commands; see the usage section of the README for further explanation (suggestion from [@carlesso](https://github.com/carlesso))
 
-## 0.2.1 (2015-03-02)
+## [0.2.1][] (2015-03-02)
 
 * Un-pin SSHKit dependency now that SSHKit 1.7.1 has been released.
 
-## 0.2.0 (2015-03-02)
+## [0.2.0][] (2015-03-02)
 
 * Pin SSHKit dependency at `~> 1.6.1` to avoid a [bug in 1.7.0](https://github.com/capistrano/sshkit/issues/226) that causes command exit statuses to be omitted from the log.
 
 ## 0.0.1 (2015-02-19)
 
 * Initial release
+
+[Semver]: http://semver.org
+[Unreleased]: https://github.com/mattbrictson/airbrussh/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/mattbrictson/airbrussh/compare/v0.4.1...v0.5.0
+[0.4.1]: https://github.com/mattbrictson/airbrussh/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/mattbrictson/airbrussh/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/mattbrictson/airbrussh/compare/v0.2.1...v0.3.0
+[0.2.1]: https://github.com/mattbrictson/airbrussh/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/mattbrictson/airbrussh/compare/v0.0.1...v0.2.0

data/CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing to airbrussh
+
+Have a feature idea, bug fix, or refactoring suggestion? Contributions are welcome!
+
+## Pull requests
+
+1. Check [Issues][] to see if your contribution has already been discussed and/or implemented.
+2. If not, open an issue to discuss your contribution. I won't accept all changes and do not want to waste your time.
+3. Once you have the :thumbsup:, fork the repo, make your changes, and open a PR.
+4. Don't forget to add your contribution and credit yourself in `CHANGELOG.md`!
+
+## Coding guidelines
+
+* This project has a coding style enforced by [RuboCop][]. Use hash rockets and double-quoted strings, and otherwise try to follow the [Ruby style guide][style].
+* Writing tests is strongly encouraged! This project uses Minitest.
+
+## Getting started
+
+After checking out the repo, run `bin/setup` to install dependencies.
+
+* `rake` executes airbrussh's tests and RuboCop checks
+* `bin/test_all.rb` executes the tests against all versions of SSHKit that airbrussh supports
+* `guard` monitors the filesystem and automatically runs tests as you work
+
+[Issues]: https://github.com/mattbrictson/airbrussh/issues
+[RuboCop]: https://github.com/bbatsov/rubocop
+[style]: https://github.com/bbatsov/ruby-style-guide

data/Gemfile

@@ -2,3 +2,18 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in airbrussh.gemspec
 gemspec
+
+if (sshkit_version = ENV["sshkit"])
+  requirement = begin
+    Gem::Dependency.new("sshkit", sshkit_version).requirement
+  rescue ArgumentError
+    user, branch =
+      if sshkit_version.include?("#")
+        sshkit_version.split("#")
+      else
+        ["capistrano", sshkit_version]
+      end
+    { :github => "#{user}/sshkit", :branch => branch }
+  end
+  gem "sshkit", requirement
+end

data/Guardfile

@@ -0,0 +1,6 @@
+guard :minitest do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?(.*)_test\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r{^test/minitest_helper\.rb$})  { "test" }
+end

data/README.md

@@ -2,6 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/airbrussh.svg)](http://badge.fury.io/rb/airbrussh)
 [![Build Status](https://travis-ci.org/mattbrictson/airbrussh.svg?branch=master)](https://travis-ci.org/mattbrictson/airbrussh)
+[![Code Climate](https://codeclimate.com/github/mattbrictson/airbrussh/badges/gpa.svg)](https://codeclimate.com/github/mattbrictson/airbrussh)
+[![Coverage Status](https://coveralls.io/repos/mattbrictson/airbrussh/badge.svg?branch=master)](https://coveralls.io/r/mattbrictson/airbrussh?branch=master)
 
 
 **Airbrussh is a replacement log formatter for SSHKit that makes your Capistrano output much easier on the eyes.** Just add it to your Capfile and enjoy concise, useful log output that is easy to read.
@@ -16,7 +18,7 @@ For more details on how exactly Airbrussh changes Capistrano's output and the re
 
 **To use Airbrussh with Capistrano, you will need Capistrano 3.** Capistrano 2.x is not supported.
 
-Airbrussh has been tested with MRI 2.2, Capistrano 3.4.0, and SSHKit 1.7.1. Other recent version combinations will probably work; [open an issue on GitHub](https://github.com/mattbrictson/airbrussh/issues/new) if you run into trouble.
+Airbrussh has been tested with MRI 1.9+, Capistrano 3.4.0, and SSHKit 1.6.1+. Refer to the [Travis configuration](.travis.yml) for our latest test matrix. If you run into trouble using airbrussh in your environment, [open an issue on GitHub](https://github.com/mattbrictson/airbrussh/issues/new).
 
 Airbrussh's only dependency is SSHKit >= 1.6.1.
 
@@ -159,12 +161,10 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+Airbrussh is designed to work against multiple versions of SSHKit and Ruby. In order to test this, we use the environment variable `sshkit` in order to run the tests against a specific version. The combinations of sshkit and ruby we support are specified in [.travis.yml](.travis.yml). To test all the versions locally, there is a `test_all.rb` bin file. This installs the gems and runs the tests for each sshkit version in [.travis.yml](.travis.yml). *Note: this will update your `Gemfile.lock` as each SSHKit gem version is installed. The gem version is restored to the default when the script exits.*
+
 ## Contributing
 
-1. Fork it ( https://github.com/mattbrictson/airbrussh/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Contributions are welcome! Read [CONTRIBUTING.md](CONTRIBUTING.md) to get started.
 
 [capistrano-fiftyfive]: https://github.com/mattbrictson/capistrano-fiftyfive

data/Rakefile

@@ -1,8 +1,18 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
 
+require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1.0")
+  require "chandler/tasks"
+  task "release:rubygem_push" => "chandler:push"
 end
 
-task :default => :test
+task :default => [:test, :rubocop]

data/airbrussh.gemspec

@@ -24,7 +24,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sshkit", [">= 1.6.1", "!= 1.7.0"]
 
   spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "guard", ">= 2.2.2"
+  spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rb-fsevent"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "rubocop", ">= 0.31.0"
+  spec.add_development_dependency "terminal-notifier-guard"
+
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1.0")
+    spec.add_development_dependency "chandler"
+  end
 end

data/bin/test_all.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require "yaml"
+require "English"
+
+YAML.load_file(".travis.yml")["env"].each do |sshkit_version|
+  puts "\e[0;34;49m== Running tests against #{sshkit_version} ==\e[0m"
+  output = `#{sshkit_version} bundle update`
+  fail "bundle update failed: #{output}" unless $CHILD_STATUS.success?
+  system("#{sshkit_version} bundle exec rake test")
+end
+
+at_exit do
+  puts "\e[0;34;49m== Resetting sshkit ==\e[0m"
+  system("bundle update")
+end

data/lib/airbrussh.rb

@@ -7,10 +7,6 @@ module Airbrussh
     @configuration ||= Configuration.new
   end
 
-  def self.reset
-    @configuration = Configuration.new
-  end
-
   def self.configure
     yield(configuration)
   end

data/lib/airbrussh/capistrano.rb

@@ -1,5 +1,5 @@
 require "airbrussh"
-require "colorize"
+require "airbrussh/colors"
 require "sshkit/formatter/airbrussh"
 
 # airbrush/capistrano uses a different default configuration
@@ -10,12 +10,12 @@ end
 
 # Sanity check!
 unless defined?(Capistrano) && defined?(:namespace)
-  $stderr.puts\
-    "WARNING: airbrussh/capistrano must be loaded by Capistrano in order "\
-    "to work.\n"\
-    "Require this gem within your application's Capfile, as described here:\n"\
-    "https://github.com/mattbrictson/airbrussh#installation"\
-    .colorize(:red)
+  $stderr.puts(
+    Airbrussh::Colors.red(
+      "WARNING: airbrussh/capistrano must be loaded by Capistrano in order "\
+      "to work.\nRequire this gem within your application's Capfile, as "\
+      "described here:\nhttps://github.com/mattbrictson/airbrussh#installation"
+    ))
 end
 
 # Hook into Capistrano's init process to set the formatter

data/lib/airbrussh/colors.rb

@@ -0,0 +1,24 @@
+module Airbrussh
+  # Very basic support for ANSI color, so that we don't have to rely on
+  # any external dependencies.
+  module Colors
+    ANSI_CODES = {
+      :red    => 31,
+      :green  => 32,
+      :yellow => 33,
+      :blue   => 34,
+      :gray   => 90
+    }.freeze
+
+    module_function
+
+    # Define red, green, blue, etc. methods that return a copy of the
+    # String that is wrapped in the corresponding ANSI color escape
+    # sequence.
+    ANSI_CODES.each do |name, code|
+      define_method(name) do |string|
+        "\e[0;#{code};49m#{string}\e[0m"
+      end
+    end
+  end
+end

data/lib/airbrussh/command_formatter.rb

@@ -0,0 +1,77 @@
+# encoding: UTF-8
+require "airbrussh/colors"
+# rubocop:disable Style/AsciiComments
+
+module Airbrussh
+  # Decorates an SSHKit::Command to add string output helpers.
+  class CommandFormatter < SimpleDelegator
+    include Airbrussh::Colors
+
+    # Prefixes the line with the command number and removes the newline.
+    #
+    # format_output("hello\n") # => "01 hello"
+    #
+    def format_output(line)
+      "#{number} #{line.chomp}"
+    end
+
+    # Returns the abbreviated command (in yellow) with the number prefix.
+    #
+    # start_message # => "01 echo hello"
+    #
+    def start_message
+      "#{number} #{yellow(abbreviated)}"
+    end
+
+    # Returns a green (success) or red (failure) message depending on the
+    # exit status.
+    #
+    # exit_message # => "✔ 01 user@host 0.084s"
+    # exit_message # => "✘ 01 user@host 0.084s"
+    #
+    # If `log_file` is specified, it is appended to the message
+    # in the failure case.
+    #
+    # exit_message("out.log")
+    # # => "✘ 01 user@host (see out.log for details) 0.084s"
+    #
+    def exit_message(log_file=nil)
+      if failure?
+        message = red(failure_message(log_file))
+      else
+        message = green(success_message)
+      end
+      message << " #{gray(runtime)}"
+    end
+
+    private
+
+    def user_at_host
+      user_str = user { host.user }
+      host_str = host.to_s
+      [user_str, host_str].join("@")
+    end
+
+    def runtime
+      format("%5.3fs", super)
+    end
+
+    def abbreviated
+      to_s.sub(%r{^/usr/bin/env }, "")
+    end
+
+    def number
+      format("%02d", position + 1)
+    end
+
+    def success_message
+      "✔ #{number} #{user_at_host}"
+    end
+
+    def failure_message(log_file)
+      message = "✘ #{number} #{user_at_host}"
+      message << " (see #{log_file} for details)" if log_file
+      message
+    end
+  end
+end

data/lib/airbrussh/console.rb

@@ -9,8 +9,11 @@ module Airbrussh
   # an ANSI color-capable console. When a console is not present (e.g. when
   # running on a CI server) the output will gracefully degrade.
   class Console
-    def initialize(output)
+    attr_reader :output, :config
+
+    def initialize(output, config=Airbrussh.configuration)
       @output = output
+      @config = config
     end
 
     # Writes to the IO after first truncating the output to fit the console
@@ -20,21 +23,17 @@ module Airbrussh
     def print_line(obj="")
       string = obj.to_s
 
-      if console_width
-        string = truncate_to_console_width(string)
-      end
-      unless color_enabled?
-        string = strip_ascii_color(string)
-      end
+      string = truncate_to_console_width(string) if console_width
+      string = strip_ascii_color(string) unless color_enabled?
 
       write(string + "\n")
-      @output.flush
+      output.flush
     end
 
     # Writes directly through to the IO with no truncation or color logic.
     # No newline is added.
     def write(string)
-      @output.write(string || "")
+      output.write(string || "")
     end
     alias_method :<<, :write
 
@@ -43,9 +42,7 @@ module Airbrussh
       width = console_width
 
       if strip_ascii_color(string).length > width
-        while strip_ascii_color(string).length >= width
-          string.chop!
-        end
+        string.chop! while strip_ascii_color(string).length >= width
         string << "…\e[0m"
       else
         string
@@ -57,7 +54,7 @@ module Airbrussh
     end
 
     def console_width
-      case (truncate = Airbrussh.configuration.truncate)
+      case (truncate = config.truncate)
       when :auto
         IO.console.winsize.last if @output.tty?
       when Fixnum
@@ -68,7 +65,7 @@ module Airbrussh
     private
 
     def color_enabled?
-      case Airbrussh.configuration.color
+      case config.color
       when true
         true
       when :auto

data/lib/airbrussh/formatter.rb

@@ -1,44 +1,29 @@
-# encoding: UTF-8
+require "airbrussh/colors"
+require "airbrussh/command_formatter"
 require "airbrussh/command_output"
 require "airbrussh/console"
-require "colorize"
-require "ostruct"
+require "airbrussh/rake/command"
+require "airbrussh/rake/context"
 require "sshkit"
 
 module Airbrussh
   class Formatter < SSHKit::Formatter::Abstract
-    class << self
-      attr_accessor :current_rake_task
-
-      def monkey_patch_rake_task!
-        return unless Airbrussh.configuration.monkey_patch_rake
-        return if @rake_patched
-
-        eval(<<-EVAL)
-          class ::Rake::Task
-            alias_method :_original_execute_airbrussh, :execute
-            def execute(args=nil)
-              #{name}.current_rake_task = name
-              _original_execute_airbrussh(args)
-            end
-          end
-        EVAL
-
-        @rake_patched = true
-      end
-    end
+    include Airbrussh::Colors
+    extend Forwardable
 
-    def initialize(io)
-      super
+    attr_reader :config, :context
+    def_delegator :context, :current_task_name
 
-      self.class.monkey_patch_rake_task!
+    def initialize(io, config=Airbrussh.configuration)
+      super(io)
 
-      @tasks = {}
+      @config = config
+      @context = Airbrussh::Rake::Context.new(config)
 
       @log_file = config.log_file
       @log_file_formatter = create_log_file_formatter
 
-      @console = Airbrussh::Console.new(original_output)
+      @console = Airbrussh::Console.new(original_output, config)
       write_log_file_delimiter
       write_banner
     end
@@ -46,14 +31,10 @@ module Airbrussh
     def create_log_file_formatter
       return SSHKit::Formatter::BlackHole.new(nil) if @log_file.nil?
       SSHKit::Formatter::Pretty.new(
-        ::Logger.new(@log_file, 1, 20971520)
+        ::Logger.new(@log_file, 1, 20_971_520)
       )
     end
 
-    def print_line(string)
-      @console.print_line(string)
-    end
-
     def write_banner
       return unless config.banner
       if config.banner == :auto
@@ -74,136 +55,101 @@ module Airbrussh
         @log_file_formatter << SSHKit::LogMessage.new(
           SSHKit::Logger::INFO,
           line
-          )
+        )
       end
     end
 
+    def log_command_start(command)
+      command = decorate(command)
+      @log_file_formatter.log_command_start(command)
+      write_command_start(command)
+    end
+
+    def log_command_data(command, stream_type, line)
+      command = decorate(command)
+      @log_file_formatter.log_command_data(command, stream_type, line)
+      write_command_output_line(command, stream_type, line)
+    end
+
+    def log_command_exit(command)
+      command = decorate(command)
+      @log_file_formatter.log_command_exit(command)
+      write_command_exit(command)
+    end
+
     def write(obj)
       # SSHKit's :pretty formatter mutates the stdout and stderr data in the
       # command obj. So we need to dup it to ensure our copy is unscathed.
       @log_file_formatter << obj.dup
 
       case obj
-      when SSHKit::Command    then write_command(obj)
-      when SSHKit::LogMessage then write_log_message(obj)
+      when SSHKit::Command
+        command = decorate(obj)
+        write_command_start(command)
+        write_command_output(command)
+        write_command_exit(command) if command.finished?
+      when SSHKit::LogMessage
+        write_log_message(obj)
       end
     end
-    alias :<< :write
+    alias_method :<<, :write
 
     def on_deploy_failure
       return if @log_file.nil?
       err = Airbrussh::Console.new($stderr)
       err.print_line
       err.print_line(red("** DEPLOY FAILED"))
-      err.print_line(yellow(
-        "** Refer to #{@log_file} for details. Here are the last 20 lines:"
-        ))
+      err.print_line(yellow("** Refer to #{@log_file} for details. "\
+                            "Here are the last 20 lines:"))
       err.print_line
       system("tail -n 20 #{@log_file.shellescape} 1>&2")
     end
 
     private
 
+    attr_accessor :last_printed_task
+
     def write_log_message(log_message)
-      return unless log_message.verbosity >= SSHKit::Logger::INFO
+      return if debug?(log_message)
       print_task_if_changed
-      @console.print_line(light_black("      " + log_message.to_s))
+      print_indented_line(gray(log_message.to_s))
     end
 
-    def write_command(command)
-      return unless command.verbosity > SSHKit::Logger::DEBUG
-
+    def write_command_start(command)
+      return if debug?(command)
       print_task_if_changed
-
-      ctx = context_for_command(command)
-      number = '%02d' % ctx.number
-
-      if ctx.first_execution?
-        description = yellow(ctx.shell_string)
-        print_line "      #{number} #{description}"
-      end
-
-      write_command_output(command, number)
-
-      if command.finished?
-        status = format_command_completion_status(command, number)
-        print_line "    #{status}"
-      end
+      print_indented_line(command.start_message) if command.first_execution?
     end
 
     # Prints the data from the stdout and stderr streams of the given command,
     # but only if enabled (see Airbrussh::Configuration#command_output).
-    def write_command_output(command, number)
+    def write_command_output(command)
       # Use a bit of meta-programming here, since stderr and stdout logic
       # are identical except for different method names.
       %w(stderr stdout).each do |stream|
-        next unless config.public_send("command_output_#{stream}?")
         CommandOutput.for(command).each_line(stream) do |line|
-          print_line "      #{number} #{line.chomp}"
+          write_command_output_line(command, stream, line)
         end
       end
     end
 
-    def print_task_if_changed
-      status = current_task_status
-
-      if status.changed && !status.task.empty?
-        print_line "#{clock} #{blue(status.task)}"
-      end
+    def write_command_output_line(command, stream, line)
+      hide_command_output = !config.public_send("command_output_#{stream}?")
+      return if hide_command_output || debug?(command)
+      print_indented_line(command.format_output(line))
     end
 
-    def current_task_status
-      task = self.class.current_rake_task.to_s
-      if @tasks[task]
-        changed = false
-      else
-        changed = true
-        @tasks[task] = []
-      end
+    def print_task_if_changed
+      return if current_task_name.nil?
+      return if current_task_name == last_printed_task
 
-      OpenStruct.new(
-        :task => task,
-        :commands => @tasks[task],
-        :changed => changed
-      )
+      self.last_printed_task = current_task_name
+      print_line("#{clock} #{blue(current_task_name)}")
     end
 
-    def context_for_command(command)
-      status = current_task_status
-      task_commands = status.commands
-
-      shell_string = command.to_s.sub(%r(^/usr/bin/env ), "")
-
-      if task_commands.include?(shell_string)
-        first_execution = false
-      else
-        first_execution = true
-        task_commands << shell_string
-      end
-
-      number = task_commands.index(shell_string) + 1
-
-      OpenStruct.new({
-        :first_execution? => first_execution,
-        :number => number,
-        :shell_string => shell_string
-      })
-    end
-
-    def format_command_completion_status(command, number)
-      user = command.user { command.host.user }
-      host = command.host.to_s
-      user_at_host = [user, host].join("@")
-
-      status = if command.failure?
-        red("✘ #{number} #{user_at_host} (see #{@log_file} for details)")
-      else
-        green("✔ #{number} #{user_at_host}")
-      end
-
-      runtime = light_black("%5.3fs" % command.runtime)
-
-      status + " " + runtime
+    def write_command_exit(command)
+      return if debug?(command)
+      print_indented_line(command.exit_message(@log_file), -2)
     end
 
     def clock
@@ -213,17 +159,24 @@ module Airbrussh
       minutes = (duration / 60).to_i
       seconds = (duration - minutes * 60).to_i
 
-      "%02d:%02d" % [minutes, seconds]
+      format("%02d:%02d", minutes, seconds)
     end
 
-    %w(light_black red blue green yellow).each do |color|
-      define_method(color) do |string|
-        string.to_s.colorize(color.to_sym)
-      end
+    def debug?(obj)
+      obj.verbosity <= SSHKit::Logger::DEBUG
+    end
+
+    def decorate(command)
+      Airbrussh::CommandFormatter.new(@context.decorate_command(command))
+    end
+
+    def print_line(string)
+      @console.print_line(string)
     end
 
-    def config
-      Airbrussh.configuration
+    def print_indented_line(string, offset=0)
+      indent = " " * (6 + offset)
+      print_line([indent, string].join)
     end
   end
 end

data/lib/airbrussh/rake/command.rb

@@ -0,0 +1,24 @@
+module Airbrussh
+  module Rake
+    # Decorates an SSHKit Command to add Rake-specific contextual information:
+    #
+    # * first_execution? - is this the first time this command has been run in
+    #                      the context of the current rake task?
+    # * position - zero-based position of this command in the list of
+    #              all commands that have been run in the current rake task
+    #
+    class Command < SimpleDelegator
+      attr_reader :first_execution, :position
+
+      def initialize(command, first_execution, position)
+        super(command)
+        @first_execution = first_execution
+        @position = position
+      end
+
+      def first_execution?
+        first_execution
+      end
+    end
+  end
+end

data/lib/airbrussh/rake/context.rb

@@ -0,0 +1,73 @@
+require "rake"
+require "airbrussh/rake/command"
+
+module Airbrussh
+  module Rake
+    # Maintains information about what Rake task is currently being invoked,
+    # in order to be able to decorate SSHKit commands with additional
+    # context-sensitive information. Works via a monkey patch to Rake::Task,
+    # which can be disabled via by setting
+    # Airbrussh.configuration.monkey_patch_rake = false.
+    #
+    class Context
+      def initialize(config=Airbrussh.configuration)
+        @history = []
+        @enabled = config.monkey_patch_rake
+        self.class.install_monkey_patch if enabled?
+      end
+
+      # Returns the name of the currently-executing rake task, if it can be
+      # determined. If monkey patching is disabled, this will be nil.
+      def current_task_name
+        return nil unless enabled?
+        self.class.current_task_name
+      end
+
+      # Decorate an SSHKit Command with Rake::Command to provide additional
+      # context-sensitive information.
+      def decorate_command(command)
+        reset_history_if_task_changed
+
+        first_execution = !history.include?(command.to_s)
+        history << command.to_s
+        history.uniq!
+
+        Airbrussh::Rake::Command.new(
+          command,
+          first_execution,
+          history.index(command.to_s)
+        )
+      end
+
+      class << self
+        attr_accessor :current_task_name
+
+        def install_monkey_patch
+          return if ::Rake::Task.instance_methods.include?(:_airbrussh_execute)
+
+          ::Rake::Task.class_exec do
+            alias_method :_airbrussh_execute, :execute
+            def execute(args=nil) # rubocop:disable Lint/NestedMethodDefinition
+              ::Airbrussh::Rake::Context.current_task_name = name.to_s
+              _airbrussh_execute(args)
+            end
+          end
+        end
+      end
+
+      private
+
+      attr_reader :history
+      attr_accessor :last_task_name
+
+      def reset_history_if_task_changed
+        history.clear if last_task_name != current_task_name
+        self.last_task_name = current_task_name
+      end
+
+      def enabled?
+        @enabled
+      end
+    end
+  end
+end

data/lib/airbrussh/version.rb

@@ -1,3 +1,3 @@
 module Airbrussh
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrussh
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -44,6 +44,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +142,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.31.0
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chandler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A replacement log formatter for SSHKit that makes Capistrano output much
   easier on the eyes. Just add Airbrussh to your Capfile and enjoy concise, useful
   log output that is easy to read.
@@ -96,22 +194,31 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - airbrussh.gemspec
 - bin/console
 - bin/setup
+- bin/test_all.rb
 - demo.gif
 - lib/airbrussh.rb
 - lib/airbrussh/capistrano.rb
+- lib/airbrussh/colors.rb
+- lib/airbrussh/command_formatter.rb
 - lib/airbrussh/command_output.rb
 - lib/airbrussh/configuration.rb
 - lib/airbrussh/console.rb
 - lib/airbrussh/formatter.rb
+- lib/airbrussh/rake/command.rb
+- lib/airbrussh/rake/context.rb
 - lib/airbrussh/version.rb
 - lib/sshkit/formatter/airbrussh.rb
 homepage: https://github.com/mattbrictson/airbrussh
@@ -134,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Airbrussh pretties up your SSHKit and Capistrano output