ssh-copy-id.rb 0.1.0 → 0.1.1

data/lib/ssh-copy-id.rb

@@ -43,7 +43,7 @@ module SSHCopyID
   def self.execute options, ask_password
     identity_file = options[:identity] || DEFAULT_IDENTITY_FILE
     identity = File.readlines(File.expand_path identity_file).first.chomp
-    password = options[:password]
+    passwords = {}
     output = options[:output] || Class.new { def method_missing *args; end }.new
 
     options[:hosts].each do |host|
@@ -51,13 +51,21 @@ module SSHCopyID
       user, pass = user.split(':') if user
       user ||= options[:username] || ENV['USER']
       output.print "#{user}@#{host}: "
-      if pass.nil? && password.nil? && (ask_password || options.has_key?(:password))
-        password = HighLine.new.ask($/ + "Password: ") { |q| q.echo = '*' }
-      end
-      pass ||= password
+      password =
+        if pass
+          pass
+        elsif options[:password]
+          options[:password]
+        elsif passwords[user]
+          passwords[user]
+        elsif ask_password || options.has_key?(:password)
+          passwords[user] = HighLine.new.ask($/ + "Password: ") { |q| q.echo = '*' }
+        else
+          nil
+        end
 
       host, port = host.split(':')
-      Net::SSH.start(host, user, :port => port, :password => pass) do |ssh|
+      Net::SSH.start(host, user, :port => port, :password => password) do |ssh|
         result = ssh.exec!(yield identity)
         output.puts result
       end

data/lib/ssh-copy-id/version.rb

@@ -1,3 +1,3 @@
 module SSHCopyID
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssh-copy-id.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -83,10 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ssh-copy-id in Ruby. Supports copying to multiple servers.
 test_files:
 - test/bin_helper.rb
-has_rdoc: