rosh 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c244fe02aac976b4bc470e13f529e71bd0a0ec43cc2a389222b7dd7b9b2fc2
-  data.tar.gz: e4283b6e8c61adb188861184350959de02ba1c75ecc751bf1c8101c4f6934f31
+  metadata.gz: 5e3423833dad99eaf3db27ca753520ab865385a1dff3326f3dffd612297cccb7
+  data.tar.gz: cb28364217707106482da121b7842f5f4d6894c501330e10861e6c89a3062e35
 SHA512:
-  metadata.gz: 12de5a2533f7943d5adc5f29d5f675f97da16e692c615eb40e0357adbce3c649619d44536fd92f5278cb7157a798c32658207869875865b7bdf42ebf14536fcd
-  data.tar.gz: cb3c1055ad0e11fd5ad55c81268508ed795d165157606e0c16925fc3dd18e3ba0fb74c39b5104926766accf9b6d619e5e62f73561a83bc5336377fdbe1423ed7
+  metadata.gz: 201f582429c6e1b15bf5516db2abc236e6977d117b579faae4fdb2f243b965979a3cf6be69e19c0df19a72b705c541c45e87bc11430f04633a3725769040951f
+  data.tar.gz: e2fdf6bfb3d9861e72a47bbda8fa5a5b94e3747fa0e77a30f5678c6ad484f06257ff5aaaa839b8c2fccc5772326f3f5b1469acd3cfb0f14779cdbdeff021345e

data/README.md

@@ -31,6 +31,9 @@ Or install it yourself as:
 If ~/.ssh/config contains LocalForward or RemoteForward for the host, the same
 forwarding options are passed to `ssh` automatically.
 
+If the host uses `ProxyJump` or `ProxyCommand`, rosh also carries that proxy
+setting over to the spawned `ssh` command.
+
 If a `LocalForward` is skipped because the local port is actually in use,
 rosh retries that forwarding on later reconnect attempts instead of dropping it
 for the rest of the process lifetime.

data/lib/rosh/version.rb

@@ -1,3 +1,3 @@
 class Rosh
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

data/lib/rosh.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'resolv'
 require 'net/ssh/config'
 require 'optparse'
+require 'shellwords'
 require 'socket'
 require File.join(File.dirname(__FILE__), %w[rosh version])
 
@@ -42,7 +43,9 @@ class Rosh
     @host = config[:host_name] if config[:host_name]
     @base_ssh_opts << "-l #{config[:user]}" if config[:user]
     @base_ssh_opts << "-p #{config[:port]}" if config[:port]
-    @base_ssh_opts << "-J #{config[:proxy].jump_proxies}" if config[:proxy]
+    if proxy_option = ssh_proxy_option(config[:proxy])
+      @base_ssh_opts << proxy_option
+    end
     if keys = config[:keys]
       keys.each{|k| @base_ssh_opts << "-i #{k}"}
     end
@@ -102,6 +105,16 @@ class Rosh
   end
 
 private
+  def ssh_proxy_option(proxy)
+    return nil unless proxy
+
+    if proxy.respond_to?(:jump_proxies)
+      "-J #{proxy.jump_proxies}"
+    elsif proxy.respond_to?(:command_line_template)
+      "-o ProxyCommand=#{Shellwords.escape(proxy.command_line_template)}"
+    end
+  end
+
   def refresh_ssh_opts!
     @ssh_opts = @base_ssh_opts.dup
     @local_forward_specs.each do |spec|

data/test/rosh_forwarding_test.rb

@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'fileutils'
+require 'shellwords'
 
 require_relative '../lib/rosh'
 
@@ -30,6 +31,14 @@ class RoshForwardingTest < Minitest::Test
       Host grav
         LocalForward 127.0.0.1 3131 localhost 3131
         RemoteForward 8082 localhost 8082
+
+      Host grav-jump
+        HostName grav.example.com
+        ProxyJump bastion.example.com
+
+      Host grav-command
+        HostName grav.example.com
+        ProxyCommand ssh bastion.example.com -W %h:%p
     CONFIG
     ENV['HOME'] = @tmp_home
   end
@@ -63,6 +72,21 @@ class RoshForwardingTest < Minitest::Test
     assert_includes ssh_opts, '-R 8082:localhost:8082'
   end
 
+  def test_ssh_opts_include_proxy_jump_from_ssh_config
+    rosh = Rosh.new('grav-jump')
+    ssh_opts = rosh.instance_variable_get(:@ssh_opts)
+
+    assert_includes ssh_opts, '-J bastion.example.com'
+  end
+
+  def test_ssh_opts_include_proxy_command_from_ssh_config
+    rosh = Rosh.new('grav-command')
+    ssh_opts = rosh.instance_variable_get(:@ssh_opts)
+
+    expected = "-o ProxyCommand=#{Shellwords.escape('ssh bastion.example.com -W %h:%p')}"
+    assert_includes ssh_opts, expected
+  end
+
   def test_forwarding_is_skipped_when_local_port_is_in_use
     klass = Class.new(Rosh) do
       def local_forward_available?(_spec)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-03 00:00:00.000000000 Z
+date: 2026-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh