i2cssh 1.5.4 → 1.6.0

data/README.markdown

@@ -24,6 +24,7 @@ to all sessions.
     -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
+    -s, --sleep SLEEP                Number of seconds to sleep between creating SSH sessions
 
 i2cssh will assume you want to connect to a cluster when only one host is given.
 
@@ -62,6 +63,8 @@ Optional parameters can be used globablly or per cluster and include:
     rank: (true/false)          # Enable sending LC_RANK as an environment variable
     columns: <cols>             # Amount of columns
     rows: <rows>                # Amount of rows
+    sleep: <secs>               # Seconds to sleep between creating SSH sessions
+    direction: (column/row)     # Direction that new sessions are created (default: column)
 
     environment:                # Send the following enviroment variables
         - LC_FOO: foo

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.6.0

data/bin/i2cssh

@@ -36,11 +36,13 @@ def set_options(config_hash, login_override=nil)
         exit 1
     end
 
-    [:broadcast, :profile, :rank, :iterm2, :login_override, :columns, :rows].each do |p|
+    [:broadcast, :profile, :rank, :iterm2, :login_override, :columns, :rows, :sleep, :direction].each do |p|
         @i2_options[p] = config_hash[p.to_s].nil? ? @i2_options[p] : config_hash[p.to_s]
     end
 
     @i2_options[:login_override] = login_override if login_override
+    @i2_options[:direction] ||= :column
+    @i2_options[:direction] = @i2_options[:direction].to_sym
 
     @ssh_environment.merge!(config_hash["environment"].inject({}){|m, v| m.merge(v)}) if config_hash["environment"]
 end
@@ -141,6 +143,19 @@ optparse = OptionParser.new do |opts|
         'Use iTerm2 instead of iTerm' do
         opts_from_cmdline[:iterm2] = true
     end
+    opts.on '-s', '--sleep SLEEP', Float,
+        'Number of seconds to sleep between creating SSH sessions' do |s|
+        opts_from_cmdline[:sleep] = s
+    end
+    opts.on "-d", '--direction DIRECTION', String,
+        'Direction that new sessions are created (default: column)' do |d|
+        unless ["row", "column"].include?(d) then
+            puts "ERROR: -d requires 'row' or 'column'"
+            puts optparse.help
+            exit 1
+        end
+        opts_from_cmdline[:direction] = d.to_sym
+    end
 
 end
 optparse.parse!

data/i2cssh.gemspec

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

data/lib/i2cssh.rb

@@ -52,18 +52,24 @@ class I2Cssh
     end
 
     def split_session
+        splitmap = {
+            :column => {0 => "d", 1 => 123, 2 => "D", 3=> 124, :x => @columns, :y => @rows}, 
+            :row => {0 => "D", 1=> 126, 2 => "d", 3=> 125, :x => @rows, :y => @columns}
+        }
+        splitconfig = splitmap[@i2_options[:direction]]
+
         first = true
-        2.upto @columns do
-          @sys_events.keystroke "d", :using => :command_down
+        2.upto splitconfig[:x] do
+          @sys_events.keystroke splitconfig[0], :using => :command_down
         end
-        2.upto @rows do
-          1.upto @columns do
-            @sys_events.key_code 123, :using => [:command_down, :option_down] unless first
+        2.upto splitconfig[:y] do
+          1.upto splitconfig[:x] do
+            @sys_events.key_code splitconfig[1], :using => [:command_down, :option_down] unless first
             first = false
           end
-          @columns.times do |x|
-            @sys_events.keystroke "D", :using => :command_down
-            @sys_events.key_code 124, :using => [:command_down, :option_down] unless @columns - 1 == x
+          splitconfig[:x].times do |x|
+            @sys_events.keystroke splitconfig[2], :using => :command_down
+            @sys_events.key_code splitconfig[3], :using => [:command_down, :option_down] unless @columns - 1 == x
           end
         end
     end
@@ -88,7 +94,9 @@ class I2Cssh
                     send_env = "-o SendEnv=#{@ssh_environment.keys.join(",")}"
                     @term.sessions[i].write :text => "#{@ssh_environment.map{|k,v| "export #{k}=#{v}"}.join('; ')}"
                 end
-
+                if @i2_options[:sleep] then
+                    sleep @i2_options[:sleep] * i
+                end
                 @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
             else
                 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i2cssh
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
-  - 4
-  version: 1.5.4
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false