i2cssh 1.3.4 → 1.4.0

data/README.markdown

@@ -16,35 +16,47 @@ to all sessions.
     -C, --columns COLUMNS            Number of columns (rows will be calculated)
     -R, --rows ROWS                  Number of rows (columns will be calculated)
     -b, --broadcast                  Start with broadcast input (DANGEROUS!)
+    -nb, --nobroadcast               Disable broadcast
     -p, --profile PROFILE            Name of the iTerm2 profile (default: Default)
     -2, --iterm2                     Use iTerm2 instead of iTerm
     -f, --file FILE                  Cluster file (one hostname per line)
     -c, --cluster CLUSTERNAME        Name of the cluster specified in ~/.i2csshrc
     -m, --machines a,b,c             Comma-separated list of hosts
 
-The cluster file format is one host per line.
+For -c and -m options, the format username@cluster or username@host.
 
 ## i2csshrc
 
 The i2csshrc file is a YAML formatted file that contains the following structure:
 
     ---
+    version: 2             # Mandatory. Current version is 2
+    iterm2: false           # Optional. Set to true if you use iTerm2.app instead of iTerm.app.
+    broadcast: false        # Optional. Set to true if you want to enable broadcast for all clusters.
+    login: myusername       # Optional. Always use this username.
     clusters:
       mycluster:
-        - host1
-        - host2
-        - ...
+        broadcast: false    # Optional. Set to true if you want to enable broadcast for this cluster.
+        login: false        # Optional. Set to true if you want a specific login for this cluster.
+        hosts:
+          - host1
+          - host2
+          - ...
+
+The following precedence is used:
+
+global options from config < cluster options from config < command line flags
 
 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
 
 - Functional parity with csshX (as far as possible)
-- Being able to specify an iTerm2 profile
 
 ## Contributing to i2cssh
 
@@ -61,6 +73,6 @@ fork, hack and create a pull request.
 
 ## Copyright
 
-Copyright (c) 2011 Wouter de Bie. See LICENSE.txt for
+Copyright (c) 2011-2012 Wouter de Bie. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.4.0

data/bin/i2cssh

@@ -2,12 +2,79 @@
 require 'rubygems'
 require 'optparse'
 require 'i2cssh'
+require 'yaml'
+require 'pp'
+config_file = File.expand_path "~/.i2csshrc"
 
-i2_options, ssh_options, servers = {}, [], []
+i2_options, ssh_options, servers, clusters, login_from_cli = {}, [], [], {}, false
+
+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"]
+        
+        # Options from the config file
+        i2_options[:iterm2] = config_hash["iterm2"]
+        i2_options[:login_override] = config_hash["login"]
+        i2_options[:broadcast] = config_hash["broadcast"]
+        
+    else
+        # Convert version 1 format to version 2
+        clusters = config_hash["clusters"].inject({}){|m, c| m[c[0]] = {"hosts" => c[1]}; m}
+    end
+
+end
 
 optparse = OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
 
+    # 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]
+
+            servers += cluster_hosts
+        else
+            puts "ERROR: unknown cluster #{c}"
+            puts optparse.help
+            exit 1
+        end
+    end
+
+    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
+    end
+
+    # Hosts
+    opts.on '-f', '--file FILE',
+        'Cluster file (one hostname per line)' do |f|
+        servers += File.read(f).split "\n"
+    end
+
+    # Command line options override config file
+
     # SSH options
     opts.on '-A', '--forward-agent',
         'Enable SSH agent forwarding' do
@@ -15,7 +82,8 @@ optparse = OptionParser.new do |opts|
     end
     opts.on '-l', '--login LOGIN',
         'SSH login name' do |u|
-        ssh_options << "-l #{u}"
+        i2_options[:login_override] = u
+        
     end
 
     # iTerm2 options
@@ -41,6 +109,10 @@ optparse = OptionParser.new do |opts|
         'Start with broadcast input (DANGEROUS!)' do
         i2_options[:broadcast] = true
     end
+    opts.on '-nb', '--nobroadcast',
+        'Disable broadcast' do
+        i2_options[:broadcast] = false
+    end
     opts.on '-p', '--profile PROFILE',
         'Name of the iTerm2 profile (default: Default)' do |p|
         i2_options[:profile] = p
@@ -51,31 +123,13 @@ optparse = OptionParser.new do |opts|
         i2_options[:iterm2] = true
     end
 
-    # Hosts
-    opts.on '-f', '--file FILE',
-        'Cluster file (one hostname per line)' do |f|
-        servers += File.read(f).split "\n"
-    end
-    opts.on '-c', '--cluster CLUSTERNAME',
-        'Name of the cluster specified in ~/.i2csshrc' do |c|
-        require 'yaml'
-        config_hash = YAML.load File.read File.expand_path '~/.i2csshrc'
-        cluster = config_hash["clusters"][c]
-        if cluster
-          servers += cluster
-        else
-          puts "ERROR: unknown cluster #{c}"
-          puts optparse.help
-          exit 1
-        end
-    end
-    opts.on '-m', '--machines a,b,c', Array,
-        'Comma-separated list of hosts' do |h|
-        servers += h
-    end
 end
 optparse.parse!
 
+if i2_options[:login_override] then
+    ssh_options << "-l #{i2_options[:login_override]}"
+end
+
 if servers.empty?
     puts "ERROR: no servers given"
     puts optparse.help

data/i2cssh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "i2cssh"
-  s.version = "1.3.4"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-21"
   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: 19
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
   - 4
-  version: 1.3.4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false