rosh 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a4b0821ffe5555bfc94c655ce5fb65df8cad010f
-  data.tar.gz: 9194acb2ffd94f23204a0bbb047d15e7720bdeea
+SHA256:
+  metadata.gz: f64f95564122ea852fb93ffc481aac5a7977aca6c6858f716e3495f17ae07fc5
+  data.tar.gz: c364da8eeea9ec17bf927ecca79eda010393043c5580d4259929f7eded253a8d
 SHA512:
-  metadata.gz: da22e8d575e6eac82951990f4ac59a260327bd15576b1dc386ff8d7d0fdc46b5fd5d1cf01e7cbe59b3420a400642d8b9032a064c27fd77d20ca791808ff5813b
-  data.tar.gz: ccb2656b299e71747e42c3e16f7decca02597254f705edb7a86d321f56108a22f548438e35d0afbbac0f7f3b356c5f766b80741e722c78dd8c5a88f30a19f8aa
+  metadata.gz: 5eb516a7aecaa2d2baed09ca47941da6b6ba25530ba3b8b7eee3c04db2d5633164c038c913b1b0d326be9e2f8a91f9360acdaaa08f4d75a86b2267f170128f83
+  data.tar.gz: d565efa2e2a73328570f810270018935056c21328b75130e9f636b8ad1715bf1a35ee10a966493814540cf3aaacaffe2b6532ab6a39c4029aa7ebde9c2c8abb6

data/lib/rosh/version.rb

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

data/lib/rosh.rb

@@ -15,6 +15,8 @@ class Rosh
       opt.on('-a alive-interval'){|v| alive_interval = v.to_i}
       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
@@ -23,26 +25,58 @@ class Rosh
 
     # check ~/.ssh/config to resolve alias name
     config = Net::SSH::Config.for(@host)
+    if @verbose
+      puts "ssh-config: #{config}"
+    end
     @host = config[:host_name] if config[:host_name]
     @ssh_opts << "-l #{config[:user]}" if config[:user]
     @ssh_opts << "-p #{config[:port]}" if config[:port]
+    @ssh_opts << "-J #{config[:proxy].jump_proxies}" if config[:proxy]
     if keys = config[:keys]
       keys.each{|k| @ssh_opts << "-i #{k}"}
     end
+    if @verbose
+      puts "host: #{@host}"
+      puts "name: #{@name}"
+      puts "interval: #{@interval}"
+      puts "alive_interval: #{alive_interval}"
+      puts "options: #{@ssh_opts*' '}"
+    end
     @first_try = true
   end
 
   def connect
-    reconnect until system ["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
+    end
+    reconnect until system cmd
   end
 
   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."
@@ -58,7 +92,35 @@ class Rosh
 
 private
   def sh(a, r=nil)
-    system "ssh #{resolv} #{@ssh_opts*' '} 'screen -S #{@name} #{a}' #{r}"
+    cmd = "ssh #{resolv} #{@ssh_opts*' '} 'screen -S #{@name} #{a}' #{r}"
+    if @verbose
+      puts cmd
+    end
+    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

data/rosh.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require File.join(lib, %w[rosh version])
@@ -21,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "net-ssh"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Genki Takiuchi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ homepage: https://github.com/genki/rosh
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.4.15
+signing_key:
 specification_version: 4
 summary: Rosh is roaming shell
 test_files: []