rosh 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3934908cd1559287bd808f7774a044e7e598850d814bfcfe15604df715653114
-  data.tar.gz: 71f530ac4d74d582a4c4145f07f941e7ca63323a0bc054e33ac7cffd72b475ef
+  metadata.gz: 1399835146cfcd6615a17868694c426b4c06b25649fab1c02192bf8f4534fe1d
+  data.tar.gz: 835a84fe3a697e322fb28aa6c67e16f0ad1cbf832616b23991c65f0333fde8f9
 SHA512:
-  metadata.gz: 922807c829ec873dbcb5a617cbcfd5b50a3d3da0cdfac24c6914223c27da717c9c29d109893402ca6f2666e3287035d34827b9efced35eaf4bc8cb7cdb6459e9
-  data.tar.gz: 0da6edde2a9f4825d029d2e8a37b5edf728e518d31997ede1522562e8d24d8ebd0f4a74f93211529ebb412824508a4105d0c50046775b042f3ee59469cb8851c
+  metadata.gz: ecaffa32659f87db955a586bced2a742f15735cc75c5d76b00cc7113a9378673cfb54294b7d33ffa29eefdda0213cee56ea09f07de4caae68b3239875f4d9d7c
+  data.tar.gz: 66a075c156779a0d33907187ada1195f8d7ebce66fb59de8136e585f7e3b4ce1d0e9f641961d3be12c6b956ae8215f0071e60e16a2a46ea153f0b5c8f377fbd0

data/Makefile

@@ -0,0 +1,6 @@
+start:
+	 codex --search --dangerously-bypass-approvals-and-sandbox
+continue:
+	 codex resume --search --dangerously-bypass-approvals-and-sandbox --last
+resume:
+	 codex resume --search --dangerously-bypass-approvals-and-sandbox

data/README.md

@@ -26,6 +26,7 @@ Or install it yourself as:
                         Default: "^t"
     -I interval         Reconnection interval.
     -S                  Use GNU screen instead of tmux
+    -L socket-name      Specify tmux socket name (tmux -L socket-name)
 
 If ~/.ssh/config contains LocalForward or RemoteForward for the host, the same
 forwarding options are passed to `ssh` automatically.

data/lib/rosh/version.rb

@@ -1,3 +1,3 @@
 class Rosh
-  VERSION = '0.9.4'
+  VERSION = '0.9.6'
 end

data/lib/rosh.rb

@@ -11,6 +11,7 @@ class Rosh
     @ssh_opts = []
     alive_interval = 5
     @escape = '^t'
+    @tmux_socket_name = nil
     OptionParser.new("test").tap do |opt|
       opt.banner = 'Usage: rosh [options] hostname [session-name]'
       opt.on('-a alive-interval'){|v| alive_interval = v.to_i}
@@ -18,6 +19,7 @@ class Rosh
       opt.on('-I interval'){|v| @interval = v.to_f}
       opt.on('-V'){|v| @verbose = true}
       opt.on('-S'){|v| @screen = true}
+      opt.on('-L socket-name'){|v| @tmux_socket_name = v}
     end.parse! args
     @host, @name = *args, :default
     abort 'hostname is required' if @host == :default
@@ -30,8 +32,6 @@ class Rosh
     if @verbose
       puts "ssh-config: #{config}"
     end
-    @forward_opts = []
-    @forwarding_disabled = false
     @oom_reported = false
     @last_exit_status = nil
     local_forwards(alias_name).each do |f|
@@ -62,8 +62,9 @@ class Rosh
       ["ssh", *@ssh_opts, resolv,
         '-t', "'screen -rx #{@name}'", '2>/dev/null']*' '
     else
+      remote_cmd = single_quote(tmux_attach_command)
       ["ssh", *@ssh_opts, resolv,
-        '-t', "'tmux attach -t #{@name}'", '2>/dev/null']*' '
+        '-t', remote_cmd, '2>/dev/null']*' '
     end
     if @verbose
       puts "connecting to #{@host}..."
@@ -117,26 +118,12 @@ private
   end
 
   def add_forward_option(kind, spec)
-    return if forwarding_disabled?
     if kind == :local && !local_forward_available?(spec)
       puts "skip forwarding: #{spec} is already in use"
-      disable_forwarding!
       return
     end
     opt = kind == :local ? "-L #{spec}" : "-R #{spec}"
     @ssh_opts << opt
-    @forward_opts << opt
-  end
-
-  def disable_forwarding!
-    return if @forwarding_disabled
-    @forwarding_disabled = true
-    @forward_opts.each { |opt| @ssh_opts.delete(opt) }
-    @forward_opts.clear
-  end
-
-  def forwarding_disabled?
-    @forwarding_disabled
   end
 
   def local_forward_available?(spec)
@@ -227,24 +214,25 @@ private
 
   def sh_has_session?
     # tmux has-session -t <session_name>
-    ssh_tmux("tmux has-session -t #{@name} 2>/dev/null")
+    ssh_tmux("#{tmux_prefix} has-session -t #{tmux_session_name} 2>/dev/null")
   end
 
   def sh_new_session?
     # tmux new-session -s <session_name> -d
-    create_with_override = "tmux new-session -s #{@name} -d \\; set-option -t #{@name} destroy-unattached off"
+    create_with_override = "#{tmux_prefix} new-session -s #{tmux_session_name} -d \\; set-option -t #{tmux_session_name} destroy-unattached off"
     return true if ssh_tmux(create_with_override)
 
     puts "retrying tmux new-session without destroy-unattached override" if @verbose
-    ssh_tmux("tmux new-session -s #{@name} -d")
+    ssh_tmux("#{tmux_prefix} new-session -s #{tmux_session_name} -d")
   end
 
   def ssh_tmux(command)
+    remote_command = single_quote(command.to_s)
     cmd = [
       "ssh",
       *@ssh_opts,
       resolv,
-      "'#{command}'"
+      remote_command
     ]*' '
     puts cmd if @verbose
     system cmd
@@ -293,4 +281,27 @@ private
   rescue Exception
     @host
   end
+
+  def tmux_attach_command
+    "#{tmux_prefix} attach -t #{tmux_session_name}"
+  end
+
+  def tmux_prefix
+    return 'tmux' unless @tmux_socket_name
+    "tmux -L #{format_remote_arg(@tmux_socket_name)}"
+  end
+
+  def tmux_session_name
+    format_remote_arg(@name)
+  end
+
+  def format_remote_arg(value)
+    str = value.to_s
+    return str if str.match?(%r{\A[[:alnum:]@%+=:,./_-]+\z})
+    %("#{str.gsub(/(["\\$`])/, '\\\\\1')}")
+  end
+
+  def single_quote(str)
+    "'" + str.to_s.gsub("'", %q('\'') ) + "'"
+  end
 end

data/test/rosh_forwarding_test.rb

@@ -57,7 +57,7 @@ class RoshForwardingTest < Minitest::Test
     ssh_opts = rosh.instance_variable_get(:@ssh_opts)
 
     refute_includes ssh_opts, '-L 127.0.0.1:3131:localhost:3131'
-    refute_includes ssh_opts, '-R 8082:localhost:8082'
+    assert_includes ssh_opts, '-R 8082:localhost:8082'
   end
 
   def test_verbose_logs_when_session_is_missing
@@ -118,4 +118,26 @@ class RoshForwardingTest < Minitest::Test
     assert_includes commands.first, 'set-option -t grav destroy-unattached off'
     refute_includes commands.last, 'set-option -t grav destroy-unattached off'
   end
+
+  def test_tmux_commands_include_socket_name_when_specified
+    socket_name = 'work'
+    rosh = Rosh.new('-L', socket_name, 'grav')
+    rosh.instance_variable_set(:@name, 'grav')
+
+    assert_includes rosh.send(:tmux_attach_command), "-L #{socket_name}"
+
+    commands = []
+    rosh.stub(:system, ->(cmd) { commands << cmd; true }) do
+      rosh.send(:sh_has_session?)
+    end
+
+    assert_includes commands.first, "-L #{socket_name}"
+  end
+
+  def test_tmux_default_socket_used_when_not_specified
+    rosh = Rosh.new('grav')
+    command = rosh.send(:tmux_attach_command)
+
+    refute_includes command, '-L'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-09 00:00:00.000000000 Z
+date: 2025-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -79,6 +79,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/rosh