sshkit 1.23.2 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb517c2ce9ebf51e9dbb9899a16ba4993cc8159045fb6bbc0da83f980e60662
-  data.tar.gz: 1ddc2ed93b2293a34c49f42838d3e2e6ed7bb76c622e9533db156862abf95d40
+  metadata.gz: ab4c2342f826356f08f688cb17f29323b90c4a7ecc85836b1ceaf323c34ab13d
+  data.tar.gz: 1126ee211260588192c298847ce2a00b43c356d25751a13c6268f324b822d8a9
 SHA512:
-  metadata.gz: a06ca7e0df5e0cc49a9005cf29e97f4a229e8ccb6aa3d89f7e12cde841253d842904b2f5bbf3550a96875b1c06bee5abb54301f68826197bf3f47ad6a62d30cf
-  data.tar.gz: 1e92da0637c7c9dbc67f3fe5a893c8a7b7e551b981054487e3d93c47e463f792449fb0edd22126b686e0a5d09aecccf2d1cfbd2bfd1fe59e99a5127b27365cac
+  metadata.gz: a6321a43251bc31e117660e049e53b35dec7154119a9fac2dce0e4eb855f8acc6b5539cbfe696e53457f8f6784eb8eebfa95a71c79e7b1a3a45b093d9e89e5ee
+  data.tar.gz: 41d021df58a4d4cd5f88762d29491fd71c603a97f31ac939d34825a42a27d1576dce5410cd6da7384833bb98fc107df1dfdaa4ca379d226b4f6417171ea2057f

data/.github/workflows/ci.yml

@@ -8,21 +8,9 @@ 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",
-          ]
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "head"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -33,24 +21,9 @@ jobs:
         env:
           RUBYOPT: ${{ startsWith(matrix.ruby, 'head') && '--enable=frozen-string-literal' || '' }}
 
-  test-legacy:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        ruby: ["2.0", "2.1", "2.2"]
-    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-all:
     runs-on: ubuntu-latest
-    needs: [test, test-legacy]
+    needs: test
     if: always()
     steps:
       - name: All tests ok
@@ -63,7 +36,7 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -76,9 +49,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.0", "ruby"]
+        ruby: ["2.5", "ruby"]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

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

@@ -103,6 +103,7 @@ module SSHKit
       end
 
       def as(who, &_block)
+        who_old = [@user, @group]
         if who.is_a? Hash
           @user  = who[:user]  || who["user"]
           @group = who[:group] || who["group"]
@@ -118,8 +119,7 @@ module SSHKit
         EOTEST
         yield
       ensure
-        remove_instance_variable(:@user)
-        remove_instance_variable(:@group)
+        @user, @group = *who_old
       end
 
       class << self
@@ -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/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.2".freeze
+  VERSION = "1.25.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

@@ -111,13 +111,63 @@ module SSHKit
         assert_equal 'cd ~/foo && /usr/bin/env cat file', backend.executed_command.to_command
       end
 
-      def test_background_logs_deprecation_warnings
-        deprecation_out =
-          if RUBY_VERSION < "2.3"
-            ''
-          else
-            +''
+      def test_as_properly_clears
+        backend = ExampleBackend.new do
+          as :root do
+            execute :cat, 'file', :strip => false
+          end
+
+          execute :cat, 'file', :strip => false
+        end
+
+        backend.run
+
+        assert_equal '/usr/bin/env cat file', backend.executed_command.to_command
+      end
+
+      def test_as_root
+        backend = ExampleBackend.new do
+          as :root do
+            execute :cat, 'file', :strip => false
           end
+        end
+
+        backend.run
+
+        assert_equal 'sudo -u root -- sh -c /usr/bin/env\\ cat\\ file', backend.executed_command.to_command
+      end
+
+      def test_nested_as
+        backend = ExampleBackend.new do
+          as :root do
+            as :other_user do
+              execute :cat, 'file', :strip => false
+            end
+          end
+        end
+
+        backend.run
+
+        assert_equal 'sudo -u other_user -- sh -c /usr/bin/env\\ cat\\ file', backend.executed_command.to_command
+      end
+
+      def test_nested_as_properly_clears
+        backend = ExampleBackend.new do
+          as :root do
+            as :other_user do
+              execute :cat, 'file', :strip => false
+            end
+            execute :cat, 'file', :strip => false
+          end
+        end
+
+        backend.run
+
+        assert_equal 'sudo -u root -- sh -c /usr/bin/env\\ cat\\ file', backend.executed_command.to_command
+      end
+
+      def test_background_logs_deprecation_warnings
+        deprecation_out = +''
         SSHKit.config.deprecation_output = deprecation_out
 
         ExampleBackend.new do

data/test/unit/test_command.rb

@@ -211,12 +211,7 @@ module SSHKit
     end
 
     def test_deprecated_stdtream_accessors
-      deprecation_out =
-        if RUBY_VERSION < "2.3"
-          ''
-        else
-          +''
-        end
+      deprecation_out = +''
 
       SSHKit.config.deprecation_output = deprecation_out
 

data/test/unit/test_configuration.rb

@@ -11,12 +11,7 @@ module SSHKit
     end
 
     def test_deprecation_output
-      output =
-        if RUBY_VERSION < "2.3"
-          ''
-        else
-          +''
-        end
+      output = +''
 
       SSHKit.config.deprecation_output = output
       SSHKit.config.deprecation_logger.log('Test')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.23.2
+  version: 1.25.0
 platform: ruby
 authors:
 - Lee Hambley
 - Tom Clements
 bindir: bin
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -24,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
@@ -122,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
@@ -156,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
@@ -329,14 +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.6.0.dev
+rubygems_version: 3.7.2
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files: