rosh 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513050c2aee848c5c2dc576a570cb05abe6e28d3
-  data.tar.gz: 5e330a7a4fb540e00b8e7964ea6f75a0e85d964d
+  metadata.gz: 5f03ab9e65cf17ee6327d425892ec00fcd19b92d
+  data.tar.gz: 1609dced29c0bb1b548b882358648e83fa6b71f0
 SHA512:
-  metadata.gz: 63f9d47cbbead61ecbb127e1ac9ab4f9952aac5a1355cb920994f15b434ee9a54319858589be738589f86b109ed9ab3f523cfa629577f13a52afa61357a3c846
-  data.tar.gz: 71e82d87c88151be0caa95055c275a3ed6a4d57e60566336e1e29907519e866baa6519f9611ac7bfbf64801deae36c133898ed3fa7d4b2c9ffafe11c2838835f
+  metadata.gz: c887a87750fa74cdede9dd1b70d38de6d3db34eb142a1b77f2ec33011deff74596f6c23fa7d23f8fbf8811cb1c78c4123aafa12394ebc37567cb1237f04758ca
+  data.tar.gz: 46ad0b56a3c47ddb99963f9bad25c71b1831e8d2d1e0bf080915e36c0a1790d23ddac4e92285e121e0802dabaa0c946cc72805aa0a2c170020ccff986789c310

data/README.md

@@ -21,6 +21,17 @@ Or install it yourself as:
 
     rosh hostname [GNU_screen_session_name]
 
+To detach the outer screen session,
+
+    ^t d
+
+To send the command to the inner screen session,
+
+    ^a
+
+Currently it is not configurable, but the source code is very simple
+to be customizable.
+
 ## Contributing
 
 1. Fork it

data/bin/rosh

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), %w[.. lib rosh])
 
+Version = Rosh::VERSION
 Rosh.new(*ARGV).connect

data/lib/rosh/version.rb

@@ -0,0 +1,3 @@
+class Rosh
+  VERSION = '0.3.0'
+end

data/lib/rosh.rb

@@ -1,25 +1,34 @@
 require 'uri'
 require 'resolv'
 require 'net/ssh/config'
+require 'optparse'
+require File.join(File.dirname(__FILE__), %w[rosh version])
 
 class Rosh
-  def initialize(host, name = :default, *opts)
-    @host, @name = host, name
-    @first_try = true
+  def initialize(*args)
+    @ssh_opts = []
+    alive_interval = 5
+    @escape = '^t'
+    OptionParser.new.tap do |opt|
+      opt.on '-n' do
+        @ssh_opts << '-o UserKnownHostsFile=/dev/null'
+        @ssh_opts << '-o StrictHostKeyChecking=no'
+      end
+      opt.on('-a alive-interval'){|v| alive_interval = v.to_i}
+      opt.on('-e escape'){|v| @escape = v}
+    end.parse! args
+    @host, @name = *args, :default
+    @ssh_opts << "-o ServerAliveInterval=#{alive_interval}"
+    @ssh_opts << "-o ServerAliveCountMax=1"
+
+    # check ~/.ssh/config to resolve alias name
     config = Net::SSH::Config.for(@host)
     @host = config[:host_name] if config[:host_name]
-    @opts = ["-o ServerAliveInterval=5", "-o ServerAliveCountMax=1"]
-    opts.each do |opt|
-      case opt
-      when '-n' 
-        @opts << '-o UserKnownHostsFile=/dev/null'
-        @opts << '-o StrictHostKeyChecking=no'
-      end
-    end
+    @first_try = true
   end
 
   def connect
-    reconnect until system ["ssh", *@opts, resolv,
+    reconnect until system ["ssh", *@ssh_opts, resolv,
       '-t', "'screen -rx #{@name}'", '2>/dev/null']*' '
   end
 
@@ -27,7 +36,7 @@ class Rosh
     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 "^t^t" -dm' and
+        if sh %{-c /dev/null -e "#{@escape*2}" -dm} and
           sh '-p 0 -X eval "stuff STY=\\040screen\\015"'
           puts "done."
         else

data/rosh.gemspec

@@ -1,9 +1,10 @@
 # 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])
 Gem::Specification.new do |spec|
   spec.name          = "rosh"
-  spec.version       = '0.2.5'
+  spec.version       = Rosh::VERSION
   spec.authors       = ["Genki Takiuchi"]
   spec.email         = ["genki@s21g.com"]
   spec.description   = <<-EOD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rosh
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Genki Takiuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - Rakefile
 - bin/rosh
 - lib/rosh.rb
+- lib/rosh/version.rb
 - rosh.gemspec
 homepage: https://github.com/genki/rosh
 licenses: