rosh 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b2fab6f41d5905467f31451ef95acb39c7eb8fe20c7f73d7a1738db8a8a7e87
-  data.tar.gz: cc245fe892759cf80f32f3c3350ce20311e1323f77f69bcf8bb9ccc900246602
+  metadata.gz: f64f95564122ea852fb93ffc481aac5a7977aca6c6858f716e3495f17ae07fc5
+  data.tar.gz: c364da8eeea9ec17bf927ecca79eda010393043c5580d4259929f7eded253a8d
 SHA512:
-  metadata.gz: e6b64bd51c565a4656c6d4592fb5ba77ef873e3046baf01927836cc5077695b81ba0f5823d3a8c32d3ef7814eefba44f37baafbc7ad7bb9cbfe40f7f37cda6ce
-  data.tar.gz: 44a80483ac889fce806662c003797b5ca785b84ea28fda96d0a00994a43d81f453f05426a70a718bdfdfce28a809bec8e8e7bcb90c928fb36eee29276a0d6161
+  metadata.gz: 5eb516a7aecaa2d2baed09ca47941da6b6ba25530ba3b8b7eee3c04db2d5633164c038c913b1b0d326be9e2f8a91f9360acdaaa08f4d75a86b2267f170128f83
+  data.tar.gz: d565efa2e2a73328570f810270018935056c21328b75130e9f636b8ad1715bf1a35ee10a966493814540cf3aaacaffe2b6532ab6a39c4029aa7ebde9c2c8abb6

data/lib/rosh/version.rb

@@ -1,3 +1,3 @@
 class Rosh
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/rosh.rb

@@ -16,6 +16,7 @@ class Rosh
       opt.on('-e escape'){|v| @escape = v}
       opt.on('-I interval'){|v| @interval = v.to_f}
       opt.on('-V'){|v| @verbose = true}
+      opt.on('-S'){|v| @screen = true}
     end.parse! args
     @host, @name = *args, :default
     abort 'hostname is required' if @host == :default
@@ -45,8 +46,13 @@ class Rosh
   end
 
   def connect
-    cmd = ["ssh", *@ssh_opts, resolv,
-      '-t', "'screen -rx #{@name}'", '2>/dev/null']*' '
+    cmd = if @screen
+      ["ssh", *@ssh_opts, resolv,
+        '-t', "'screen -rx #{@name}'", '2>/dev/null']*' '
+    else
+      ["ssh", *@ssh_opts, resolv,
+        '-t', "'tmux attach -t #{@name}'", '2>/dev/null']*' '
+    end
     if @verbose
       puts "connecting to #{@host}..."
       puts cmd
@@ -56,10 +62,21 @@ class Rosh
 
   def reconnect
     if @first_try
-      if !sh('-p 0 -X echo ok', '2>&1 >/dev/null')
-        print "creating new screen session #{@name}... "
-        if sh %{-c /dev/null -e "#{@escape*2}" -dm} and
-          sh '-p 0 -X eval "stuff STY=\\040screen\\015"'
+      session_exists = if @screen
+        sh('-p 0 -X echo ok', '2>&1 >/dev/null')
+      else
+        sh_has_session?
+      end
+      unless session_exists
+        type = @screen ? 'screen' : 'tmux'
+        print "creating new #{type} session #{@name}..."
+        new_session = if @screen
+          sh %{-c /dev/null -e "#{@escape*2}" -dm} and
+            sh '-p 0 -X eval "stuff STY=\\040screen\\015"'
+        else
+          sh_new_session?
+        end
+        if new_session
           puts "done."
         else
           puts "failed."
@@ -82,6 +99,30 @@ private
     system cmd
   end
 
+  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
+  end
+
+  def sh_new_session?
+    # tmux new-session -s <session_name> -d
+    cmd = [
+      "ssh",
+      *@ssh_opts,
+      resolv,
+      "'tmux new-session -s #{@name} -d'"
+    ]*' '
+    puts cmd if @verbose
+    system cmd
+  end
+
   def resolv
     uri = URI("//#{@host}")
     uri.host = Resolv::DNS.new.getaddress(uri.host).to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh