airbrussh 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b618870b95daf33159f07da625d6bc115d149666fa56d0852b050da1fb9e95a4
-  data.tar.gz: b092095eecea678c640f9c6b974a6864859d62f4717e24b8d1b2aa003c448449
+  metadata.gz: cc924d4296d264fce2d2c280deb33c3dee5995537cc9d2d4e0336d842fefe928
+  data.tar.gz: 760f9521a613add5fbe2464fba0486b36491bdf8056f82c2c216846d45cd5a5a
 SHA512:
-  metadata.gz: e85c29ab49b8d9f25cd528f9d3edba00d99586e48487f1898535906e124491e14fec5568d5f94802f6581190347bd0d3e47bc45a302d1c841c03b5093ef89b4a
-  data.tar.gz: b264f326a86915605058d38949eaf1d60bceeb680cc4c1839aa0b8abefab5e077a43a9e9f47d68375a0ee83b23ee7ec0ed21a7b116fda37b36df438fb1b89867
+  metadata.gz: a3fdd013c5de8112098827d1e339153070c5680aab02c691b6c2590d042e0bdd0b29a26a13f5aac9b0d929aad75a507ed01646f1237a33190ece35eab4bd309b
+  data.tar.gz: e053040901b947f721e1c0e6e90a4d24226f0a8818a25cb23e89a960c7003dc2cfe1e1405d9298d55fc9044e51beedad662c4fdc2097f45b65cb9ac014cb658b

data/.circleci/config.yml

@@ -5,10 +5,12 @@ executors:
     parameters:
       version:
         description: "Ruby version number"
-        default: "3.1"
+        default: "3.2"
         type: string
     docker:
       - image: ruby:<< parameters.version >>
+        environment:
+          MT_COMPAT: "1" # Allows old versions of mocha gem to work with minitest
 
 commands:
   bundle_install:
@@ -16,7 +18,7 @@ commands:
     parameters:
       key:
         description: "Cache key"
-        default: "3.1"
+        default: "3.2"
         type: string
     steps:
       - restore_cache:
@@ -48,7 +50,7 @@ jobs:
     parameters:
       ruby:
         description: "Ruby version number"
-        default: "3.1"
+        default: "3.2"
         type: string
     executor:
       name: ruby
@@ -98,6 +100,7 @@ workflows:
                 - "2.7"
                 - "3.0"
                 - "3.1"
+                - "3.2"
       - spec_legacy_ruby:
           matrix: &legacy_ruby_matrix
             parameters:

data/Gemfile

@@ -7,10 +7,15 @@ if RUBY_VERSION == "1.9.3"
   # These gems need specific version for Ruby 1.9
   gem "json", "~> 1.8"
   gem "minitest", "~> 5.11.3"
+  gem "mocha", "~> 1.2"
   gem "net-ssh", "~> 2.8"
   gem "rake", "< 12.3"
   gem "term-ansicolor", "~> 1.3.2"
   gem "tins", "~> 1.6.0"
+elsif RUBY_VERSION < "2.6"
+  # These gems need specific versions for Ruby < 2.6
+  gem "minitest", "< 5.16" # rubocop:disable Bundler/DuplicatedGem
+  gem "net-ssh", "< 7" # rubocop:disable Bundler/DuplicatedGem
 end
 
 if RUBY_VERSION >= "2.5"
@@ -18,8 +23,8 @@ if RUBY_VERSION >= "2.5"
   gem "coveralls_reborn", "~> 0.24.0"
 end
 
-if RUBY_VERSION >= "2.1"
-  # These gems need at least Ruby 2.1
+if RUBY_VERSION >= "2.5"
+  # These gems need at least Ruby 2.5
   gem "rubocop", "0.50.0"
 
   # Optional development dependencies; requires bundler >= 1.10.
@@ -35,6 +40,9 @@ if RUBY_VERSION >= "2.1"
   end
 end
 
+# Needed to make rubocop 0.50.0 work on modern rubies
+gem "safe_yaml" if RUBY_VERSION >= "3.1"
+
 if (sshkit_version = ENV["sshkit"])
   requirement = begin
     Gem::Dependency.new("sshkit", sshkit_version).requirement

data/airbrussh.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   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 "mocha", "~> 2.1"
 end

data/appveyor.yml

@@ -1,6 +1,8 @@
 version: "{build}"
 skip_tags: true
 skip_branch_with_pr: true
+environment:
+  MT_COMPAT: "1" # Allows old versions of mocha gem to work with minitest
 install:
   - set PATH=C:\Ruby26-x64\bin;%PATH%
   - bundle install --retry=3

data/lib/airbrussh/rake/context.rb

@@ -13,6 +13,10 @@ module Airbrussh
     # for the `position` of a command.
     #
     class Context
+      class << self
+        attr_accessor :current_task_name
+      end
+
       def initialize(config=Airbrussh.configuration)
         @history = []
         @enabled = config.monkey_patch_rake
@@ -47,10 +51,22 @@ module Airbrussh
         history.index(command.to_s)
       end
 
-      class << self
-        attr_accessor :current_task_name
+      if Object.respond_to?(:prepend)
+        module Patch
+          def execute(args=nil)
+            ::Airbrussh::Rake::Context.current_task_name = name.to_s
+            super
+          end
+        end
 
-        def install_monkey_patch
+        def self.install_monkey_patch
+          require "rake"
+          return if ::Rake::Task.include?(::Airbrussh::Rake::Context::Patch)
+
+          ::Rake::Task.prepend(::Airbrussh::Rake::Context::Patch)
+        end
+      else
+        def self.install_monkey_patch
           require "rake"
           return if ::Rake::Task.instance_methods.include?(:_airbrussh_execute)
 

data/lib/airbrussh/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrussh
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
 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.
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Airbrussh pretties up your SSHKit and Capistrano output