sshkit 1.21.4 → 1.21.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ea735e4b1e6b51eb99c2699ecc11579229fffe3db99cec9afe4e819f466bf0
-  data.tar.gz: 74af7dc3101e5bb9853449f5ffc1f3de4a0ad0a3d19f5554540e3eff3e4f99d7
+  metadata.gz: c02076e3d45e9cc2eeac09d86836d8d76b957e62effe234e8f35cc946097683a
+  data.tar.gz: 748296139afb794afe86828c674a8bb41b8e080f77b8c65d3120b2c8842b481e
 SHA512:
-  metadata.gz: 1d78e3c1a8e8c875b5eef3f3951540817e82cd4ed07e84ddec648f5b6b85d9c38b09493ab476d5a2e728b44d62e56d1d5b5cadd5359c422371f9a1d8773e3b7c
-  data.tar.gz: 5f7cdad196d09216c388d8ba95feb65f1299c3fc5deda5ebf7adbf95630621592011f1ebb64fe0405017aa6ebc5a5a73e42852e3b4d90cb865585a08f2ff3031
+  metadata.gz: f62b86ebfe3ff109d1cb6445b0a361256a5b316320706acda4a2c57cf160b8ee37086060ad15f21063e809a8b07549b01a5c92c5210e18694b88e6249ea6602f
+  data.tar.gz: 58e77e7514508a4c8bcbfa4f1d5b789079da62cd2ffaee7de81c38efcd2760a47f8b61049a8c284e9193ca9d1cbdc8a31fadc48c7513f9e3cec7156dd172ab6c

data/.github/workflows/ci.yml

@@ -1,16 +1,16 @@
 name: test on CI
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "head" ]
+        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "head"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -19,10 +19,37 @@ jobs:
       - 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"]
+    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]
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Some tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1
+
   rubocop:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -32,20 +59,34 @@ jobs:
         run: bundle exec rake lint
 
   functional:
-    runs-on: macos-10.15
+    runs-on: macos-12
     strategy:
       matrix:
-        ruby: [ "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "head" ]
+        ruby:
+          [
+            "2.0",
+            "2.1",
+            "2.2",
+            "2.3",
+            "2.4",
+            "2.5",
+            "2.6",
+            "2.7",
+            "3.0",
+            "3.1",
+            "3.2",
+            "head",
+          ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Cache Vagrant boxes
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          key: ${{ runner.os }}-vagrant-v2-${{ hashFiles('Vagrantfile') }}
           restore-keys: |
-            ${{ runner.os }}-vagrant-
+            ${{ runner.os }}-vagrant-v2-
 
       - name: Run vagrant up
         run: vagrant up
@@ -58,3 +99,15 @@ jobs:
 
       - name: Run functional tests
         run: bundle exec rake test:functional
+
+  functional-all:
+    runs-on: ubuntu-latest
+    needs: [functional]
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Some tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

data/.github/workflows/push.yml

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

data/Vagrantfile

@@ -1,10 +1,14 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'hashicorp/precise64'
+  config.vm.box = 'bento/ubuntu-22.10'
+
+  config.vm.boot_timeout = 600 # seconds
+  config.ssh.insert_key = false
   config.vm.provision "shell", inline: <<-SHELL
   echo 'ClientAliveInterval 3' >> /etc/ssh/sshd_config
   echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config
+  echo 'MaxAuthTries 6' >> /etc/ssh/sshd_config
   service ssh restart
   SHELL
 

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.21.4".freeze
+  VERSION = "1.21.6".freeze
 end

data/test/functional/backends/test_netssh.rb

@@ -75,14 +75,14 @@ module SSHKit
 
       def test_group_netssh
         Netssh.new(a_host) do
-          as user: :root, group: :admin do
+          as user: :root, group: :root do
            execute :touch, 'restart.txt'
           end
         end.run
         command_lines = @output.lines.select { |line| line.start_with?('Command:') }
         assert_equal [
           "Command: if ! sudo -u root whoami > /dev/null; then echo \"You cannot switch to user 'root' using sudo, please check the sudoers file\" 1>&2; false; fi\n",
-          "Command: sudo -u root -- sh -c sg\\ admin\\ -c\\ /usr/bin/env\\\\\\ touch\\\\\\ restart.txt\n"
+          "Command: sudo -u root -- sh -c sg\\ root\\ -c\\ /usr/bin/env\\\\\\ touch\\\\\\ restart.txt\n"
         ], command_lines
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.21.4
+  version: 1.21.6
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby