sshkit 1.24.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931b99f3ed7bae2c98d4d6e5b48ad8f2261c4ccfca373d75fab75de03d49b656
-  data.tar.gz: '09096adfadec79a68a91477f5de116847d2a6baa6f36ea9faab13e41dae4fc66'
+  metadata.gz: b83fd21e919d61bd3450734fb1851783bc764ada7c3a5b8cc35695aeb4f18d8a
+  data.tar.gz: 3a879fca813f39b7bc69be9bc7036762e5f7b4998a451aa87df364950af92a56
 SHA512:
-  metadata.gz: 9cb179c93ff215fed59c2f2c38dca664886af6f8b39376f7f1ed72bfb9a675d6c6a7616b519c165a83cd8e9356f15301e7a656b0045ab65f6faaf971176a8748
-  data.tar.gz: 22c231cdb7622ba13ceac3c6def0178dee92b2d3e75b71038f3e5415e9e2d5bf0c2e7f1dd48005b7a2fdcf65d8787ea83788a5531d781b8e76314b3f7d596a86
+  metadata.gz: aeb3fa346457c8bde230909d6d65f8cb195cc06eb7092583b5e564a77255cf68d4530732bb5baea1ea5e0d61e41001c54ee1d53a21708b80f6ce7964e34360da
+  data.tar.gz: 7b9dcba689465ffd425fa13fd91b32ef4a51de384880361ca5cd6fb57601975b10acf27dcb64b309e33bc99b76c2bea6fa43bdbf62acf3f185b1ee869eff9467

data/.github/workflows/ci.yml

@@ -8,9 +8,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "head"]
+        ruby:
+          [
+            "2.5",
+            "2.6",
+            "2.7",
+            "3.0",
+            "3.1",
+            "3.2",
+            "3.3",
+            "3.4",
+            "4.0",
+            "head",
+          ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -36,7 +48,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:
@@ -51,7 +63,7 @@ jobs:
       matrix:
         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.1.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: release-drafter/release-drafter@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

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

data/lib/sshkit/version.rb

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

data/sshkit.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/capistrano/sshkit"
   gem.license       = "MIT"
   gem.metadata      = {
-    "changelog_uri" => "https://github.com/capistrano/sshkit/releases"
+    "changelog_uri" => "https://github.com/capistrano/sshkit/releases",
+    "rubygems_mfa_required" => "true"
   }
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -28,6 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('net-sftp', '>= 2.1.2')
   gem.add_runtime_dependency('ostruct')
 
+  gem.add_development_dependency('benchmark')
   gem.add_development_dependency('danger')
   gem.add_development_dependency('minitest', '>= 5.0.0')
   gem.add_development_dependency('minitest-reporters')

data/test/unit/backends/test_abstract.rb

@@ -111,6 +111,61 @@ module SSHKit
         assert_equal 'cd ~/foo && /usr/bin/env cat file', backend.executed_command.to_command
       end
 
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Lee Hambley
 - Tom Clements
 bindir: bin
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: danger
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +336,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/capistrano/sshkit/releases
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -336,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files: