i2cssh 1.4.4 → 1.5.0

data/README.markdown

@@ -12,6 +12,7 @@ to all sessions.
     Usage: i2cssh [options]  [(username@host [username@host] | username@cluster)]
     -A, --forward-agent              Enable SSH agent forwarding
     -l, --login LOGIN                SSH login name
+    -e, --environment KEY=VAL        Send environment vars (comma-separated list, need to start with LC_)
     -F, --fullscreen                 Make the window fullscreen
     -C, --columns COLUMNS            Number of columns (rows will be calculated)
     -R, --rows ROWS                  Number of rows (columns will be calculated)
@@ -21,6 +22,7 @@ to all sessions.
     -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
+    -r, --rank                       Send LC_RANK with the host number as environment variable
     -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.
@@ -57,6 +59,12 @@ Optional parameters can be used globablly or per cluster and include:
     broadcast: (true/false)     # Enable/disable broadcast on start
     login: <username>           # Use this username for login
     profile: <iTerm2 profile>   # Use this iTerm profile
+    rank: (true/false)          # Enable sending LC_RANK as an environment variable
+
+    environment:                # Send the following enviroment variables
+        - LC_FOO: foo
+        - LC_BAR: bar
+    
     iterm2: true                # Use iTerm2.app instead of iTerm.app (only available globally)
 
 The following precedence is used:
@@ -65,6 +73,64 @@ 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)
 
+## Options
+
+### -A, --forward-agent
+
+Enable SSH agent forwarding
+
+### -l, --login LOGIN
+
+This option will override all logins passed in to i2cssh. This goes for global config, cluster config or username@host passed on the command line
+
+### -e, --environment KEY=VAL
+
+Allows for passing environment varables to the SSH session. This can be a comma-separated list: `-e LC_FOO=foo,LC_BAR=bar`
+
+### -F, --fullscreen
+
+Enable fullscreen on startup
+
+### -C, --columns COLUMNS
+
+Set the amount of columns. Can't be used in conjunction with -R
+
+### -R, --rows ROWS
+
+Set the amount of columns. Can't be used in conjunction with -C
+
+### -b, --broadcast
+
+Enable broadcast on startup. i2cssh will send cmd-shift-i to the window and press the OK button.
+
+### -nb, --nobroadcast
+
+Disable broadcast. This setting can be used to disable any broadcast that was set in the config.
+
+### -p, --profile PROFILE
+
+Use a specific iTerm profile
+
+### -2, --iterm2
+
+Use iTerm2.app instead of iTerm.app
+
+### -f, --file
+
+Will read nodes from a file. These will be added to any hosts specified on the command line or in the config
+
+### -c, --cluster
+
+Connect to a cluster that is specified in the config
+
+### -r, --rank
+
+Send a LC_RANK environment variable different for each host
+
+### -m, --machines a,b,c
+
+Connect to the machines a, b and c
+
 ## Known issues
 
 - i2cssh uses rb-appscript and that only seems to work on ruby 1.8.7 and breaks on 1.9.x

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.5.0

data/bin/i2cssh

@@ -3,10 +3,11 @@ require 'rubygems'
 require 'optparse'
 require 'i2cssh'
 require 'yaml'
+require 'pp'
 
 @config_file = File.expand_path "~/.i2csshrc"
 
-@i2_options, ssh_options, @servers, @clusters = {}, [], [], {}
+@i2_options, ssh_options, @servers, @clusters, @ssh_environment = {}, [], [], {}, {}
 
 def get_hosts(c)
     if c =~ /(.+)@(.+)/ then
@@ -19,15 +20,18 @@ def get_hosts(c)
     if cluster
         cluster_hosts = cluster["hosts"]
 
-        @i2_options[:login_override] = cluster["login"] || @i2_options[:login_override]
+        @i2_options[:login_override] = !cluster["login"].nil? ? 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]
+        @i2_options[:broadcast] = !cluster["broadcast"].nil? ? cluster["broadcast"] : @i2_options[:broadcast]
+        @i2_options[:profile] = !cluster["profile"].nil? ? cluster["profile"]  : @i2_options[:profile]
+        @i2_options[:rank] = !cluster["rank"].nil? ? cluster["rank"] : @i2_options[:rank]
 
         if @i2_options[:login_override] then
             cluster_hosts = cluster_hosts.map{|h| "#{@i2_options[:login_override]}@#{h}"}
         end
 
+        @ssh_environment.merge!(cluster["environment"].inject({}){|m, v| m.merge(v)}) if cluster["environment"]
+
         @servers += cluster_hosts
     else
         puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
@@ -47,6 +51,9 @@ if File.exists?(@config_file)
         @i2_options[:login_override] = config_hash["login"]
         @i2_options[:broadcast] = config_hash["broadcast"]
         @i2_options[:profile] = config_hash["profile"]
+        @i2_options[:rank] = config_hash["rank"]
+        
+        @ssh_environment.merge!(config_hash["environment"].inject({}){|m, v| m.merge(v)}) if config_hash["environment"]
         
     else
         # Convert version 1 format to version 2
@@ -87,6 +94,14 @@ optparse = OptionParser.new do |opts|
         @i2_options[:login_override] = u
         
     end
+    opts.on '-e', '--environment KEY=VAL',
+        'Send environment vars (comma-separated list, need to start with LC_)' do |e|
+        @ssh_environment = e.split(",").inject({}) {|m, x| key, val = x.split("="); m[key] = val; m}
+    end
+    opts.on '-r', '--rank',
+        'Send LC_RANK with the host number as environment variable' do
+        @i2_options[:rank] = true
+    end
 
     # iTerm2 options
     opts.on '-F', '--fullscreen',
@@ -95,14 +110,20 @@ optparse = OptionParser.new do |opts|
     end
     opts.on '-C', '--columns COLUMNS', Integer,
         'Number of columns (rows will be calculated)' do |c|
-        @i2_options[:columns] = c
+        if @i2_options[:rows]
+            puts "ERROR: -C and -R can't be used at the same time"
+            puts optparse.help
+            exit 1
+        else
+            @i2_options[:columns] = c
+        end
     end
     opts.on '-R', '--rows ROWS', Integer,
         'Number of rows (columns will be calculated)' do |r|
         if @i2_options[:columns]
             puts "ERROR: -C and -R can't be used at the same time"
             puts optparse.help
-            exit
+            exit 1
         else
             @i2_options[:rows] = r
         end
@@ -118,7 +139,6 @@ optparse = OptionParser.new do |opts|
     opts.on '-p', '--profile PROFILE',
         'Name of the iTerm2 profile (default: Default)' do |p|
         @i2_options[:profile] = p
-        puts p
     end
     opts.on "-2", '--iterm2',
         'Use iTerm2 instead of iTerm' do
@@ -145,4 +165,4 @@ if @servers.empty?
     exit
 end
 
-I2Cssh.new @servers, ssh_options, @i2_options
+I2Cssh.new @servers, ssh_options, @i2_options, @ssh_environment

data/i2cssh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "i2cssh"
-  s.version = "1.4.4"
+  s.version = "1.5.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-22"
+  s.date = "2012-03-23"
   s.description = "csshX like cluster ssh using iTerm2 panes"
   s.email = "wouter@evenflow.se"
   s.executables = ["i2cssh"]

data/lib/i2cssh.rb

@@ -1,11 +1,12 @@
 require 'appscript'
 
 class I2Cssh
-    def initialize servers, ssh_options, i2_options
-        @ssh_prefix  = "ssh " + ssh_options.join(' ')
-        @ssh_options = ssh_options
-        @i2_options  = i2_options
-        @servers     = servers
+    def initialize servers, ssh_options, i2_options, ssh_environment
+        @ssh_prefix         = "ssh " + ssh_options.join(' ')
+        @ssh_options        = ssh_options
+        @i2_options         = i2_options
+        @servers            = servers
+        @ssh_environment    = ssh_environment
 
         app_name = (i2_options[:iterm2]) ? 'iTerm2' : 'iTerm'
 
@@ -77,7 +78,18 @@ class I2Cssh
         1.upto(@rows*@columns) do |i|
             server = @servers[i-1]
             if server then
-                @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{server}"
+                ssh_env = ""
+
+                if @i2_options[:rank] then
+                    @ssh_environment['LC_RANK'] = i-1
+                end
+
+                if !@ssh_environment.empty? then
+                    send_env = "-o SendEnv=#{@ssh_environment.keys.join(",")}"
+                    @term.sessions[i].write :text => "#{@ssh_environment.map{|k,v| "export #{k}=#{v}"}.join('; ')}"
+                end
+
+                @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
             else
                 
                 @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""

metadata

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