airbrussh 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6b3ea8f017cf5a2a357df3cb654324d9876032
-  data.tar.gz: 856bd2e98e1069a4a7963154f901f605cbf6ad16
+  metadata.gz: d662aabb8319be601cbbd4222aafcd770af9a9a5
+  data.tar.gz: 71685552b59431833e0268b8e7caaa8bb6da6742
 SHA512:
-  metadata.gz: 5a7eec2739ba0aa82f368456dc8de6430d085c724a216222697ea43be1b2cc5d3bdb6d13c358dd20aef5793e0d4e2acfd9e05b7757978f6768e7c80bcac37530
-  data.tar.gz: 83d6d12502cb7238bf617f5dcfe5a5c61ac1bc36f6cd8dbfd023058c6b0e7beff92e4f41870ab99d1d920a5797f6bd80f049ed215dced9f42fd7866fc911d0fb
+  metadata.gz: daaf6c90769d7d44a82c3d60a893a64090acb768a0cfe7e50cb6a2c6af76be1f704668035db0b0abfcfe45946aaef8ca93faf38016280b5804248123c65f2e5f
+  data.tar.gz: 1ba2a9cd0cc8cd7eaa6f47d36ba22e44f6484f8245b9959089a32b71b4ea60e93cd25d20a90a6fabced9bab2ad59fa439284402b70027215863aa88264459add

data/.travis.yml

@@ -22,4 +22,4 @@ matrix:
     - rvm: 2.4.0
       script: bundle exec danger
 
-before_install: gem install bundler --conservative --version '~> 1.10'
+before_install: gem install bundler --conservative --version '~> 1.13.7'

data/CHANGELOG.md

@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file. This projec
 
 * Your contribution here!
 
+## [1.2.0][] (2017-04-14)
+
+* [#95](https://github.com/mattbrictson/airbrussh/pull/95): colorize LogMessage label on WARN level and above - [@klyonrad](https://github.com/klyonrad)
+* [#106](https://github.com/mattbrictson/airbrussh/pull/106): Remove the `log_file` parameter from the `CommandFormatter#exit_message` method; it was unused - [@mattbrictson](https://github.com/mattbrictson)
+
 ## [1.1.2][] (2017-01-02)
 
 * Add Ruby 2.4.0 to testing matrix and fix Ruby 2.4 deprecation warnings
@@ -126,7 +131,8 @@ There are, however, many behind-the-scenes changes and improvements to overall c
 * Initial release
 
 [Semver]: http://semver.org
-[Unreleased]: https://github.com/mattbrictson/airbrussh/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/mattbrictson/airbrussh/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/mattbrictson/airbrussh/compare/v1.1.2...v1.2.0
 [1.1.2]: https://github.com/mattbrictson/airbrussh/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/mattbrictson/airbrussh/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/mattbrictson/airbrussh/compare/v1.0.2...v1.1.0

data/Dangerfile

@@ -1,48 +1 @@
-# Adapted from https://github.com/ruby-grape/danger/blob/master/Dangerfile
-# Q: What is a Dangerfile, anyway? A: See http://danger.systems/
-
-# ------------------------------------------------------------------------------
-# What changed?
-# ------------------------------------------------------------------------------
-has_lib_changes = !git.modified_files.grep(/^lib/).empty?
-has_test_changes = !git.modified_files.grep(/^test/).empty?
-has_changelog_changes = git.modified_files.include?("CHANGELOG.md")
-
-# ------------------------------------------------------------------------------
-# You've made changes to lib, but didn't write any tests?
-# ------------------------------------------------------------------------------
-if has_lib_changes && !has_test_changes
-  warn("There are code changes, but no corresponding tests. "\
-       "Please include tests if this PR introduces any modifications in "\
-       "Airbrussh's behavior.",
-       :sticky => false)
-end
-
-# ------------------------------------------------------------------------------
-# Have you updated CHANGELOG.md?
-# ------------------------------------------------------------------------------
-if !has_changelog_changes && has_lib_changes
-  pr_number = github.pr_json["number"]
-  markdown <<-MARKDOWN
-Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
-
-```markdown
-* [##{pr_number}](https://github.com/mattbrictson/airbrussh/pull/#{pr_number}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
-```
-MARKDOWN
-  warn("Please update CHANGELOG.md with a description of your changes. "\
-       "If this PR is not a user-facing change (e.g. just refactoring), "\
-       "you can disregard this.", :sticky => false)
-end
-
-# ------------------------------------------------------------------------------
-# Did you remove the CHANGELOG's "Your contribution here!" line?
-# ------------------------------------------------------------------------------
-if has_changelog_changes
-  unless IO.read("CHANGELOG.md") =~ /^\* Your contribution here/i
-    fail(
-      "Please put the `* Your contribution here!` line back into CHANGELOG.md.",
-      :sticky => false
-    )
-  end
-end
+danger.import_dangerfile(github: "capistrano/danger")

data/Gemfile

@@ -17,7 +17,7 @@ group :extras, :optional => true do
 end
 
 # Danger is used by Travis, but only for Ruby 2.0+
-gem "danger" unless RUBY_VERSION == "1.9.3"
+gem "danger", "~> 4.3" unless RUBY_VERSION == "1.9.3"
 
 if (sshkit_version = ENV["sshkit"])
   requirement = begin

data/airbrussh.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sshkit", [">= 1.6.1", "!= 1.7.0"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "coveralls", "~> 0.8.15"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "minitest", "~> 5.10"
+  spec.add_development_dependency "minitest-reporters", "~> 1.1"
+  spec.add_development_dependency "mocha", "~> 1.2"
   spec.add_development_dependency "rubocop", "~> 0.41.2"
 end

data/lib/airbrussh/command_formatter.rb

@@ -40,15 +40,9 @@ module Airbrussh
     # 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)
+    def exit_message
       message = if failure?
-                  red(failure_message(log_file))
+                  red(failure_message)
                 else
                   green(success_message)
                 end
@@ -79,10 +73,8 @@ module Airbrussh
       "✔ #{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
+    def failure_message
+      "✘ #{number} #{user_at_host}"
     end
   end
 end

data/lib/airbrussh/console_formatter.rb

@@ -46,7 +46,7 @@ module Airbrussh
     def log_command_exit(command)
       return if debug?(command)
       command = decorate(command)
-      print_indented_line(command.exit_message(@log_file), -2)
+      print_indented_line(command.exit_message, -2)
     end
 
     def write(obj)
@@ -69,7 +69,20 @@ module Airbrussh
     def write_log_message(log_message)
       return if debug?(log_message)
       print_task_if_changed
-      print_indented_line(log_message.to_s)
+      print_indented_line(format_log_message(log_message))
+    end
+
+    def format_log_message(log_message)
+      case log_message.verbosity
+      when SSHKit::Logger::WARN
+        "#{yellow('WARN')}  #{log_message}"
+      when SSHKit::Logger::ERROR
+        "#{red('ERROR')} #{log_message}"
+      when SSHKit::Logger::FATAL
+        "#{red('FATAL')} #{log_message}"
+      else
+        log_message.to_s
+      end
     end
 
     # For SSHKit versions up to and including 1.7.1, the stdout and stderr

data/lib/airbrussh/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Airbrussh
-  VERSION = "1.1.2".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrussh
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -48,72 +48,72 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Airbrussh pretties up your SSHKit and Capistrano output