RubyGems - i2c2 - Versions diffs - 1.0.0.beta4 → 1.0.0.beta5 - Mend

i2c2 1.0.0.beta4 → 1.0.0.beta5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7038fe5ca1884acbd69308cc5d4b80bdca193a50e3dac700ed97f13349212fcb
-  data.tar.gz: 912bde1276d5de58bd61321133df61c36b6bc1e5a89fe0f69826adaf9e3e1f32
+  metadata.gz: 0e5df5c0abdd9207ac837daa324f76e909c75d68d910e38a41cd74b8a5b9f831
+  data.tar.gz: 44ccc3cc3b3352b202803afe055af829e9a377b7f96781910463f06e76ccffe5
 SHA512:
-  metadata.gz: a73164c3d05331b5e3ce4500ae226388a5dc113b12b541619ff7d8637584b8b4ffc99223b3d6c161d63d706c984af769b3a4e5b6bbfb9de719f582407bbb57d6
-  data.tar.gz: 6583acdc831c67a407fa237d6b7c2900f1653b7a9dc8b43713f9633d0011ed4b93e5685a7a146bb06bba27343b6b8367a7c16662ab64fe85d58d77dbd347b437
+  metadata.gz: 26e238fc897f8319bcafceda6ea485720c798c1e8a504e216abe2900375a8420f64918d4a366e9aac38ff6626497116b971e27cd6d2be5bd00e9b6177921432d
+  data.tar.gz: afefcd2de29436d6d180e406ed06ddf952f7fdcbc3ba2f76ca6357ae89258b83fc2b48c70454785123559e3e91346f95bcec673d583b34e5376eb2ecb7f6282d

data/CHANGELOG.md CHANGED

@@ -2,6 +2,11 @@
 ## [Unreleased]
+## [1.0.0.beta5] 2020-09-10
+### Changed
+- Remove support for connecting to cluster/hosts without using the explicit option
+- Change default direction from column to row
 ## [1.0.0.beta4] 2019-05-15
 ### Changed
 - Fix problem after config file convertion to version 2
@@ -22,4 +27,4 @@
 - 100% compatible with i2cssh *branch master* at the time of fork (commit: ac0bf90), including auto complete config file name i2cssh-autocomplete.bash
 ## [0.99.0] - 2019-05-11
-- 100% compatible with i2cssh *2.2.0 (latest version)*, including the config file ~/.i2csshrc
+- 100% compatible with i2cssh *2.2.0 (latest release)*, including the config file ~/.i2csshrc

data/Gemfile CHANGED

@@ -8,8 +8,5 @@ gem "rb-scpt", "~> 1.0.1"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "2.1.2"
-  gem "shoulda"
-  gem "builder"
+  gem "jeweler"
 end

data/Gemfile.lock CHANGED

@@ -1,65 +1,60 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.2)
+    addressable (2.4.0)
+    builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.5.0)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.6.0)
-    highline (2.0.2)
-    jeweler (2.1.2)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (~> 0.11.0)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-      semver
-    jwt (1.5.6)
-    mini_portile2 (2.1.0)
-    multi_json (1.13.1)
+      semver2
+    jwt (2.2.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    public_suffix (2.0.5)
-    rack (1.6.11)
-    rake (12.3.2)
+    psych (3.2.0)
+    rack (2.2.3)
+    rake (13.0.1)
     rb-scpt (1.0.3)
-    rdoc (5.1.0)
-    semver (1.0.1)
-    shoulda (2.11.3)
+    rchardet (1.8.0)
+    rdoc (6.2.1)
+    semver2 (3.4.2)
     thread_safe (0.3.6)
 PLATFORMS
   ruby
 DEPENDENCIES
-  builder
-  bundler (>= 1.0.0)
-  jeweler (= 2.1.2)
+  jeweler
   rb-scpt (~> 1.0.1)
-  shoulda
-BUNDLED WITH
-   1.17.3

data/README.md CHANGED

@@ -18,7 +18,7 @@ When using iTerm2 < 2.9, install old i2cssh version 1.16.0:
 ## Migrate from i2cssh
-If you have used i2cssh and want to migrate, you can do it painless using i2c2 version 0.99.0 which is 100% compatible with i2cssh 2.2.0 (latest version),
+If you have used i2cssh and want to migrate, you can do it painless using i2c2 version 0.99.0 which is 100% compatible with i2cssh 2.2.0 (latest release),
 including the config file ~/.i2csshrc.
 Version 0.99.1 is compatible with i2cssh branch master at the time of fork (commit: ac0bf90), including auto complete config file name i2cssh-autocomplete.bash.
@@ -46,19 +46,8 @@ Version 0.99.1 is compatible with i2cssh branch master at the time of fork (comm
     -d, --direction DIRECTION        Direction that new sessions are created (default: column)
     -X, --extra EXTRA_PARAM          Additional ssh parameters (e.g. -Xi=myidentity.pem)
-i2c2 will assume you want to connect to a cluster when only one host is given.
 For `-c` and `-m` options, the format `username@cluster` or `username@host` can be used.
-The following commands are exactly the same, however, they might serve different purposes:
-    $ i2c2 -m user1@host1,user2@host2
-    $ i2c2 user1@host1 user2@host2
-You can combine these options and use them multiple times:
-    $ i2c2 -m user1@host1,user2@host2 -m user3@host3 user4@host4 user5@host5
 Using the `-l` option will override all usernames:
     $ i2c2 -l foo user1@host1 user2@host2
@@ -79,12 +68,6 @@ The `i2csshrc` file is a YAML formatted file that contains the following structu
           - host1
           - host2
-## Autocomplete
-To allow autocomplete, add the following to your .bash_profile, .bashrc or .profile
-    $ source [path to ./extras/i2cssh-autocomplete.bash]
 ## Optional Parameters
 They can be used globally or per cluster and include:
@@ -113,6 +96,12 @@ The following precedence is used:
 Make sure the config file is valid YAML (e.g. use spaces instead of tabs)
+## Autocomplete
+To allow autocomplete, add the following to your .bash_profile, .bashrc or .profile
+    $ source [path to ./extras/i2cssh-autocomplete.bash]
 ## Options
 ### -A, --forward-agent

data/Rakefile CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'rubygems'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,13 +9,14 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
+require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "i2c2"
-  gem.homepage = "http://github.com/dx7/i2c2"
+  gem.homepage = "https://github.com/dx7/i2c2"
   gem.license = "MIT"
   gem.summary = %Q{csshX like - cluster ssh using iTerm2 panes - based on i2cssh}
   gem.description = %Q{csshX like - cluster ssh using iTerm2 panes - based on i2cssh}

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.0.0.~~beta4~~
1	+ 1.0.0.beta5

data/bin/i2c2 CHANGED

@@ -4,81 +4,66 @@ require 'optparse'
 require_relative '../lib/i2c2'
 require 'yaml'
-@config_file = File.expand_path "~/.i2csshrc"
+@config_file = File.expand_path '~/.i2csshrc'
 @i2_options, ssh_options, @servers, @clusters, @ssh_environment, opts_from_cmdline = [], [], [], {}, [], {}
-def debug_vars
-  p '-----------------------------'
-  p '@i2_options'
-  p @i2_options
-  p '@servers'
-  p @servers
-  p '@clusters'
-  p @clusters
-  p '@ssh_environment'
-  p @ssh_environment
-  p '-----------------------------'
-end
 def get_hosts(c)
-    c.each do |clus|
-        if clus =~ /(.+)@(.+)/
-            login_from_cli = $1
-            clus = $2
-        end
-        cluster = @clusters[clus]
-        if cluster
-            set_options(cluster, login_from_cli)
-            if @i2_options.last[:login]
-                @servers << cluster["hosts"].map{|h| "#{@i2_options.last[:login]}@#{h}"}
-            else
-                @servers << cluster["hosts"]
-            end
-        else
-            puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
-            exit 1
-        end
+  c.each do |clus|
+    if clus =~ /(.+)@(.+)/
+      login_from_cli = $1
+      clus = $2
     end
+    cluster = @clusters[clus]
+    if cluster
+      set_options(cluster, login_from_cli)
+      if @i2_options.last[:login]
+        @servers << cluster['hosts'].map{|h| "#{@i2_options.last[:login]}@#{h}"}
+      else
+        @servers << cluster['hosts']
+      end
+    else
+      puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
+      exit 1
+    end
+  end
 end
 def set_options(config_hash, login_override=nil)
-    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 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
+  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, :shell, :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
+  [:broadcast, :profile, :rank, :iterm2, :login, :columns, :rows, :sleep, :shell, :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?
-            @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)})
+  @i2_options.last[:login] = login_override if login_override
+  @i2_options.last[:direction] ||= :row
+  @i2_options.last[:direction] = @i2_options.last[:direction].to_sym
+  if config_hash['environment']
+    if @ssh_environment.empty?
+      @ssh_environment << {}
     else
-        @ssh_environment << {}
+      # 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)})
+  else
+    @ssh_environment << {}
+  end
 end
 if File.exists?(@config_file)
@@ -91,224 +76,203 @@ if File.exists?(@config_file)
   # Read config and set defaults from config
   set_options(config_hash)
-  @clusters = config_hash["clusters"]
+  @clusters = config_hash['clusters']
 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', '--clusters clus1,clus2', Array,
-        'Comma-separated list of clusters specified in ~/.i2csshrc' do |c|
-        get_hosts(c)
-    end
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] [(username@host [username@host] | username@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)
+  end
-    opts.on '-m', '--machines a,b,c', Array,
-        'Comma-separated list of hosts' do |h|
+  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
-        if @ssh_environment.empty?
-            @ssh_environment << {}
-        else
-            @ssh_environment << @ssh_environment.first.clone
-        end
+    # 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")
-        @i2_options << @i2_options.first.clone
-        if @ssh_environment.empty?
-            @ssh_environment << {}
-        else
-            @ssh_environment << @ssh_environment.first.clone
-        end
+  opts.on '-f', '--file FILE',
+    'Cluster file (one hostname per line)' do |f|
+    @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',
+    'Split servers/clusters into tabs (group arguments)' do
+    opts_from_cmdline[:tabs] = true
-    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
+    puts 'Disabling broadcast for tab split mode...'
+    opts_from_cmdline[:broadcast] = false
+  end
-    # Command line options override config file
+  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
-    # SSH options
-    opts.on '-A', '--forward-agent',
-        'Enable SSH agent forwarding' do
-        ssh_options << '-A'
-    end
+    puts 'Disabling broadcast for tab split mode...'
+    opts_from_cmdline[:broadcast] = false
+  end
-    opts.on '-l', '--login LOGIN',
-        'SSH login name' do |u|
-        opts_from_cmdline[:login] = u
+  # Command line options override config file
-    end
+  # SSH options
+  opts.on '-A', '--forward-agent',
+    'Enable SSH agent forwarding' do
+    ssh_options << '-A'
+  end
-    opts.on '-e', '--environment KEY=VAL',
-        'Send environment vars (comma-separated list, need to start with LC_)' do |e|
-        #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 '-l', '--login LOGIN',
+    'SSH login name' do |u|
+    opts_from_cmdline[:login] = u
+  end
-    opts.on '-r', '--rank',
-        'Send LC_RANK with the host number as environment variable' do
-        opts_from_cmdline[:rank] = true
-    end
+  opts.on '-e', '--environment KEY=VAL',
+    'Send environment vars (comma-separated list, need to start with LC_)' do |e|
+    #Overwrite global ssh environment from config file
+    @ssh_environment[0] =  e.split(',').inject({}) {|m, x| key, val = x.split('='); m[key] = val; m}
+  end
-    # iTerm2 options
-    opts.on '-F', '--fullscreen',
-        'Make the window fullscreen' do
-        opts_from_cmdline[:fullscreen] = true
-    end
+  opts.on '-r', '--rank',
+    'Send LC_RANK with the host number as environment variable' do
+    opts_from_cmdline[:rank] = true
+  end
-    opts.on '-C', '--columns COLUMNS', Integer,
-        'Number of columns (rows will be calculated)' do |c|
-        if opts_from_cmdline[:rows]
-            puts "ERROR: -C and -R can't be used at the same time"
-            puts optparse.help
-            exit 1
-        else
-            opts_from_cmdline[:columns] = c
-        end
-    end
-    opts.on '-R', '--rows ROWS', Integer,
-        'Number of rows (columns will be calculated)' do |r|
-        if opts_from_cmdline[:columns]
-            puts "ERROR: -C and -R can't be used at the same time"
-            puts optparse.help
-            exit 1
-        else
-            opts_from_cmdline[:rows] = r
-        end
-    end
-    opts.on '-b', '--broadcast',
-        'Start with broadcast input (DANGEROUS!)' do
-        opts_from_cmdline[:broadcast] = true
-    end
-    opts.on '-nb', '--nobroadcast',
-        'Disable broadcast' do
-        opts_from_cmdline[:broadcast] = false
-    end
-    opts.on '-p', '--profile PROFILE',
-        'Name of the iTerm2 profile (default: Default)' do |p|
-        opts_from_cmdline[:profile] = p
-    end
-    opts.on "-2", '--iterm2',
-        'Use iTerm2 instead of iTerm' do
-        opts_from_cmdline[:iterm2] = true
-    end
-    opts.on "-i", '--itermname NAME', String,
-        'Name of the application to use (default: iTerm)' do |i|
-        opts_from_cmdline[:itermname] = i
-    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 '-S', '--shell SHELL', String,
-        'Shell to use when spawning the SSH sessions' do |s|
-        opts_from_cmdline[:shell] = s
-    end
-    opts.on "-d", '--direction DIRECTION', String,
-        'Direction that new sessions are created (default: column)' do |d|
-        unless ["row", "column"].include?(d)
-            puts "ERROR: -d requires 'row' or 'column'"
-            puts optparse.help
-            exit 1
-        end
-        opts_from_cmdline[:direction] = d.to_sym
-    end
-    opts.on '-X', '--extra EXTRA_PARAM', String,
-        'Additional ssh parameters (e.g. -Xi=myidentity.pem)' do |x|
+  # iTerm2 options
+  opts.on '-F', '--fullscreen',
+    'Make the window fullscreen' do
+    opts_from_cmdline[:fullscreen] = true
+  end
-         ssh_options << "-" + x.split("=").join(" ")
+  opts.on '-C', '--columns COLUMNS', Integer,
+    'Number of columns (rows will be calculated)' do |c|
+    if opts_from_cmdline[:rows]
+      puts 'ERROR: -C and -R can\'t be used at the same time'
+      puts optparse.help
+      exit 1
+    else
+      opts_from_cmdline[:columns] = c
     end
-    opts.on '-g', '--gateway HOST', String,
-        'Multihop SSH connection gateway string (e.g. username@gateway) - usually used with -A' do |g|
-            # ssh_gateway = g
-            opts_from_cmdline[:gateway] = g
+  end
+  opts.on '-R', '--rows ROWS', Integer,
+    'Number of rows (columns will be calculated)' do |r|
+    if opts_from_cmdline[:columns]
+      puts 'ERROR: -C and -R can\'t be used at the same time'
+      puts optparse.help
+      exit 1
+    else
+      opts_from_cmdline[:rows] = r
     end
-end
-optparse.parse!
+  end
-if opts_from_cmdline[:tabs]
-    puts 'Disabling broadcast for tab split mode...'
+  opts.on '-b', '--broadcast',
+    'Start with broadcast input (DANGEROUS!)' do
+    opts_from_cmdline[:broadcast] = true
+  end
+  opts.on '-nb', '--nobroadcast',
+    'Disable broadcast' do
     opts_from_cmdline[:broadcast] = false
-end
+  end
-# One argument = one cluster
-if ARGV.length == 1
-    c = [ARGV[0]]
-    get_hosts(c)
+  opts.on '-p', '--profile PROFILE',
+    'Name of the iTerm2 profile (default: Default)' do |p|
+    opts_from_cmdline[:profile] = p
+  end
-# Otherwise we have a list of hosts
-elsif ARGV.length > 1
-    if opts_from_cmdline[:tabs_nogroup]
-        ARGV.each do |serv|
-            @servers << [serv]
-                @i2_options << @i2_options.first.clone
-                if @ssh_environment.empty?
-                    @ssh_environment << {}
-                else
-                    @ssh_environment << @ssh_environment.first.clone
-                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
+  opts.on '-2', '--iterm2',
+    'Use iTerm2 instead of iTerm' do
+    opts_from_cmdline[:iterm2] = true
+  end
+  opts.on '-i', '--itermname NAME', String,
+    'Name of the application to use (default: iTerm)' do |i|
+    opts_from_cmdline[:itermname] = i
+  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 '-S', '--shell SHELL', String,
+    'Shell to use when spawning the SSH sessions' do |s|
+    opts_from_cmdline[:shell] = s
+  end
+  opts.on '-d', '--direction DIRECTION', String,
+    'Direction that new sessions are created (default: row)' do |d|
+    unless ['row', 'column'].include?(d)
+      puts 'ERROR: -d requires \'row\' or \'column\''
+      puts optparse.help
+      exit 1
     end
+    opts_from_cmdline[:direction] = d.to_sym
+  end
+  opts.on '-X', '--extra EXTRA_PARAM', String,
+    'Additional ssh parameters (e.g. -Xi=myidentity.pem)' do |x|
+    ssh_options << '-' + x.split('=').join(' ')
+  end
+  opts.on '-g', '--gateway HOST', String,
+    'Multihop SSH connection gateway string (e.g. username@gateway) - usually used with -A' do |g|
+    # ssh_gateway = g
+    opts_from_cmdline[:gateway] = g
+  end
 end
+optparse.parse!
 # Drop default options
 if @i2_options.size > @servers.size
-    @i2_options.shift
+  @i2_options.shift
 end
 if @ssh_environment.size > @servers.size
-    @ssh_environment.shift
+  @ssh_environment.shift
 end
 @i2_options.each do |opt|
-    opt.merge!(opts_from_cmdline)
+  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
-    if opt[:gateway]
-        puts opt[:gateway]
-        @servers[i] = @servers[i].map{|h| "#{opt[:gateway]} -t ssh #{h}"}
-    end
+  if opt[:login]
+    @servers[i] = @servers[i].map{|h| "#{opt[:login]}@#{h.gsub(/.+@/,'')}"}
+  end
+  if opt[:gateway]
+    puts opt[:gateway]
+    @servers[i] = @servers[i].map{|h| "#{opt[:gateway]} -t ssh #{h}"}
+  end
 end
 if @servers.empty?
-    puts "ERROR: no servers given"
-    puts optparse.help
-    exit
+  puts 'ERROR: no servers given'
+  puts optparse.help
+  exit
 end
 I2c2.new @servers, ssh_options, @i2_options, @ssh_environment

data/i2c2.gemspec CHANGED

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: i2c2 1.0.0.beta4 ruby lib
+# stub: i2c2 1.0.0.beta5 ruby lib
 Gem::Specification.new do |s|
   s.name = "i2c2"
-  s.version = "1.0.0.beta4"
+  s.version = "1.0.0.beta5"
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["dx7", "Wouter de Bie"]
-  s.date = "2019-05-16"
+  s.date = "2019-06-05"
   s.description = "csshX like - cluster ssh using iTerm2 panes - based on i2cssh"
   s.email = "dx7@pm.me"
   s.executables = ["i2c2"]
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".document",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -35,7 +34,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_i2c2.rb"
   ]
-  s.homepage = "http://github.com/dx7/i2c2"
+  s.homepage = "https://github.com/dx7/i2c2"
   s.licenses = ["MIT"]
   s.rubygems_version = "3.0.3"
   s.summary = "csshX like - cluster ssh using iTerm2 panes - based on i2cssh"
@@ -45,23 +44,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rb-scpt>, ["~> 1.0.1"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["= 2.1.2"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<builder>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["= 2.1.2"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rb-scpt>, ["~> 1.0.1"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["= 2.1.2"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/i2c2.rb CHANGED

@@ -1,167 +1,167 @@
 require 'rb-scpt'
 class I2c2
-    def initialize servers, ssh_options, i2_options, ssh_environment
-        @ssh_prefix         = "ssh " + ssh_options.join(' ')
-        @ssh_options        = ssh_options
-        @i2_options         = i2_options.clone
-        @servers            = servers
-        @ssh_environment    = ssh_environment
-        raise Exception.new 'No servers given' if servers.empty?
-        @sys_events = Appscript.app.by_name('System Events')
-        @iterm = Appscript.app.by_name("iTerm")
-        @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"
-        @shell = "/usr/bin/env #{@i2_options.first[:shell] || 'bash'}"
-        @iterm.create_window_with_profile(@profile, :command => "#{@shell} -l")
-        @window = @iterm.current_window
-        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
-            if !@servers.empty?  && i2_options.first[:tabs] then
-                # @iterm.create_tab(@profile)
-                @window.create_tab_with_default_profile()
-                @session_index = 0
-            end
-        end
-        @window.select(@window.tabs[1])
+  def initialize servers, ssh_options, i2_options, ssh_environment
+    @ssh_prefix         = 'ssh ' + ssh_options.join(' ')
+    @ssh_options        = ssh_options
+    @i2_options         = i2_options.clone
+    @servers            = servers
+    @ssh_environment    = ssh_environment
+    raise Exception.new 'No servers given' if servers.empty?
+    @sys_events = Appscript.app.by_name('System Events')
+    @iterm = Appscript.app.by_name('iTerm')
+    @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'
+    @shell = "/usr/bin/env #{@i2_options.first[:shell] || 'bash'}"
+    @iterm.create_window_with_profile(@profile, :command => "#{@shell} -l")
+    @window = @iterm.current_window
+    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
+      if !@servers.empty? && i2_options.first[:tabs]
+        @window.create_tab_with_default_profile
+        @session_index = 0
+      end
     end
+    @window.select(@window.tabs[1])
+  end
-    private
+  private
     def maximize(app_name)
-        begin
-            # OSX >= 10.8 has different behavior for full screen. First try out old behavior.
-            fullscreen_bounds = Appscript.app.by_name('Finder').desktop.window.bounds
-            window = @iterm.windows.get.sort_by{|x| x.id_.get}.last
-            window.bounds.set fullscreen_bounds.get
-        rescue
-            @sys_events.processes[app_name].windows.first.attributes["AXFullScreen"].value.set(true)
-        end
+      begin
+        # OSX >= 10.8 has different behavior for full screen. First try out old behavior.
+        fullscreen_bounds = Appscript.app.by_name('Finder').desktop.window.bounds
+        window = @iterm.windows.get.sort_by{|x| x.id_.get}.last
+        window.bounds.set fullscreen_bounds.get
+      rescue
+        @sys_events.processes[app_name].windows.first.attributes['AXFullScreen'].value.set(true)
+      end
     end
     def compute_geometry
-        # 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
-        elsif @columns then
-            @rows = (count / @columns.to_f).ceil
-        else
-            @columns = Math.sqrt(count).ceil
-            @rows = (count / @columns.to_f).ceil
-        end
-        # 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.first[:fullscreen] = true
+      # 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
+        @columns = (count / @rows.to_f).ceil
+      elsif @columns
+        @rows = (count / @columns.to_f).ceil
+      else
+        @columns = Math.sqrt(count).ceil
+        @rows = (count / @columns.to_f).ceil
+      end
+      # 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
+        @i2_options.first[:fullscreen] = true
+      end
     end
     def split_session
-        left = @pane_menu.menu_items["Select Pane Left"]
-        right = @pane_menu.menu_items["Select Pane Right"]
-        up = @pane_menu.menu_items["Select Pane Above"]
-        down = @pane_menu.menu_items["Select Pane Below"]
-        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},
-            :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].call
+      left = @pane_menu.menu_items['Select Pane Left']
+      right = @pane_menu.menu_items['Select Pane Right']
+      up = @pane_menu.menu_items['Select Pane Above']
+      down = @pane_menu.menu_items['Select Pane Below']
+      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},
+        :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].call
+      end
+      2.upto splitconfig[:y] do
+        1.upto splitconfig[:x] do
+          splitconfig[1].click
+          first = false
         end
-        2.upto splitconfig[:y] do
-            1.upto splitconfig[:x] do
-                splitconfig[1].click
-                first = false
-            end
-            splitconfig[:x].times do |x|
-                splitconfig[2].call
-                splitconfig[3].click
-            end
+        splitconfig[:x].times do |x|
+          splitconfig[2].call
+          splitconfig[3].click
         end
+      end
     end
     def enable_broadcast
-        @sys_events.keystroke "I", :using => :command_down
-        sleep 0.5
-        @sys_events.keystroke "\r"
+      @sys_events.keystroke 'I', :using => :command_down
+      sleep 0.5
+      @sys_events.keystroke "\r"
     end
     def start_ssh
-        old_size = 0
-        1.upto(@rows*@columns) do |i|
-            tab = @window.current_tab
-            session = tab.sessions[i]
-            session.write :text => "#{@shell} -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
-                @servers.shift
-                @i2_options.shift
-                @ssh_environment.shift
-            end
-            if @servers.empty?
-                server = nil
-            else
-                server = @servers.first[i-old_size-1]
-            end
-            if server then
-                send_env = ""
-                if @i2_options.first[:rank] then
-                    @ssh_environment.first['LC_RANK'] = i-1
-                end
-                if !@ssh_environment.empty? && !@ssh_environment.first.empty? then
-                    send_env = "-o SendEnv=#{@ssh_environment.first.keys.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
-                session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
-            else
-                session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
-                sleep 0.3
-                session.foreground_color.set ([65535,0,0])
-                session.write :text => "stty -isig -icanon -echo && echo -e '#{"\n"*100}UNUSED' && cat > /dev/null"
-            end
+      old_size = 0
+      1.upto(@rows*@columns) do |i|
+        tab = @window.current_tab
+        session = tab.sessions[i]
+        session.write :text => "#{@shell} -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
+          @servers.shift
+          @i2_options.shift
+          @ssh_environment.shift
+        end
+        if @servers.empty?
+          server = nil
+        else
+          server = @servers.first[i-old_size-1]
+        end
+        if server
+          send_env = ''
+          if @i2_options.first[:rank]
+            @ssh_environment.first['LC_RANK'] = i-1
+          end
+          if !@ssh_environment.empty? && !@ssh_environment.first.empty?
+            send_env = "-o SendEnv=#{@ssh_environment.first.keys.join(',')}"
+            session.write :text => "#{@ssh_environment.first.map{|k,v| "export #{k}=#{v}"}.join('; ')}"
+          end
+          if @i2_options.first[:sleep]
+            sleep @i2_options.first[:sleep] * i
+          end
+          session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\" && #{@ssh_prefix} #{send_env} #{server}"
+        else
+          session.write :text => "unset HISTFILE && echo -e \"\\033]50;SetProfile=#{@profile}\\a\""
+          sleep 0.3
+          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
 end

metadata CHANGED

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: i2c2
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - dx7
 - Wouter de Bie
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-scpt
@@ -25,50 +25,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,10 +45,10 @@ executables:
 - i2c2
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
-- ".document"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -104,11 +62,11 @@ files:
 - lib/i2c2.rb
 - test/helper.rb
 - test/test_i2c2.rb
-homepage: http://github.com/dx7/i2c2
+homepage: https://github.com/dx7/i2c2
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: csshX like - cluster ssh using iTerm2 panes - based on i2cssh
 test_files: []

data/.document DELETED

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
--
-features/**/*.feature
-LICENSE.txt