i2cssh 1.16.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b5f061ea224c7e4c979cc236f765487d4aaada
-  data.tar.gz: 56871f698c12642a72b04d22cd14c7c26fcf826a
+  metadata.gz: 88668f1a5e023bfe629d1ef3ce8d37a1abb86b2f
+  data.tar.gz: 258cebb74a3b99a50c629a83f0001ca731581362
 SHA512:
-  metadata.gz: 944dbcad21622a1e055a079e5b973e3af011042dce697b0f70cd7d0d157ff68ed0d6eaff36c9cac7eb5dea4eddbbc582bc05b40b8e7e5e4dd5007023ca8fa52f
-  data.tar.gz: e7558c97748e2407bf87624011b311d9f43caf99e80a47793ef778efd6cc78de9de30930aae8b7bc192d38801b5a833dcbe03f8261d5ce6e9863503f36e75c5a
+  metadata.gz: 96ec82ba52fc77aa1e43c5389b8ad385cad5d9cceb24f14f48568ba12a6cf80190ac636fd11a05c06b3b03c62d883fdb4e6a806261c1ce717c5f484f0e46e0ac
+  data.tar.gz: 71494be0c81efb397af53c4e00e7a56ad173425d8d6bba1d838cc07a1b9bcaad853fbabe19ea7ad530d6c7b4d8aea6ae22be7dec636a4a46221a12e55a40005e

data/README.markdown

@@ -4,8 +4,12 @@ i2cssh is a csshX (http://code.google.com/p/csshx/) like tool for connecting ove
 a master window for input, i2cssh uses iterm2 split panes and "Send input to all sessions" (cmd-shift-i) to send commands
 to all sessions.
 
-## Installing 
+## Installing
 
+When using iTerm2 < 2.9, install i2cssh version 1.16.0:
+    $ gem install i2cssh -v 1.16.0
+
+Otherwise, just run:
     $ gem install i2cssh
 
 ## Usage
@@ -79,7 +83,7 @@ Optional parameters can be used globally or per cluster and include:
     environment:                # Send the following enviroment variables
         - LC_FOO: foo
         - LC_BAR: bar
-    
+
     iterm2: true                # Use iTerm2.app instead of iTerm.app (only available globally)
 
 Note: rows and columns can't be used together.
@@ -142,7 +146,7 @@ Will read nodes from a file. These will be added to any hosts specified on the c
 
 ### -c, --clusters clus1,clus2
 
-Connect to one or more clusters that are specified in the config 
+Connect to one or more clusters that are specified in the config
 
 ### -r, --rank
 
@@ -154,12 +158,12 @@ Connect to the machines a, b and c
 
 ### -t, --tab-split
 
-Split servers/clusters into tabs, grouping arguments. 
+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. 
+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
@@ -172,7 +176,7 @@ Set extra ssh parameters in the form -Xk=v. For example:
 
     i2cssh -Xi=myidentity.pem
 
-will result in 
+will result in
 
     ssh -i myidentity.pem
 
@@ -191,9 +195,9 @@ will result in
 
 ## Contributing to i2cssh
 
-I know that i2cssh doesn't have all the functionality of csshX, but either let me know what you really need or 
+I know that i2cssh doesn't have all the functionality of csshX, but either let me know what you really need or
 fork, hack and create a pull request.
- 
+
  * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
  * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
  * Fork the project
@@ -206,4 +210,3 @@ fork, hack and create a pull request.
 
 Copyright (c) 2011-2012 Wouter de Bie. See LICENSE.txt for
 further details.
-

data/VERSION

@@ -1 +1 @@
-1.16.0
+2.0.0

data/bin/i2cssh

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
-require 'i2cssh'
+require_relative '../lib/i2cssh'
 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)
-    c.each do |clus| 
+    c.each do |clus|
 
-        if clus =~ /(.+)@(.+)/ 
+        if clus =~ /(.+)@(.+)/
             login_from_cli = $1
             clus = $2
         end
@@ -20,7 +20,7 @@ def get_hosts(c)
         if cluster
             set_options(cluster, login_from_cli)
 
-            if @i2_options.last[:login] 
+            if @i2_options.last[:login]
                 @servers << cluster["hosts"].map{|h| "#{@i2_options.last[:login]}@#{h}"}
             else
                 @servers << cluster["hosts"]
@@ -30,18 +30,18 @@ def get_hosts(c)
             exit 1
         end
     end
-    
+
 end
 
 def set_options(config_hash, login_override=nil)
-    if config_hash["columns"] and config_hash["rows"] 
+    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 
+
+    if @i2_options.size == 0
         @i2_options << {}
-    else 
+    else
         # The first member includes the default options from the conf file
         @i2_options << @i2_options.first.clone
     end
@@ -49,14 +49,14 @@ def set_options(config_hash, login_override=nil)
     [:broadcast, :profile, :rank, :iterm2, :login, :columns, :rows, :sleep, :direction, :itermname].each do |p|
         @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? 
+    if config_hash["environment"]
+        if @ssh_environment.empty?
             @ssh_environment << {}
-        else 
+        else
             # We have some global env so copy it
             @ssh_environment << @ssh_environment.first.clone
         end
@@ -68,11 +68,11 @@ def set_options(config_hash, login_override=nil)
 
 end
 
-if File.exists?(@config_file) 
+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 
+    if config_hash["version"] && config_hash["version"].to_i >= 2
         set_options(config_hash)
         @clusters = config_hash["clusters"]
     else
@@ -88,7 +88,7 @@ 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. 
+    # Check if we have a cluster.
     opts.on '-c', '--clusters clus1,clus2', Array,
         'Comma-separated list of clusters specified in ~/.i2csshrc' do |c|
         get_hosts(c)
@@ -97,7 +97,7 @@ optparse = OptionParser.new do |opts|
 
     opts.on '-m', '--machines a,b,c', Array,
         'Comma-separated list of hosts' do |h|
-        
+
         # Add to servers array and get a clone of default options
         @servers << h
         @i2_options << @i2_options.first.clone
@@ -121,12 +121,12 @@ optparse = OptionParser.new do |opts|
     end
 
     opts.on '-t', '--tab-split',
-            'Split servers/clusters into tabs (group arguments)' do 
+            '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 
+            'Split servers/clusters into tabs (don\'t group arguments)' do
         opts_from_cmdline[:tabs] = true
         opts_from_cmdline[:tabs_nogroup] = true
     end
@@ -142,7 +142,7 @@ optparse = OptionParser.new do |opts|
     opts.on '-l', '--login LOGIN',
         'SSH login name' do |u|
         opts_from_cmdline[:login] = u
-        
+
     end
 
     opts.on '-e', '--environment KEY=VAL',
@@ -208,7 +208,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) 
+        unless ["row", "column"].include?(d)
             puts "ERROR: -d requires 'row' or 'column'"
             puts optparse.help
             exit 1
@@ -228,19 +228,19 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
-if opts_from_cmdline[:tabs] 
+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 
+if ARGV.length == 1
     c = [ARGV[0]]
     get_hosts(c)
 
 # Otherwise we have a list of hosts
-elsif ARGV.length > 1 
-    if opts_from_cmdline[:tabs_nogroup] 
+elsif ARGV.length > 1
+    if opts_from_cmdline[:tabs_nogroup]
         ARGV.each do |serv|
             @servers << [serv]
                 @i2_options << @i2_options.first.clone
@@ -249,7 +249,7 @@ elsif ARGV.length > 1
                 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
@@ -268,17 +268,17 @@ if @i2_options.size > @servers.size
     @i2_options.shift
 end
 
-if @ssh_environment.size > @servers.size 
+if @ssh_environment.size > @servers.size
     @ssh_environment.shift
 end
 
 
-@i2_options.each do |opt| 
+@i2_options.each do |opt|
     opt.merge!(opts_from_cmdline)
 end
 
-@i2_options.each_with_index do |opt, i| 
-    if opt[:login] 
+@i2_options.each_with_index do |opt, i|
+    if opt[:login]
         @servers[i] = @servers[i].map{|h| "#{opt[:login]}@#{h.gsub(/.+@/,'')}"}
     end
     if opt[:gateway]

data/i2cssh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "i2cssh"
-  s.version = "1.16.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]

data/lib/i2cssh.rb

@@ -7,23 +7,18 @@ class I2Cssh
         @servers            = servers
         @ssh_environment    = ssh_environment
 
-        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?
 
         @sys_events = Appscript.app.by_name('System Events')
-        @iterm = Appscript.app.by_name(app_name)
+        @iterm = Appscript.app.by_name("iTerm")
 
-        @pane_menu = @sys_events.processes[app_name].menu_bars[1].menu_bar_items["Window"].menus["Window"].menu_items["Select Split Pane"].menus["Select Split Pane"]
-        @shell_menu = @sys_events.processes[app_name].menu_bars[1].menu_bar_items["Shell"].menus["Shell"]
-        @term = @iterm.make(:new => :terminal)
+        @pane_menu = @sys_events.processes["iTerm2"].menu_bars[1].menu_bar_items["Window"].menus["Window"].menu_items["Select Split Pane"].menus["Select Split Pane"]
+        @shell_menu = @sys_events.processes["iTerm2"].menu_bars[1].menu_bar_items["Shell"].menus["Shell"]
 
         @profile = i2_options.first[:profile] || "Default"
 
-        @term.launch_(:session => "Default Session")
-        
-        maximize(app_name) if i2_options.first[:fullscreen]
-
+        @iterm.create_window_with_profile(@profile, :command => "/usr/bin/env bash -l")
+        @window = @iterm.current_window
 
         while !@servers.empty? do
             compute_geometry
@@ -35,11 +30,12 @@ class I2Cssh
             @ssh_environment.shift
 
             if !@servers.empty?  && i2_options.first[:tabs] then
-                # By default, a new session = a new tab
-                @term.launch_(:session => "Default Session")
+                # @iterm.create_tab(@profile)
+                @window.create_tab_with_default_profile()
+                @session_index = 0
             end
         end
-        @term.select(@term.sessions[1])
+        @window.select(@window.tabs[1])
     end
 
     private
@@ -55,13 +51,6 @@ class I2Cssh
     end
 
     def compute_geometry
-        # 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
@@ -95,26 +84,18 @@ class I2Cssh
         up = @pane_menu.menu_items["Select Pane Above"]
         down = @pane_menu.menu_items["Select Pane Below"]
 
-
-        begin
-            split_vert = @shell_menu.menu_items["Split Vertically"]
-            split_hori = @shell_menu.menu_items["Split Horizontally"]
-            split_vert.get
-            split_hori.get
-        rescue
-            split_vert = @shell_menu.menu_items["Split Vertically with Current Profile"]
-            split_hori = @shell_menu.menu_items["Split Horizontally with Current Profile"]
-        end
+        split_vert = lambda { @window.current_session.split_vertically_with_same_profile }
+        split_hori = lambda { @window.current_session.split_horizontally_with_same_profile }
 
         splitmap = {
-            :column => {0 => split_vert, 1 => left, 2 => split_hori, 3=> right, :x => @columns, :y => @rows}, 
+            :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.first[:direction]]
 
         first = true
         2.upto splitconfig[:x] do
-            splitconfig[0].click
+            splitconfig[0].call
         end
         2.upto splitconfig[:y] do
             1.upto splitconfig[:x] do
@@ -122,7 +103,7 @@ class I2Cssh
                 first = false
             end
             splitconfig[:x].times do |x|
-                splitconfig[2].click
+                splitconfig[2].call
                 splitconfig[3].click
             end
         end
@@ -138,8 +119,10 @@ class I2Cssh
         old_size = 0
 
         1.upto(@rows*@columns) do |i|
-            @term.sessions[@session_index + i].write :text => "/usr/bin/env bash -l"
-            
+            tab = @window.current_tab
+            session = tab.sessions[i]
+            session.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 && !@i2_options.first[:tabs]
                 old_size = @servers.first.size
@@ -164,18 +147,19 @@ class I2Cssh
 
                 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('; ')}"
+                    session.write :text => "#{@ssh_environment.first.map{|k,v| "export #{k}=#{v}"}.join('; ')}"
                 end
                 if @i2_options.first[:sleep] then
                     sleep @i2_options.first[:sleep] * i
                 end
-                @term.sessions[@session_index + i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server} ; exit"
+
+                session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
             else
-                
-                @term.sessions[@session_index + i].write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
+
+                session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
                 sleep 0.3
-                @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"
+                session.foreground_color.set ([65535,0,0])
+                session.write :text => "stty -isig -icanon -echo && echo -e '#{"\n"*100}UNUSED' && cat > /dev/null"
             end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2cssh
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Wouter de Bie