sshkit 1.23.1 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8af10c24f9ba9204b96596dbdebafc11e685870643ef910926f834d793758b57
-  data.tar.gz: 862c58e68660bbb27206e478db3f1946fde1a3a6f5165413329b50b154208aed
+  metadata.gz: 931b99f3ed7bae2c98d4d6e5b48ad8f2261c4ccfca373d75fab75de03d49b656
+  data.tar.gz: '09096adfadec79a68a91477f5de116847d2a6baa6f36ea9faab13e41dae4fc66'
 SHA512:
-  metadata.gz: 5d8b5501b9465a66d34f7b21833b4da59c41a2a27b10f895f530082fee9b93181a8cb95af8d05c14b76a4681870ef38627a90fb2d2f70b117c1ab3732636d4a4
-  data.tar.gz: c68f53bf25284db54f8ff4becc67b74440196b12b89fc6b143d9a8fb2583ebfd0584ed936a30711634bf4bf38b85cdf33a1a69b41aa73712996e6d7bd36dc786
+  metadata.gz: 9cb179c93ff215fed59c2f2c38dca664886af6f8b39376f7f1ed72bfb9a675d6c6a7616b519c165a83cd8e9356f15301e7a656b0045ab65f6faaf971176a8748
+  data.tar.gz: 22c231cdb7622ba13ceac3c6def0178dee92b2d3e75b71038f3e5415e9e2d5bf0c2e7f1dd48005b7a2fdcf65d8787ea83788a5531d781b8e76314b3f7d596a86

data/.github/workflows/ci.yml

@@ -8,34 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby:
-          [
-            "2.3",
-            "2.4",
-            "2.5",
-            "2.6",
-            "2.7",
-            "3.0",
-            "3.1",
-            "3.2",
-            "3.3",
-            "head",
-          ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake test:units
-
-  test-legacy:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        ruby: ["2.0", "2.1", "2.2"]
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "head"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
@@ -45,10 +18,12 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rake test:units
+        env:
+          RUBYOPT: ${{ startsWith(matrix.ruby, 'head') && '--enable=frozen-string-literal' || '' }}
 
   test-all:
     runs-on: ubuntu-latest
-    needs: [test, test-legacy]
+    needs: test
     if: always()
     steps:
       - name: All tests ok
@@ -74,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.0", "ruby"]
+        ruby: ["2.5", "ruby"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby

data/.github/workflows/push.yml

@@ -7,6 +7,6 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Draft Release
-        uses: toolmantim/release-drafter@v6.0.0
+        uses: toolmantim/release-drafter@v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.5
 
 Lint/AmbiguousBlockAssociation:
   Enabled: false
@@ -18,12 +18,12 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
-Style/FileName:
+Naming/FileName:
   Exclude:
     - "Dangerfile"
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -47,7 +47,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 Metrics/LineLength:
   Enabled: false
@@ -59,5 +59,5 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/ModuleLength:
   Enabled: false
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false

data/.rubocop_todo.yml

@@ -439,7 +439,7 @@ Style/MethodDefParentheses:
 # Offense count: 3
 # Configuration parameters: SupportedStyles.
 # SupportedStyles: snake_case, camelCase
-Style/MethodName:
+Naming/MethodName:
   EnforcedStyle: snake_case
   Exclude:
     - 'test/unit/test_color.rb'
@@ -460,7 +460,7 @@ Style/NumericPredicate:
     - 'lib/sshkit/command.rb'
 
 # Offense count: 1
-Style/OpMethod:
+Naming/BinaryOperatorParameterName:
   Exclude:
     - 'lib/sshkit/host.rb'
 
@@ -611,7 +611,7 @@ Style/UnneededPercentQ:
 # Offense count: 1
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: snake_case, normalcase, non_integer
-Style/VariableNumber:
+Naming/VariableNumber:
   Exclude:
     - 'test/unit/backends/test_connection_pool.rb'
 

data/Gemfile

@@ -1,8 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# public_suffix 3+ requires ruby 2.1+
-if Gem::Requirement.new('< 2.1').satisfied_by?(Gem::Version.new(RUBY_VERSION))
-  gem 'public_suffix', '< 3'
-end

data/RELEASING.md

@@ -4,7 +4,7 @@
 
 * You must have commit rights to the SSHKit repository.
 * You must have push rights for the sshkit gem on rubygems.org.
-* You must be using Ruby >= 2.1.0.
+* You must be using Ruby >= 2.5.0.
 
 ## How to release
 

data/lib/sshkit/backends/abstract.rb

@@ -135,8 +135,7 @@ module SSHKit
       # Backends which extend the Abstract backend should implement the following methods:
       def upload!(_local, _remote, _options = {}) raise MethodUnavailableError end
       def download!(_remote, _local=nil, _options = {}) raise MethodUnavailableError end
-      def execute_command(_cmd) raise MethodUnavailableError end
-      private :execute_command # Can inline after Ruby 2.1
+      private def execute_command(_cmd) raise MethodUnavailableError end
 
       private
 

data/lib/sshkit/backends/connection_pool.rb

@@ -1,5 +1,4 @@
 require "monitor"
-require "thread"
 
 # Since we call to_s on new connection arguments and use that as a cache key, we
 # need to make sure the memory address of the object is not used as part of the

data/lib/sshkit/color.rb

@@ -44,8 +44,8 @@ module SSHKit
       return string unless COLOR_CODES.key?(color)
 
       result = mode == :bold ? "\e[1;" : "\e[0;"
-      result << COLOR_CODES.fetch(color).to_s
-      result << ";49m#{string}\e[0m"
+
+      "#{result}#{COLOR_CODES.fetch(color)};49m#{string}\e[0m"
     end
 
     # Returns `true` if the underlying output is a tty, or if the SSHKIT_COLOR

data/lib/sshkit/runners/parallel.rb

@@ -1,5 +1,3 @@
-require 'thread'
-
 module SSHKit
 
   module Runner

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.23.1".freeze
+  VERSION = "1.24.0".freeze
 end

data/sshkit.gemspec

@@ -19,19 +19,20 @@ Gem::Specification.new do |gem|
   gem.name          = "sshkit"
   gem.require_paths = ["lib"]
   gem.version       = SSHKit::VERSION
+  gem.required_ruby_version = ">= 2.5"
 
-  gem.add_runtime_dependency('base64') if RUBY_VERSION >= "2.4"
+  gem.add_runtime_dependency('base64')
+  gem.add_runtime_dependency('logger')
   gem.add_runtime_dependency('net-ssh',  '>= 2.8.0')
   gem.add_runtime_dependency('net-scp',  '>= 1.1.2')
   gem.add_runtime_dependency('net-sftp', '>= 2.1.2')
-  gem.add_runtime_dependency('ostruct') if RUBY_VERSION >= "2.5"
+  gem.add_runtime_dependency('ostruct')
 
   gem.add_development_dependency('danger')
   gem.add_development_dependency('minitest', '>= 5.0.0')
   gem.add_development_dependency('minitest-reporters')
-  gem.add_development_dependency('rainbow', '~> 2.2.2')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', "~> 0.49.1")
+  gem.add_development_dependency('rubocop', "~> 0.52.0")
   gem.add_development_dependency('mocha')
 
   gem.add_development_dependency('bcrypt_pbkdf')

data/test/functional/backends/test_netssh.rb

@@ -131,7 +131,7 @@ module SSHKit
 
       def test_test_does_not_raise_on_non_zero_exit_status
         Netssh.new(a_host) do |_host|
-          test :false
+          test :false # rubocop:disable Lint/BooleanSymbol
         end.run
       end
 
@@ -151,7 +151,7 @@ module SSHKit
         # ensure we enable connection pool
         SSHKit::Backend::Netssh.pool.idle_timeout = 10
         Netssh.new(a_host) do |_host|
-          test :false
+          test :false # rubocop:disable Lint/BooleanSymbol
         end.run
         sleep 2.5
         captured_command_result = nil

data/test/unit/backends/test_abstract.rb

@@ -112,7 +112,7 @@ module SSHKit
       end
 
       def test_background_logs_deprecation_warnings
-        deprecation_out = ''
+        deprecation_out = +''
         SSHKit.config.deprecation_output = deprecation_out
 
         ExampleBackend.new do

data/test/unit/test_command.rb

@@ -211,7 +211,8 @@ module SSHKit
     end
 
     def test_deprecated_stdtream_accessors
-      deprecation_out = ''
+      deprecation_out = +''
+
       SSHKit.config.deprecation_output = deprecation_out
 
       c = Command.new(:whoami)

data/test/unit/test_configuration.rb

@@ -11,7 +11,8 @@ module SSHKit
     end
 
     def test_deprecation_output
-      output = ''
+      output = +''
+
       SSHKit.config.deprecation_output = output
       SSHKit.config.deprecation_logger.log('Test')
       assert_equal "[Deprecated] Test\n", output.lines.first

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.24.0
 platform: ruby
 authors:
 - Lee Hambley
 - Tom Clements
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2025-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -25,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +322,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/capistrano/sshkit/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,15 +329,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files: