airbrussh 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cce6c8fd80458eebccd4bc41fd5f55d45435e056
-  data.tar.gz: 1e6c39223361f97a90d2593aec1c3f873c61cc13
+  metadata.gz: 4190ed3e910f42341fb9f0b011c2344a7e61d319
+  data.tar.gz: 241bd99b747b5547aa323d8d279bda603277a822
 SHA512:
-  metadata.gz: 1695037c080995aabfe3bca4c05c1066700002803e4909b21fa18c58370e8ce364f3f35d0f624225b2a3a4165aed3410cf6a3bff4f254b26fc70b00f93dbf92f
-  data.tar.gz: d58bd13170ce51ddc74af022e0661d5b1844ede48eab39ac8d289b67832d8b5a84b7e22ee6ba05c56b4fa35eff3df3bf6ec49cf25dc28405a05ab1973fc37b41
+  metadata.gz: 3a3f03a76405c5502739ab9de9600608f635c8367e51ccea07bd8de677977d2bf7a7bc1f3644c0a89105ae3577f498331681d2609be3ff33023c71462abc53c9
+  data.tar.gz: b74f8692916139b70407530a83cc8737b3a55c73863569c75bf304bf5595859b63d12c962ed34f240b7cd445d832ab957c7ff61126c913610b0e4fa380b516bc

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.2.0
+before_install: gem install bundler --conservative --version '~> 1.8'

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 * Your contribution here!
 
+## 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)
 
 * New `config.banner` option allows startup message to be disabled or changed (suggestion from [@justindowning](https://github.com/justindowning))

data/README.md

@@ -1,6 +1,7 @@
 # Airbrussh
 
 [![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)
 
 
 **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.

data/airbrussh.gemspec

@@ -9,10 +9,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Matt Brictson"]
   spec.email         = ["airbrussh@mattbrictson.com"]
   spec.summary       = "Airbrussh pretties up your SSHKit and Capistrano output"
-  spec.description   = "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."
+  spec.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."
   spec.homepage      = "https://github.com/mattbrictson/airbrussh"
   spec.license       = "MIT"
 

data/lib/airbrussh/command_output.rb

@@ -0,0 +1,42 @@
+module Airbrussh
+  # A facade that provides access to stdout and stderr command output of
+  # sshkit commands. This is needed to normalize the API differences in
+  # various sshkit versions.
+  class CommandOutput
+    def self.for(command)
+      if command.respond_to?(:clear_stdout_lines)
+        Modern.new(command)
+      else
+        Legacy.new(command)
+      end
+    end
+
+    attr_reader :command
+
+    def initialize(command)
+      @command = command
+    end
+  end
+
+  class Legacy < CommandOutput
+    # The stderr/stdout methods provided by the command object have the current
+    # "chunk" as received over the wire. Since there may be more chunks
+    # appended and we don't want to print duplicates, clear the current data.
+    def each_line(stream, &block)
+      output = command.public_send(stream)
+      return if output.empty?
+      output.lines.to_a.each(&block)
+      command.public_send("#{stream}=", "")
+    end
+  end
+
+  class Modern < CommandOutput
+    # Newer versions of sshkit take care of clearing the output with the
+    # clear_stdout_lines/clear_stderr_lines methods.
+    def each_line(stream, &block)
+      lines = command.public_send("clear_#{stream}_lines")
+      return if lines.join.empty?
+      lines.each(&block)
+    end
+  end
+end

data/lib/airbrussh/console.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "io/console"
 
 module Airbrussh

data/lib/airbrussh/formatter.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+require "airbrussh/command_output"
 require "airbrussh/console"
 require "colorize"
 require "ostruct"
@@ -78,8 +80,8 @@ module Airbrussh
 
     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
+      # command obj. So we need to clone it to ensure our copy is unscathed.
+      @log_file_formatter << deep_copy(obj)
 
       case obj
       when SSHKit::Command    then write_command(obj)
@@ -135,20 +137,10 @@ module Airbrussh
       # 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}?")
-        output = command.public_send(stream)
-        next if output.empty?
-
-        output.lines.each do |line|
+        CommandOutput.for(command).each_line(stream) do |line|
           print_line "      #{number} #{line.chomp}"
         end
-
-        # The stderr/stdout data provided by the command object is the current
-        # "chunk" as received over the wire. Since there may be more chunks
-        # appended and we don't want to print duplicates, clear the current
-        # data.
-        command.public_send("#{stream}=", "")
       end
     end
 
@@ -233,5 +225,9 @@ module Airbrussh
     def config
       Airbrussh.configuration
     end
+
+    def deep_copy(obj)
+      Marshal.load(Marshal.dump(obj))
+    end
   end
 end

data/lib/airbrussh/version.rb

@@ -1,3 +1,3 @@
 module Airbrussh
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrussh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -86,8 +86,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 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
+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.
 email:
 - airbrussh@mattbrictson.com
@@ -108,6 +108,7 @@ files:
 - demo.gif
 - lib/airbrussh.rb
 - lib/airbrussh/capistrano.rb
+- lib/airbrussh/command_output.rb
 - lib/airbrussh/configuration.rb
 - lib/airbrussh/console.rb
 - lib/airbrussh/formatter.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Airbrussh pretties up your SSHKit and Capistrano output