airbrussh 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5095008b2da0972ef8ddd59236e4c4b3e485a36e70d5dd993dd3d1f3d4c54a2
-  data.tar.gz: 2e9acb4b0ba189573b74e69a2fd59fa934d4e0c190e605ee7802b481e7efc986
+  metadata.gz: '03792c145b7480b4fe239dd521fea545b89cfb049ce9c91e52617f5a1f26174d'
+  data.tar.gz: 8104be7dd231ca5075500be1454635efbda6245adf53a88e8b54c25123dc9dbd
 SHA512:
-  metadata.gz: 40d3d49a1c8cab1efd4c999c9f9b43bfdbdfb6802037a194dac88d5657e29ce2d6b40c7fdcf3f1c7272d4813d12c108bae9cf3f8471ee8ae8a5e8b2d014e4b9f
-  data.tar.gz: e1dcbeafa6829206fad22342c80b4ddf87f68251bd2f3b9e84ab8dcb3fa48833b074f4b9db033b530ff0b33db6024c10f518517f5101b1e3455cfae947ce5f0e
+  metadata.gz: c0d9499a69b1818818d29e96ce62f4131d0958b157bea34e21601a341b8097cae8b533c6505e567976e28af11098ddb954fbacb747df2fb4ed599d9bce7ad8d3
+  data.tar.gz: 0f30a4a7a98346ee8966e8856c254eb3a02c8fe88f25305371967ed6138475fcc2046f43f75262a70fd9b536e5c7c0919b7af6a709496006110fa49e46b71f60

data/.travis.yml

@@ -5,10 +5,10 @@ rvm:
   - 1.9
   - 2.0
   - 2.1
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
   - ruby-head
 env:
   - sshkit="master"
@@ -17,13 +17,13 @@ env:
 matrix:
   exclude:
     # Older versions of SSHKit don't work with Ruby 2.4+, so skip those
-    - rvm: 2.4.3
+    - rvm: 2.4.5
       env: sshkit="= 1.7.1"
-    - rvm: 2.4.3
+    - rvm: 2.4.5
       env: sshkit="= 1.6.1"
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: sshkit="= 1.7.1"
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: sshkit="= 1.6.1"
     - rvm: ruby-head
       env: sshkit="= 1.7.1"
@@ -33,10 +33,13 @@ matrix:
     - rvm: 1.9
       env: sshkit="master"
   include:
-    # Run Danger only once, on 2.4.3
-    - rvm: 2.4.3
+    # Run Danger only once, on 2.4.5
+    - rvm: 2.4.5
       script: bundle exec danger
 
 before_install:
-  - gem update --system
-  - gem install bundler --no-document
+  - gem update --system || echo "skipping rubygems upgrade"
+  - gem install bundler -v 1.17.3 --conservative --no-document
+  - gem install executable-hooks --conservative --no-document
+install:
+  - bundle _1.17.3_ install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} || bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}

data/CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file. This projec
 
 * Your contribution here!
 
+## [1.3.2][] (2019-06-15)
+
+* [#121](https://github.com/mattbrictson/airbrussh/pull/121): Gracefully handle SSH output that has invalid UTF-8 encoding instead of raising an exception - [@mattbrictson](https://github.com/mattbrictson)
+
 ## [1.3.1][] (2018-11-04)
 
 * Packaging changes to reduce gem size
@@ -141,7 +145,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.3.1...HEAD
+[Unreleased]: https://github.com/mattbrictson/airbrussh/compare/v1.3.2...HEAD
+[1.3.2]: https://github.com/mattbrictson/airbrussh/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/mattbrictson/airbrussh/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/mattbrictson/airbrussh/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/mattbrictson/airbrussh/compare/v1.1.2...v1.2.0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Matt Brictson
+Copyright (c) 2019 Matt Brictson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/airbrussh.gemspec

@@ -23,7 +23,7 @@ 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 "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.10"
   spec.add_development_dependency "minitest-reporters", "~> 1.1"

data/appveyor.yml

@@ -9,7 +9,8 @@ environment:
 
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - gem install bundler --no-document --force
+  - gem uninstall bundler --all --executables
+  - gem install bundler --no-document -v "~>1.17"
   - bundle install --retry=3
 
 test_script:

data/lib/airbrussh/console.rb

@@ -53,7 +53,10 @@ module Airbrussh
     end
 
     def strip_ascii_color(string)
-      (string || "").gsub(/\033\[[0-9;]*m/, "")
+      string ||= ""
+      string = to_utf8(string) unless string.valid_encoding?
+
+      string.gsub(/\033\[[0-9;]*m/, "")
     end
 
     def console_width
@@ -85,5 +88,10 @@ module Airbrussh
     rescue Encoding::UndefinedConversionError
       false
     end
+
+    def to_utf8(string)
+      string.force_encoding("ASCII-8BIT")
+            .encode("UTF-8", :invalid => :replace, :undef => :replace)
+    end
   end
 end

data/lib/airbrussh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Airbrussh
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrussh
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Airbrussh pretties up your SSHKit and Capistrano output