rosh 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a029ca2deda02d278e112ba05e40a56dce955ffa8476091d0406ae098788bd1
-  data.tar.gz: 701dfa757f7371589b997e21914dfecf6af4fe5b21b8519804ff4f2e7ae36b71
+  metadata.gz: 9a9b04489aa21bdb87dd7a21a2696d33c0f1b29c45767593bca5bdc0b383b2a4
+  data.tar.gz: a43d640d729094bb85640cfece07ebe2f1b82bb007723d528b628fb5a495a23a
 SHA512:
-  metadata.gz: 98e03da0dbba0d8737e39729553952ada5016b5cb7e2fe73a1b5184be1cafcfdf7d76b38a373731dca8a08bca68e014ed4b0d38fed7182eca1d9567249a31da4
-  data.tar.gz: 8889757e1b4d933624a33d78727d2044fb36e16d58048e9e255355d8b2de8236697ceabb08eba52f63d90abb9c6f429555ffe5dc436596a3c9263399662bcdb8
+  metadata.gz: 35972089d8384a358f3e79795fbf774be00e38b811872f690491057ccb17134488d3a19d21cdd2bc5854acab669033273689f2d99bc1fedbdb324d1eff31982c
+  data.tar.gz: 8a422f7936c8482d12b168ed6a5aab6dddda8691e98b327c206a676976f770ad3a02d4a0d19888eeb86188b0dea4431b370ed2e6989559758d99adaf2c696932

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.3'
+  VERSION = '0.9.5'
 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
@@ -62,8 +64,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}..."
@@ -227,23 +230,25 @@ private
 
   def sh_has_session?
     # tmux has-session -t <session_name>
-    cmd = [
-      "ssh",
-      *@ssh_opts,
-      resolv,
-      "'tmux has-session -t #{@name} 2>/dev/null'"
-    ]*' '
-    puts cmd if @verbose
-    system cmd
+    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_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_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,
-      "'tmux new-session -s #{@name} -d'"
+      remote_command
     ]*' '
     puts cmd if @verbose
     system cmd
@@ -292,4 +297,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/rosh.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "net-ssh"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 end

data/test/rosh_forwarding_test.rb

@@ -24,14 +24,24 @@ class RoshForwardingTest < Minitest::Test
   end
 
   def test_ssh_opts_include_local_forwarding_from_ssh_config
-    rosh = Rosh.new('grav')
+    klass = Class.new(Rosh) do
+      def local_forward_available?(_spec)
+        true
+      end
+    end
+    rosh = klass.new('grav')
     ssh_opts = rosh.instance_variable_get(:@ssh_opts)
 
     assert_includes ssh_opts, '-L 127.0.0.1:3131:localhost:3131'
   end
 
   def test_ssh_opts_include_remote_forwarding_from_ssh_config
-    rosh = Rosh.new('grav')
+    klass = Class.new(Rosh) do
+      def local_forward_available?(_spec)
+        true
+      end
+    end
+    rosh = klass.new('grav')
     ssh_opts = rosh.instance_variable_get(:@ssh_opts)
 
     assert_includes ssh_opts, '-R 8082:localhost:8082'
@@ -84,4 +94,50 @@ class RoshForwardingTest < Minitest::Test
     out_again, _ = capture_io { rosh.send(:report_oom_if_needed, 'ssh grav') }
     assert_equal '', out_again
   end
+
+  def test_tmux_new_session_disables_destroy_unattached
+    rosh = Rosh.new('grav', 'grav')
+    commands = []
+    rosh.stub(:system, ->(cmd) { commands << cmd; true }) do
+      assert rosh.send(:sh_new_session?)
+    end
+
+    assert_equal 1, commands.size
+    assert_includes commands.first, 'set-option -t grav destroy-unattached off'
+  end
+
+  def test_tmux_new_session_fallback_without_override
+    rosh = Rosh.new('grav', 'grav')
+    commands = []
+    results = [false, true].each
+
+    rosh.stub(:system, ->(cmd) { commands << cmd; results.next rescue true }) do
+      assert rosh.send(:sh_new_session?)
+    end
+
+    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.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-27 00:00:00.000000000 Z
+date: 2025-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +79,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/rosh