i2cssh 1.4.0 → 1.4.1

data/README.markdown

@@ -9,7 +9,7 @@ to all sessions.
     $ gem install i2cssh
 
 ## Usage
-    Usage: i2cssh [options]
+    Usage: i2cssh [options] [username@host [username@host]]
     -A, --forward-agent              Enable SSH agent forwarding
     -l, --login LOGIN                SSH login name
     -F, --fullscreen                 Make the window fullscreen
@@ -23,7 +23,18 @@ to all sessions.
     -c, --cluster CLUSTERNAME        Name of the cluster specified in ~/.i2csshrc
     -m, --machines a,b,c             Comma-separated list of hosts
 
-For -c and -m options, the format username@cluster or username@host.
+For -c and -m options, the format username@cluster or username@host can be used.
+
+The following commands are exactly the same, however, they might serve different purposes:
+
+    $ i2cssh -m user1@host1,user2@host2
+    $ i2cssh user1@host1 user2@host2
+
+Using the -l option will override all usernames:
+
+    $ i2css -l foo user1@host1 user2@host2
+
+This will connect to both host1 and host2 as the user foo
 
 ## i2csshrc
 
@@ -52,7 +63,6 @@ Make sure the config file is valid YAML (e.g. use spaces instead of tabs)
 ## Known issues
 
 - i2cssh uses rb-appscript and that only seems to work on ruby 1.8.7 and breaks on 1.9.x
-- Only a single username can be used when using -m username@host.
 
 ## TODO
 

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/bin/i2cssh

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'optparse'
 require 'i2cssh'
 require 'yaml'
-require 'pp'
+
 config_file = File.expand_path "~/.i2csshrc"
 
 i2_options, ssh_options, servers, clusters, login_from_cli = {}, [], [], {}, false
@@ -28,7 +28,7 @@ if File.exists?(config_file)
 end
 
 optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
+    opts.banner = "Usage: #{File.basename(__FILE__)} [options] [username@host [username@host]]"
 
     # Check if we have a cluster. 
     opts.on '-c', '--cluster CLUSTERNAME',
@@ -48,6 +48,10 @@ optparse = OptionParser.new do |opts|
             i2_options[:login_override] = login_from_cli if login_from_cli
             i2_options[:broadcast] = cluster["broadcast"] || i2_options[:broadcast]
 
+            if i2_options[:login_override] then
+                cluster_hosts = cluster_hosts.map{|h| "#{i2_options[:login_override]}@#{h}"}
+            end
+
             servers += cluster_hosts
         else
             puts "ERROR: unknown cluster #{c}"
@@ -58,13 +62,7 @@ optparse = OptionParser.new do |opts|
 
     opts.on '-m', '--machines a,b,c', Array,
         'Comma-separated list of hosts' do |h|
-        h.each do |host|
-            if host =~ /(.+)@(.+)/ then
-                i2_options[:login_override] = $1
-                host = $2
-            end
-            servers << host
-        end
+        servers += h
     end
 
     # Hosts
@@ -126,8 +124,12 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
+if ARGV.length > 0 then
+    servers = ARGV
+end
+
 if i2_options[:login_override] then
-    ssh_options << "-l #{i2_options[:login_override]}"
+    servers = servers.map{|h| "#{i2_options[:login_override]}@#{h.gsub(/.+@/,'')}"}
 end
 
 if servers.empty?

data/i2cssh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "i2cssh"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]

data/lib/i2cssh.rb

@@ -81,7 +81,7 @@ class I2Cssh
             else
                 
                 @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
-                sleep 0.2
+                sleep 0.3
                 @term.sessions[i].foreground_color.set "red"
                 @term.sessions[i].write :text => "stty -isig -icanon -echo && echo -e '#{"\n"*100}UNUSED' && cat > /dev/null"
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i2cssh
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Wouter de Bie