rosh 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a029ca2deda02d278e112ba05e40a56dce955ffa8476091d0406ae098788bd1
-  data.tar.gz: 701dfa757f7371589b997e21914dfecf6af4fe5b21b8519804ff4f2e7ae36b71
+  metadata.gz: 3934908cd1559287bd808f7774a044e7e598850d814bfcfe15604df715653114
+  data.tar.gz: 71f530ac4d74d582a4c4145f07f941e7ca63323a0bc054e33ac7cffd72b475ef
 SHA512:
-  metadata.gz: 98e03da0dbba0d8737e39729553952ada5016b5cb7e2fe73a1b5184be1cafcfdf7d76b38a373731dca8a08bca68e014ed4b0d38fed7182eca1d9567249a31da4
-  data.tar.gz: 8889757e1b4d933624a33d78727d2044fb36e16d58048e9e255355d8b2de8236697ceabb08eba52f63d90abb9c6f429555ffe5dc436596a3c9263399662bcdb8
+  metadata.gz: 922807c829ec873dbcb5a617cbcfd5b50a3d3da0cdfac24c6914223c27da717c9c29d109893402ca6f2666e3287035d34827b9efced35eaf4bc8cb7cdb6459e9
+  data.tar.gz: 0da6edde2a9f4825d029d2e8a37b5edf728e518d31997ede1522562e8d24d8ebd0f4a74f93211529ebb412824508a4105d0c50046775b042f3ee59469cb8851c

data/lib/rosh/version.rb

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

data/lib/rosh.rb

@@ -227,23 +227,24 @@ 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 has-session -t #{@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"
+    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")
+  end
+
+  def ssh_tmux(command)
     cmd = [
       "ssh",
       *@ssh_opts,
       resolv,
-      "'tmux new-session -s #{@name} -d'"
+      "'#{command}'"
     ]*' '
     puts cmd if @verbose
     system cmd

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,28 @@ 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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-27 00:00:00.000000000 Z
+date: 2025-10-09 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