i2cssh 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/i2cssh

@@ -10,10 +10,12 @@ optparse = OptionParser.new do |opts|
   options[:debug] = false
   options[:fullscreen] = false
   opts.on('-d', '--debug', "Start RIPL after creating terminals") { options[:debug] = true }
-  opts.on('-f', '--file FILE', "Cluster file") { |f| options[:file] = f }
+  opts.on('-A', '--forward-agent', "Enable SSH agent forwarding") { options[:forward] = true }
+  opts.on('-f', '--file FILE', "Cluster file (one hostname per line)") { |f| options[:file] = f }
   opts.on('-F', '--fullscreen', "Fullscreen") { options[:fullscreen] = true }
-  opts.on('-u', '--username USERNAME', "SSH username") { |u| options[:username] = u }
+  opts.on('-l', '--login LOGIN', "SSH login name") { |u| options[:login] = u }
   opts.on('-c', '--cluster CLUSTERNAME', "Name of the cluster specified in ~/.i2csshrc") { |c| options[:cluster] = c }
+  opts.on('-m', '--machines a,b,c', Array, "Comma-separated list of hosts") { |h| options[:hosts] = h }
   opts.on('-C', '--columns COLUMNS', "Amount of columns (rows will be calculated)") { |c| options[:columns] = c }
   opts.on('-R', '--rows ROWS', "Amount of rows (columns will be calculated)") { |r| options[:rows] = r }
 #  opts.on('-s', '--session SESSIONNAME', "Name of an iTerm2 session") { |s| options[:session_name] = s }
@@ -21,13 +23,13 @@ end
 
 optparse.parse!
 
-unless options[:file] || options[:cluster] then
+unless options[:file] || options[:cluster] || options[:hosts] then
   puts optparse.help
   exit
 end
 
-if options[:file]  && options[:cluster] then
-  puts "ERROR: -f and -c can't be used at the same time"
+if [ options[:file], options[:cluster], options[:hosts] ].compact.length > 1 then
+  puts "ERROR: neither -f, -c or -h can be combined"
   puts optparse.help
   exit
 end
@@ -38,7 +40,9 @@ if options[:columns]  && options[:rows] then
   exit
 end
 
-ssh_prefix = "ssh " + (options[:username] ? "#{options[:username]}@" : "")
+ssh_prefix = "ssh " +
+    (options[:forward] ? "-A " : "") +
+    (options[:login] ? "-l #{options[:login]} " : "")
 
 rows = options[:rows].to_i if options[:rows]
 columns = options[:columns].to_i if options[:columns]
@@ -50,6 +54,8 @@ elsif options[:cluster] then
   require 'yaml'
   config_hash = YAML.load(File.read(File.expand_path("~/.i2csshrc")))
   servers = config_hash["clusters"][options[:cluster]]
+elsif options[:hosts] then
+  servers = options[:hosts]
 end
 
 count = servers.size

data/i2cssh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i2cssh}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-07-25}
   s.default_executable = %q{i2cssh}
   s.description = %q{csshX like cluster ssh using iTerm2 panes}
   s.email = %q{wouter@evenflow.se}
@@ -35,13 +35,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/wouterdebie/i2cssh}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{csshX like cluster ssh using iTerm2 panes}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: i2cssh
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -15,101 +14,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +02:00
+date: 2011-07-25 00:00:00 +02:00
 default_executable: i2cssh
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  name: bundler
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: jeweler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 6
         - 2
         version: 1.6.2
-  name: jeweler
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  name: rcov
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  name: shoulda
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: shoulda
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  name: rb-appscript
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 6
         - 1
         version: 0.6.1
-  name: rb-appscript
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  name: ripl
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 4
         - 1
         version: 0.4.1
-  name: ripl
-  version_requirements: *id006
+  requirement: *id006
 description: csshX like cluster ssh using iTerm2 panes
 email: wouter@evenflow.se
 executables: 
@@ -142,27 +129,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: csshX like cluster ssh using iTerm2 panes