New Upstream Release - ruby-sshkit

Ready changes

Summary

Merged new upstream version: 1.21.4 (was: 1.21.3).

Resulting package

Built on 2023-05-30T18:51 (took 4m51s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases ruby-sshkit

Lintian Result

Diff

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..2913b4f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - "> 0.49.1"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule: 
+    interval: monthly
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..183d0bf
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,60 @@
+name: test on CI
+on:
+  push:
+    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" ]
+    steps:
+      - uses: actions/checkout@v3
+      - 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
+
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rake lint
+
+  functional:
+    runs-on: macos-10.15
+    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" ]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Cache Vagrant boxes
+        uses: actions/cache@v2
+        with:
+          path: ~/.vagrant.d/boxes
+          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
+          restore-keys: |
+            ${{ runner.os }}-vagrant-
+
+      - name: Run vagrant up
+        run: vagrant up
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run functional tests
+        run: bundle exec rake test:functional
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index e18c51b..9e618de 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,6 +7,6 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Draft Release
-        uses: toolmantim/release-drafter@v5.2.0
+        uses: toolmantim/release-drafter@v5.22.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ec4ca59..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 3.0
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
-  - 2.2
-  - 2.1
-  - 2.0
-branches:
-  only:
-    - master
-matrix:
-  include:
-    # Run Danger only once, on 2.5
-    - rvm: 2.5
-      script: bundle exec danger
-script: bundle exec rake test:units lint
diff --git a/EXAMPLES.md b/EXAMPLES.md
index 3e05b16..2c3a575 100644
--- a/EXAMPLES.md
+++ b/EXAMPLES.md
@@ -339,6 +339,15 @@ end
 This will resolve the `example.com` hostname into a `SSHKit::Host` object, and
 try to pull up the correct configuration for it.
 
+## Connect to a host on a port different than 22
+
+If your ssh server is running on a port different than 22, you can change this is
+shown:
+
+```ruby
+on('example.com', {port: 1234}) do
+end
+```
 
 ## Run a command without it being command-mapped
 
diff --git a/README.md b/README.md
index 5c4dace..31f16d1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 more servers.
 
 [![Gem Version](https://badge.fury.io/rb/sshkit.svg)](https://rubygems.org/gems/sshkit)
-[![Build Status](https://travis-ci.org/capistrano/sshkit.svg?branch=master)](https://travis-ci.org/capistrano/sshkit)
+[![Build Status](https://github.com/capistrano/sshkit/actions/workflows/ci.yml/badge.svg)](https://github.com/capistrano/sshkit/actions/workflows/ci.yml)
 
 ## Example
 
diff --git a/Vagrantfile b/Vagrantfile
index e02f124..a561e45 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,8 +3,8 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'hashicorp/precise64'
   config.vm.provision "shell", inline: <<-SHELL
-  echo 'ClientAliveInterval 1' >> /etc/ssh/sshd_config
-  echo 'ClientAliveCountMax 1' >> /etc/ssh/sshd_config
+  echo 'ClientAliveInterval 3' >> /etc/ssh/sshd_config
+  echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config
   service ssh restart
   SHELL
 
diff --git a/debian/changelog b/debian/changelog
index 7e7fada..762b565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-sshkit (1.21.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * New upstream release.
+  * Drop patch 005_fix_set_import.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 30 May 2023 18:46:43 -0000
+
 ruby-sshkit (1.21.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/001_disabled-rubygems-bundler.patch b/debian/patches/001_disabled-rubygems-bundler.patch
index 0dcc46c..a89dcaf 100644
--- a/debian/patches/001_disabled-rubygems-bundler.patch
+++ b/debian/patches/001_disabled-rubygems-bundler.patch
@@ -5,10 +5,10 @@ Author: Sebastien Badia <seb@sebian.fr>
 Forwarded: not-needed
 Last-Update: 2016-03-01
 
-Index: ruby-sshkit/test/helper.rb
+Index: ruby-sshkit.git/test/helper.rb
 ===================================================================
---- ruby-sshkit.orig/test/helper.rb
-+++ ruby-sshkit/test/helper.rb
+--- ruby-sshkit.git.orig/test/helper.rb
++++ ruby-sshkit.git/test/helper.rb
 @@ -1,10 +1,7 @@
 -require 'rubygems'
 -require 'bundler/setup'
diff --git a/debian/patches/002_fix-local-test-cd.patch b/debian/patches/002_fix-local-test-cd.patch
index 707c375..20b3548 100644
--- a/debian/patches/002_fix-local-test-cd.patch
+++ b/debian/patches/002_fix-local-test-cd.patch
@@ -5,10 +5,10 @@ Origin: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-sshkit.git;a=co
 Forwarded: not-needed
 Last-Update: 2014-04-21
 
-Index: ruby-sshkit/test/unit/backends/test_local.rb
+Index: ruby-sshkit.git/test/unit/backends/test_local.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/backends/test_local.rb
-+++ ruby-sshkit/test/unit/backends/test_local.rb
+--- ruby-sshkit.git.orig/test/unit/backends/test_local.rb
++++ ruby-sshkit.git/test/unit/backends/test_local.rb
 @@ -15,7 +15,7 @@ module SSHKit
        def test_execute
          assert_equal true, local.execute('uname -a')
diff --git a/debian/patches/003_disabled-tests-that-require-turn.patch b/debian/patches/003_disabled-tests-that-require-turn.patch
index 4e7864c..4106e64 100644
--- a/debian/patches/003_disabled-tests-that-require-turn.patch
+++ b/debian/patches/003_disabled-tests-that-require-turn.patch
@@ -4,10 +4,10 @@ Author: Sebastien Badia <seb@sebian.fr>
 Forwarded: not-needed
 Last-Update: 2015-05-04
 
-Index: ruby-sshkit/test/unit/formatters/test_pretty.rb
+Index: ruby-sshkit.git/test/unit/formatters/test_pretty.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/formatters/test_pretty.rb
-+++ ruby-sshkit/test/unit/formatters/test_pretty.rb
+--- ruby-sshkit.git.orig/test/unit/formatters/test_pretty.rb
++++ ruby-sshkit.git/test/unit/formatters/test_pretty.rb
 @@ -65,11 +65,6 @@ module SSHKit
        assert_log_output "  INFO some spaces\n"
      end
@@ -34,10 +34,10 @@ Index: ruby-sshkit/test/unit/formatters/test_pretty.rb
      def test_does_not_log_message_when_verbosity_is_too_low
        SSHKit.config.output_verbosity = Logger::WARN
        pretty.info('Some info')
-Index: ruby-sshkit/test/unit/formatters/test_simple_text.rb
+Index: ruby-sshkit.git/test/unit/formatters/test_simple_text.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/formatters/test_simple_text.rb
-+++ ruby-sshkit/test/unit/formatters/test_simple_text.rb
+--- ruby-sshkit.git.orig/test/unit/formatters/test_simple_text.rb
++++ ruby-sshkit.git/test/unit/formatters/test_simple_text.rb
 @@ -28,11 +28,6 @@ module SSHKit
        assert_log_output "some spaces\n"
      end
@@ -64,10 +64,10 @@ Index: ruby-sshkit/test/unit/formatters/test_simple_text.rb
      def test_does_not_log_when_verbosity_is_too_low
        SSHKit.config.output_verbosity = Logger::WARN
        simple.info('Some info')
-Index: ruby-sshkit/test/unit/test_deprecation_logger.rb
+Index: ruby-sshkit.git/test/unit/test_deprecation_logger.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/test_deprecation_logger.rb
-+++ ruby-sshkit/test/unit/test_deprecation_logger.rb
+--- ruby-sshkit.git.orig/test/unit/test_deprecation_logger.rb
++++ ruby-sshkit.git/test/unit/test_deprecation_logger.rb
 @@ -12,17 +12,6 @@ module SSHKit
        @logger ||= DeprecationLogger.new(output)
      end
diff --git a/debian/patches/004_disable-unreliable-timing-tests.patch b/debian/patches/004_disable-unreliable-timing-tests.patch
index 305a797..a748ab5 100644
--- a/debian/patches/004_disable-unreliable-timing-tests.patch
+++ b/debian/patches/004_disable-unreliable-timing-tests.patch
@@ -4,10 +4,10 @@ Bug-Debian: https://bugs.debian.org/853244
 Forwarded: not-needed
 Last-Update: 2020-02-04
 
-Index: ruby-sshkit/test/unit/test_coordinator.rb
+Index: ruby-sshkit.git/test/unit/test_coordinator.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/test_coordinator.rb
-+++ ruby-sshkit/test/unit/test_coordinator.rb
+--- ruby-sshkit.git.orig/test/unit/test_coordinator.rb
++++ ruby-sshkit.git/test/unit/test_coordinator.rb
 @@ -43,12 +43,6 @@ module SSHKit
        assert_equal "Command: echo 1.example.com\n", actual_output_commands.last
      end
diff --git a/debian/patches/005_fix_set_import.patch b/debian/patches/005_fix_set_import.patch
deleted file mode 100644
index d7796ca..0000000
--- a/debian/patches/005_fix_set_import.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix missing import of set from deprecation_logger
-Author: Samuel Henrique <samueloph@debian.org>
-Bug-Debian: https://bugs.debian.org/1005423
-Index: ruby-sshkit/lib/sshkit/deprecation_logger.rb
-===================================================================
---- ruby-sshkit.orig/lib/sshkit/deprecation_logger.rb
-+++ ruby-sshkit/lib/sshkit/deprecation_logger.rb
-@@ -1,3 +1,5 @@
-+require 'set'
-+
- module SSHKit
-   class DeprecationLogger
-     def initialize(out)
diff --git a/debian/patches/006_fix_test_abstract.patch b/debian/patches/006_fix_test_abstract.patch
index 1e4b539..982bda3 100644
--- a/debian/patches/006_fix_test_abstract.patch
+++ b/debian/patches/006_fix_test_abstract.patch
@@ -3,10 +3,10 @@ Description: Remove string match check from stacktrace
  have something to do with a change in behavior in the way the ruby
  interpreter dumps the stacktrace, but I don't have time to confirm.
 Author: Samuel Henrique <samueloph@debian.org>
-Index: ruby-sshkit/test/unit/backends/test_abstract.rb
+Index: ruby-sshkit.git/test/unit/backends/test_abstract.rb
 ===================================================================
---- ruby-sshkit.orig/test/unit/backends/test_abstract.rb
-+++ ruby-sshkit/test/unit/backends/test_abstract.rb
+--- ruby-sshkit.git.orig/test/unit/backends/test_abstract.rb
++++ ruby-sshkit.git/test/unit/backends/test_abstract.rb
 @@ -124,7 +124,6 @@ module SSHKit
          assert_equal 2, lines.length
  
diff --git a/debian/patches/series b/debian/patches/series
index 32d2831..8c965ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 002_fix-local-test-cd.patch
 003_disabled-tests-that-require-turn.patch
 004_disable-unreliable-timing-tests.patch
-005_fix_set_import.patch
 006_fix_test_abstract.patch
diff --git a/lib/sshkit/deprecation_logger.rb b/lib/sshkit/deprecation_logger.rb
index 8ecee18..bddc6c6 100644
--- a/lib/sshkit/deprecation_logger.rb
+++ b/lib/sshkit/deprecation_logger.rb
@@ -1,3 +1,5 @@
+require 'set'
+
 module SSHKit
   class DeprecationLogger
     def initialize(out)
diff --git a/lib/sshkit/version.rb b/lib/sshkit/version.rb
index 7489b6e..d674f26 100644
--- a/lib/sshkit/version.rb
+++ b/lib/sshkit/version.rb
@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.21.2".freeze
+  VERSION = "1.21.4".freeze
 end

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/share/rubygems-integration/all/specifications/sshkit-1.21.4.gemspec

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/rubygems-integration/all/specifications/sshkit-1.21.2.gemspec

Control files: lines which differ (wdiff format)

  • Ruby-Versions: all

More details

Full run details