i2cssh 1.4.2 → 1.4.3

data/README.markdown

@@ -9,7 +9,7 @@ to all sessions.
     $ gem install i2cssh
 
 ## Usage
-    Usage: i2cssh [options] [username@host [username@host]]
+    Usage: i2cssh [options]  [(username@host [username@host] | username@cluster)]
     -A, --forward-agent              Enable SSH agent forwarding
     -l, --login LOGIN                SSH login name
     -F, --fullscreen                 Make the window fullscreen
@@ -23,6 +23,8 @@ to all sessions.
     -c, --cluster CLUSTERNAME        Name of the cluster specified in ~/.i2csshrc
     -m, --machines a,b,c             Comma-separated list of hosts
 
+i2cssh will assume you want to connect to a cluster when only one host is given.
+
 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:

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/bin/i2cssh

@@ -3,23 +3,51 @@ require 'rubygems'
 require 'optparse'
 require 'i2cssh'
 require 'yaml'
+require 'pp'
 
-config_file = File.expand_path "~/.i2csshrc"
+@config_file = File.expand_path "~/.i2csshrc"
 
-i2_options, ssh_options, servers, clusters, login_from_cli = {}, [], [], {}, false
+@i2_options, ssh_options, @servers, @clusters = {}, [], [], {}
 
-if File.exists?(config_file) 
-    config_hash = YAML.load File.read config_file
+def get_hosts(c)
+    if c =~ /(.+)@(.+)/ then
+        login_from_cli = $1
+        c = $2
+    end
+
+    cluster = @clusters[c]
+
+    if cluster
+        cluster_hosts = cluster["hosts"]
+
+        @i2_options[:login_override] = cluster["login"] || @i2_options[:login_override]
+        @i2_options[:login_override] = login_from_cli if login_from_cli
+        @i2_options[:broadcast] = cluster["broadcast"] || @i2_options[:broadcast]
+        @i2_options[:profile] = cluster["profile"] || @i2_options[:profile]
+
+        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}. Check your #{@config_file}"
+        exit 1
+    end
+end
+
+if File.exists?(@config_file) 
+    config_hash = YAML.load File.read @config_file
 
     # Read config and set defaults from config
     if config_hash["version"] && config_hash["version"].to_i >= 2 then
-        clusters = config_hash["clusters"]
+        @clusters = config_hash["clusters"]
         
         # Options from the config file
-        i2_options[:iterm2] = config_hash["iterm2"]
-        i2_options[:login_override] = config_hash["login"]
-        i2_options[:broadcast] = config_hash["broadcast"]
-        i2_options[:profile] = config_hash["profile"]
+        @i2_options[:iterm2] = config_hash["iterm2"]
+        @i2_options[:login_override] = config_hash["login"]
+        @i2_options[:broadcast] = config_hash["broadcast"]
+        @i2_options[:profile] = config_hash["profile"]
         
     else
         # Convert version 1 format to version 2
@@ -29,48 +57,23 @@ if File.exists?(config_file)
 end
 
 optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename(__FILE__)} [options] [username@host [username@host]]"
+    opts.banner = "Usage: #{File.basename(__FILE__)} [options] [(username@host [username@host] | username@cluster)]"
 
     # Check if we have a cluster. 
     opts.on '-c', '--cluster CLUSTERNAME',
         'Name of the cluster specified in ~/.i2csshrc' do |c|
-
-        if c =~ /(.+)@(.+)/ then
-            login_from_cli = $1
-            c = $2
-        end
-
-        cluster = clusters[c]
-
-        if clusters
-            cluster_hosts = cluster["hosts"]
-
-            i2_options[:login_override] = cluster["login"] || i2_options[:login_override]
-            i2_options[:login_override] = login_from_cli if login_from_cli
-            i2_options[:broadcast] = cluster["broadcast"] || i2_options[:broadcast]
-            i2_options[:profile] = cluster["profile"] || i2_options[:profile]
-
-            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}"
-            puts optparse.help
-            exit 1
-        end
+        get_hosts(c)
     end
 
     opts.on '-m', '--machines a,b,c', Array,
         'Comma-separated list of hosts' do |h|
-        servers += h
+        @servers += h
     end
 
     # Hosts
     opts.on '-f', '--file FILE',
         'Cluster file (one hostname per line)' do |f|
-        servers += File.read(f).split "\n"
+        @servers += File.read(f).split "\n"
     end
 
     # Command line options override config file
@@ -82,62 +85,65 @@ optparse = OptionParser.new do |opts|
     end
     opts.on '-l', '--login LOGIN',
         'SSH login name' do |u|
-        i2_options[:login_override] = u
+        @i2_options[:login_override] = u
         
     end
 
     # iTerm2 options
     opts.on '-F', '--fullscreen',
         'Make the window fullscreen' do
-        i2_options[:fullscreen] = true
+        @i2_options[:fullscreen] = true
     end
     opts.on '-C', '--columns COLUMNS', Integer,
         'Number of columns (rows will be calculated)' do |c|
-        i2_options[:columns] = c
+        @i2_options[:columns] = c
     end
     opts.on '-R', '--rows ROWS', Integer,
         'Number of rows (columns will be calculated)' do |r|
-        if i2_options[:columns]
+        if @i2_options[:columns]
             puts "ERROR: -C and -R can't be used at the same time"
             puts optparse.help
             exit
         else
-            i2_options[:rows] = r
+            @i2_options[:rows] = r
         end
     end
     opts.on '-b', '--broadcast',
         'Start with broadcast input (DANGEROUS!)' do
-        i2_options[:broadcast] = true
+        @i2_options[:broadcast] = true
     end
     opts.on '-nb', '--nobroadcast',
         'Disable broadcast' do
-        i2_options[:broadcast] = false
+        @i2_options[:broadcast] = false
     end
     opts.on '-p', '--profile PROFILE',
         'Name of the iTerm2 profile (default: Default)' do |p|
-        i2_options[:profile] = p
+        @i2_options[:profile] = p
         puts p
     end
     opts.on "-2", '--iterm2',
         'Use iTerm2 instead of iTerm' do
-        i2_options[:iterm2] = true
+        @i2_options[:iterm2] = true
     end
 
 end
 optparse.parse!
 
-if ARGV.length > 0 then
-    servers = ARGV
+if ARGV.length == 1 then
+    c = ARGV[0]
+    get_hosts(c)
+elsif ARGV.length > 1 then
+    @servers = ARGV
 end
 
-if i2_options[:login_override] then
-    servers = servers.map{|h| "#{i2_options[:login_override]}@#{h.gsub(/.+@/,'')}"}
+if @i2_options[:login_override] then
+    @servers = @servers.map{|h| "#{@i2_options[:login_override]}@#{h.gsub(/.+@/,'')}"}
 end
 
-if servers.empty?
+if @servers.empty?
     puts "ERROR: no servers given"
     puts optparse.help
     exit
 end
 
-I2Cssh.new servers, ssh_options, i2_options
+I2Cssh.new @servers, ssh_options, @i2_options

data/i2cssh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "i2cssh"
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = "2012-03-21"
+  s.date = "2012-03-22"
   s.description = "csshX like cluster ssh using iTerm2 panes"
   s.email = "wouter@evenflow.se"
   s.executables = ["i2cssh"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i2cssh
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false