i2cssh 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8171c7a47f59b5123c257de295eb24bc5794e6f9
-  data.tar.gz: 6b06917e9c767722a263b09641f37dbd9dc54c70
+  metadata.gz: c0b81c1ed4337a2a5d055b5856fc1aec9285020b
+  data.tar.gz: 56daca4591c06fa6b439c4e6fc88991420d558ab
 SHA512:
-  metadata.gz: d944ab75241dcbf9d782c87a3c8a7fbeaaaa1e64d0a8f049c6eca9fbd7ff482a94818c883c43a8e162b64f6a7c10a33fc7a066a9bfe4c8db2a222ff4aef908aa
-  data.tar.gz: c4bec965f29bf041c9bbdee2ab69e3f9506ae6ccff902eea306ac49bcc877261a4f4191fcab3fdf65a8f969e3e1b6a40cbd276e675e0590dc7446f491b5e96b3
+  metadata.gz: 0dfa9d489d8eeef193b4e8b59ba538a534e588f63da4d2f804d19fcfe36918ece3a0eb8e00916d2a22dc1201e41ac6c63a9c4bdb5bce5343b60970571f7b779e
+  data.tar.gz: bd48eb7b7bdb22242b00c2f412cdda2ddbee2c20549718eef57fb8429096f5d6fdd2b0101da5752bfdd2ef97adb4fef88993b6cf62c60ef5cec298b4413e793c

data/README.markdown

@@ -9,10 +9,16 @@ to all sessions.
     $ gem install i2cssh
 
 ## Usage
-    Usage: i2cssh [options]  [(username@host [username@host] | username@cluster)]
+    Usage: i2cssh [options] [(username@host [username@host] | username@cluster)]
+    -c, --clusters clus1,clus2       Comma-separated list of clusters specified in ~/.i2csshrc
+    -m, --machines a,b,c             Comma-separated list of hosts
+    -f, --file FILE                  Cluster file (one hostname per line)
+    -t, --tab-split                  Split servers/clusters into tabs (group arguments)
+    -T, --tab-split-nogroup          Split servers/clusters into tabs (don't group arguments)
     -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_)
+    -r, --rank                       Send LC_RANK with the host number as environment variable
     -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,11 +27,8 @@ to all sessions.
     -p, --profile PROFILE            Name of the iTerm2 profile (default: Default)
     -2, --iterm2                     Use iTerm2 instead of iTerm
     -i, --itermname NAME             Name of the application to use (default: 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
     -s, --sleep SLEEP                Number of seconds to sleep between creating SSH sessions
+    -d, --direction DIRECTION        Direction that new sessions are created (default: column)
     -X, --extra EXTRA_PARAM          Additional ssh parameters (e.g. -Xi=myidentity.pem)
 
 i2cssh will assume you want to connect to a cluster when only one host is given.
@@ -37,6 +40,10 @@ The following commands are exactly the same, however, they might serve different
     $ i2cssh -m user1@host1,user2@host2
     $ i2cssh user1@host1 user2@host2
 
+You can combine these options and use them multiple times:
+
+    $ i2cssh -m user1@host1,user2@host2 -m user3@host3 user4@host4 user5@host5
+
 Using the `-l` option will override all usernames:
 
     $ i2cssh -l foo user1@host1 user2@host2
@@ -57,7 +64,7 @@ The `i2csshrc` file is a YAML formatted file that contains the following structu
           - host1
           - host2
 
-Optional parameters can be used globablly or per cluster and include:
+Optional parameters can be used globally or per cluster and include:
 
     broadcast: (true/false)     # Enable/disable broadcast on start
     login: <username>           # Use this username for login
@@ -133,9 +140,9 @@ Name of the application to use (default: iTerm). It happens sometimes iTerm isn'
 
 Will read nodes from a file. These will be added to any hosts specified on the command line or in the config
 
-### -c, --cluster
+### -c, --clusters clus1,clus2
 
-Connect to a cluster that is specified in the config
+Connect to one or more clusters that are specified in the config 
 
 ### -r, --rank
 
@@ -145,6 +152,16 @@ Send a LC_RANK environment variable different for each host (from 0 to n)
 
 Connect to the machines a, b and c
 
+### -t, --tab-split
+
+Split servers/clusters into tabs, grouping arguments. 
+Tabs are created as follows: hosts after a -m option are put in one tab, each cluster is always in its own tab, all the arguments are in one tab.
+
+### -T, --tab-split-nogroup
+
+Split servers/clusters into tabs, *not* grouping arguments. 
+Tabs are created as follows: hosts after a -m option are put in one tab, each cluster is always in its own tab, each argument is in its own tab.
+
 ### -s, --sleep SLEEP
 
 Wait SLEEP seconds between starting each ssh session. This will take decimals as well (0.5 for half a second)

data/VERSION

@@ -1 +1 @@
-1.12.0
+1.13.0

data/bin/i2cssh

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
 require 'i2cssh'
@@ -6,51 +6,71 @@ require 'yaml'
 
 @config_file = File.expand_path "~/.i2csshrc"
 
-@i2_options, ssh_options, @servers, @clusters, @ssh_environment, opts_from_cmdline = {}, [], [], {}, {}, {}
+@i2_options, ssh_options, @servers, @clusters, @ssh_environment, opts_from_cmdline = [], [], [], {}, [], {} 
 
 def get_hosts(c)
-    if c =~ /(.+)@(.+)/ then
-        login_from_cli = $1
-        c = $2
-    end
+    c.each do |clus| 
 
-    cluster = @clusters[c]
+        if clus =~ /(.+)@(.+)/ 
+            login_from_cli = $1
+            clus = $2
+        end
 
-    if cluster
-        set_options(cluster, login_from_cli)
+        cluster = @clusters[clus]
+        if cluster
+            set_options(cluster, login_from_cli)
 
-        if @i2_options[:login] then
-            @servers += cluster["hosts"].map{|h| "#{@i2_options[:login]}@#{h}"}
+            if @i2_options.last[:login] 
+                @servers << cluster["hosts"].map{|h| "#{@i2_options.last[:login]}@#{h}"}
+            else
+                @servers << cluster["hosts"]
+            end
         else
-            @servers += cluster["hosts"]
+            puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
+            exit 1
         end
-    else
-        puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
-        exit 1
     end
+    
 end
 
 def set_options(config_hash, login_override=nil)
-    if config_hash["columns"] and config_hash["rows"] then
+    if config_hash["columns"] and config_hash["rows"] 
         puts "CONFIG ERROR: rows and columns can't be used at the same time"
         exit 1
     end
+    
+    if @i2_options.size == 0 
+        @i2_options << {}
+    else 
+        # The first member includes the default options from the conf file
+        @i2_options << @i2_options.first.clone
+    end
 
     [:broadcast, :profile, :rank, :iterm2, :login, :columns, :rows, :sleep, :direction, :itermname].each do |p|
-        @i2_options[p] = config_hash[p.to_s].nil? ? @i2_options[p] : config_hash[p.to_s]
+        @i2_options.last[p] = config_hash[p.to_s].nil? ? @i2_options.last[p] : config_hash[p.to_s]
+    end
+    
+    @i2_options.last[:login] = login_override if login_override
+    @i2_options.last[:direction] ||= :column
+    @i2_options.last[:direction] = @i2_options.last[:direction].to_sym
+    if config_hash["environment"] 
+        if @ssh_environment.empty? 
+            @ssh_environment << {}
+        else 
+            # We have some global env so copy it
+            @ssh_environment << @ssh_environment.first.clone
+        end
+
+        @ssh_environment.last.merge!(config_hash["environment"].inject({}){|m, v| m.merge(v)})
     end
 
-    @i2_options[:login] = 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
 
 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
+    if config_hash["version"] && config_hash["version"].to_i >= 2 
         set_options(config_hash)
         @clusters = config_hash["clusters"]
     else
@@ -62,24 +82,51 @@ else
     set_options({})
 end
 
+
 optparse = OptionParser.new do |opts|
     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|
+    opts.on '-c', '--clusters clus1,clus2', Array,
+        'Comma-separated list of clusters specified in ~/.i2csshrc' do |c|
         get_hosts(c)
     end
 
+
     opts.on '-m', '--machines a,b,c', Array,
         'Comma-separated list of hosts' do |h|
-        @servers += h
+        
+        # Add to servers array and get a clone of default options
+        @servers << h
+        @i2_options << @i2_options.first.clone
+        if @ssh_environment.empty?
+            @ssh_environment << {}
+        else
+            @ssh_environment << @ssh_environment.first.clone
+        end
     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")
+        @i2_options << @i2_options.first.clone
+        if @ssh_environment.empty?
+            @ssh_environment << {}
+        else
+            @ssh_environment << @ssh_environment.first.clone
+        end
+    end
+
+    opts.on '-t', '--tab-split',
+            'Split servers/clusters into tabs (group arguments)' do 
+        opts_from_cmdline[:tabs] = true
+    end
+
+    opts.on '-T', '--tab-split-nogroup',
+            'Split servers/clusters into tabs (don\'t group arguments)' do 
+        opts_from_cmdline[:tabs] = true
+        opts_from_cmdline[:tabs_nogroup] = true
     end
 
     # Command line options override config file
@@ -89,15 +136,19 @@ optparse = OptionParser.new do |opts|
         'Enable SSH agent forwarding' do
         ssh_options << '-A'
     end
+
     opts.on '-l', '--login LOGIN',
         'SSH login name' do |u|
         opts_from_cmdline[:login] = 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}
+        #Overwrite global ssh environment from config file
+        @ssh_environment[0] =  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
         opts_from_cmdline[:rank] = true
@@ -108,6 +159,7 @@ optparse = OptionParser.new do |opts|
         'Make the window fullscreen' do
         opts_from_cmdline[:fullscreen] = true
     end
+
     opts.on '-C', '--columns COLUMNS', Integer,
         'Number of columns (rows will be calculated)' do |c|
         if opts_from_cmdline[:rows]
@@ -154,7 +206,7 @@ optparse = OptionParser.new do |opts|
     end
     opts.on "-d", '--direction DIRECTION', String,
         'Direction that new sessions are created (default: column)' do |d|
-        unless ["row", "column"].include?(d) then
+        unless ["row", "column"].include?(d) 
             puts "ERROR: -d requires 'row' or 'column'"
             puts optparse.help
             exit 1
@@ -170,19 +222,65 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
-if ARGV.length == 1 then
-    c = ARGV[0]
+if opts_from_cmdline[:tabs] 
+    puts 'Disabling broadcast for tab split mode...'
+    opts_from_cmdline[:broadcast] = false
+end
+
+# One argument = one cluster
+if ARGV.length == 1 
+    c = [ARGV[0]]
     get_hosts(c)
-elsif ARGV.length > 1 then
-    @servers = ARGV
+
+# Otherwise we have a list of hosts
+elsif ARGV.length > 1 
+    if opts_from_cmdline[:tabs_nogroup] 
+        ARGV.each do |serv|
+            @servers << [serv]
+            if @i2_options.size > 1 # We added stuff in with cmdline options
+                @i2_options << @i2_options.first.clone
+                if @ssh_environment.empty?
+                    @ssh_environment << {}
+                else
+                    @ssh_environment << @ssh_environment.first.clone
+                end
+            end
+        end 
+    else
+        @servers << ARGV
+        if @i2_options.size > 1 # We added stuff in with cmdline options
+            @i2_options << @i2_options.first.clone
+            if @ssh_environment.empty?
+                @ssh_environment << {}
+            else
+                @ssh_environment << @ssh_environment.first.clone
+            end
+        end
+    end
 end
 
-@i2_options.merge!(opts_from_cmdline)
 
-if @i2_options[:login] then
-    @servers = @servers.map{|h| "#{@i2_options[:login]}@#{h.gsub(/.+@/,'')}"}
+# Drop default options
+if @i2_options.size > @servers.size
+    @i2_options.shift
+end
+
+if @ssh_environment.size > @servers.size 
+    @ssh_environment.shift
 end
 
+
+@i2_options.each do |opt| 
+    opt.merge!(opts_from_cmdline)
+end
+
+@i2_options.each_with_index do |opt, i| 
+    if opt[:login] 
+        @servers[i] = @servers[i].map{|h| "#{opt[:login]}@#{h.gsub(/.+@/,'')}"}
+    end    
+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.12.0"
+  s.version = "1.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = "2014-02-23"
+  s.date = "2015-03-19"
   s.description = "csshX like cluster ssh using iTerm2 panes"
   s.email = "wouter@evenflow.se"
   s.executables = ["i2cssh"]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/wouterdebie/i2cssh"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.14"
   s.summary = "csshX like cluster ssh using iTerm2 panes"
 
   if s.respond_to? :specification_version then

data/lib/i2cssh.rb

@@ -1,14 +1,13 @@
 require 'appscript'
-
 class I2Cssh
     def initialize servers, ssh_options, i2_options, ssh_environment
         @ssh_prefix         = "ssh " + ssh_options.join(' ')
         @ssh_options        = ssh_options
-        @i2_options         = i2_options
+        @i2_options         = i2_options.clone
         @servers            = servers
         @ssh_environment    = ssh_environment
 
-        app_name = (i2_options[:iterm2]) ? 'iTerm2' : ((i2_options[:itermname]) ? i2_options[:itermname] : 'iTerm')
+        app_name = (i2_options.first[:iterm2]) ? 'iTerm2' : ((i2_options.first[:itermname]) ? i2_options.first[:itermname] : 'iTerm')
 
         raise Exception.new 'No servers given' if servers.empty?
 
@@ -19,16 +18,28 @@ class I2Cssh
         @shell_menu = @sys_events.processes[app_name].menu_bars[1].menu_bar_items["Shell"].menus["Shell"]
         @term = @iterm.make(:new => :terminal)
 
-        @profile = i2_options[:profile] || "Default"
+        @profile = i2_options.first[:profile] || "Default"
+
+        @term.launch_(:session => "Default Session")
+        
+        maximize(app_name) if i2_options.first[:fullscreen]
+
 
-        session = @term.sessions.after.make :new => :session
-        session.exec :command => "/bin/bash -l"
+        while !@servers.empty? do
+            compute_geometry
+            split_session
+            start_ssh
+            enable_broadcast if i2_options.first[:broadcast]
+            @servers.shift
+            @i2_options.shift
+            @ssh_environment.shift
 
-        compute_geometry
-        maximize(app_name) if i2_options[:fullscreen]
-        split_session
-        start_ssh
-        enable_broadcast if i2_options[:broadcast]
+            if !@servers.empty?  && @i2_options.first[:tabs] then
+                # By default, a new session = a new tab
+                @term.launch_(:session => "Default Session")
+            end
+        end
+        @term.select(@term.sessions[1])
     end
 
     private
@@ -44,9 +55,24 @@ class I2Cssh
     end
 
     def compute_geometry
-        count = @servers.size
-        @rows = @i2_options[:rows]
-        @columns = @i2_options[:columns]
+        # Keep track of session index for multi-tab mode
+        if @session_index then
+            @session_index += @rows*@columns
+        else
+            @session_index = 0
+        end
+
+        # Create geometry when combining and ignore rows/columns preference
+        if @servers.size > 1 && !@i2_options.first[:tabs]
+            count = 0
+            @servers.each do |srv|
+                count += srv.size
+            end
+        else
+            count = @servers.first.size
+            @rows = @i2_options.first[:rows]
+            @columns = @i2_options.first[:columns]
+        end
 
         if @rows then
             @columns = (count / @rows.to_f).ceil
@@ -59,7 +85,7 @@ class I2Cssh
         # Quick hack: iTerms default window only supports up to 11 rows and 22 columns
         # If we surpass either one, we resort to full screen.
         if @rows > 11 or @columns > 22 then
-            @i2_options[:fullscreen] = true
+            @i2_options.first[:fullscreen] = true
         end
     end
 
@@ -84,7 +110,7 @@ class I2Cssh
             :column => {0 => split_vert, 1 => left, 2 => split_hori, 3=> right, :x => @columns, :y => @rows}, 
             :row => {0 => split_hori, 1=> up, 2 => split_vert, 3=> down, :x => @rows, :y => @columns}
         }
-        splitconfig = splitmap[@i2_options[:direction]]
+        splitconfig = splitmap[@i2_options.first[:direction]]
 
         first = true
         2.upto splitconfig[:x] do
@@ -109,31 +135,47 @@ class I2Cssh
     end
 
     def start_ssh
+        old_size = 0
+
         1.upto(@rows*@columns) do |i|
-            @term.sessions[i].write :text => "/bin/bash -l"
+            @term.sessions[@session_index + i].write :text => "/usr/bin/env bash -l"
+            
+            # Without the tab flag, combine all servers and clusters into one window
+            if !@servers.empty? && (i - old_size) > @servers.first.size
+                old_size = @servers.first.size
+                @servers.shift
+                @i2_options.shift
+                @ssh_environment.shift
+            end
+
+            if @servers.empty?
+                server = nil
+            else
+                server = @servers.first[i-old_size-1]
+            end
+
 
-            server = @servers[i-1]
             if server then
                 send_env = ""
 
-                if @i2_options[:rank] then
-                    @ssh_environment['LC_RANK'] = i-1
+                if @i2_options.first[:rank] then
+                    @ssh_environment.first['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('; ')}"
+                if !@ssh_environment.empty? && !@ssh_environment.first.empty? then
+                    send_env = "-o SendEnv=#{@ssh_environment.first.keys.join(",")}"
+                    @term.sessions[@session_index + i].write :text => "#{@ssh_environment.first.map{|k,v| "export #{k}=#{v}"}.join('; ')}"
                 end
-                if @i2_options[:sleep] then
-                    sleep @i2_options[:sleep] * i
+                if @i2_options.first[:sleep] then
+                    sleep @i2_options.first[:sleep] * i
                 end
-                @term.sessions[i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
+                @term.sessions[@session_index + 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\""
+                @term.sessions[@session_index + i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
                 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"
+                @term.sessions[@session_index + i].foreground_color.set "red"
+                @term.sessions[@session_index + i].write :text => "stty -isig -icanon -echo && echo -e '#{"\n"*100}UNUSED' && cat > /dev/null"
             end
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i2cssh
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Wouter de Bie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: csshX like cluster ssh using iTerm2 panes