tinyssh 0.0.5 → 0.0.6

data/bin/tinyssh

@@ -35,12 +35,7 @@ def main(options)
 
     HOST.each_with_index do |host, index|
       T << Thread.new {
-        session = Net::SSH.conn(host, options.user,
-                                :port => options.port,
-                                :password => password,
-                                :keys => options.keys,
-                                :timeout => options.timeout,
-                                :passphrase => passphrase.chomp)
+        session = Net::SSH.conn(host, options.user, :port => options.port, :password => password, :keys => options.keys, :timeout => options.timeout, :passphrase => passphrase.chomp)
 
         if session.class == String
           OUTPUT[index] = session % host
@@ -60,7 +55,7 @@ def main(options)
     end
 
     OUTPUT.keys.sort.each do |k|
-      print OUTPUT[k]
+      puts OUTPUT[k]
     end
 
     if options.output_file != nil

data/lib/tinyssh.rb

@@ -10,16 +10,15 @@ module Net::SSH
     begin
       return Net::SSH.start(*options)
     rescue Timeout::Error
-      return "\n#{OUTPUT_TITLE}\nHost : %s [ " + "Connecting Timeout".red + " ] !\n"
+      return "\n#{OUTPUT_TITLE}\nHost : %s [ #{"Connecting Timeout".red} ] !\n"
     rescue Errno::EHOSTUNREACH
-      return "\n#{OUTPUT_TITLE}\nHost : %s [ " + "Unreachable".red + " ] !\n"
+      return "\n#{OUTPUT_TITLE}\nHost : %s [ #{"Unreachable".red} ] !\n"
     rescue Errno::ECONNREFUSED
-      return "\n#{OUTPUT_TITLE}\nHost : %s [ " + "Connection Refused".red + " ] !\n"
+      return "\n#{OUTPUT_TITLE}\nHost : %s [ #{"Connection Refused".red} ] !\n"
     rescue Net::SSH::AuthenticationFailed
-      return "\n#{OUTPUT_TITLE}\nHost : %s [ " + "Authentication Failure".red + " ] !\n"
-    rescue => e
-      puts e
-      return "\n#{OUTPUT_TITLE}\nHost : %s [ " + "Name or Server not know".red + " ] !\n"
+      return "\n#{OUTPUT_TITLE}\nHost : %s [ #{"Authentication Failure".red} ] !\n"
+    rescue
+      return "\n#{OUTPUT_TITLE}\nHost : %s [ #{"Name or Server not know".red} ] !\n"
     end
   end
 end
@@ -27,23 +26,23 @@ end
 class Net::SSH::Connection::Session
   def run(cmd)
     output = self.exec!(cmd)
-    return "\n#{output}#{OUTPUT_TITLE}\nExecute \"#{cmd}\" at #{host}: [ ", "OK".green, " ]\n"
+    "\n#{output}#{OUTPUT_TITLE}\nExecute \"#{cmd}\" at #{host}: [ #{"OK".green} ]\n"
   rescue
-    return "\n#{OUTPUT_TITLE}\nExecute \"#{cmd}\" at #{host}: [ ", "FAIL".red, " ] !\n"
+    "\n#{OUTPUT_TITLE}\nExecute \"#{cmd}\" at #{host}: [ #{"FAIL".red} ] !\n"
   end
 
   def up(src, dst)
     self.scp.upload!(src, dst, :recursive => true)
-    return "\n#{OUTPUT_TITLE}\nUpload #{host}:#{src} to #{dst}: [ ", "OK".green, " ] !\n"
+    "\n#{OUTPUT_TITLE}\nUpload #{host}:#{src} to #{dst}: [ #{"OK".green} ] !\n"
   rescue
-    return "\n#{OUTPUT_TITLE}\nUpload #{host}:#{src} to #{dst}: [ ", "FAIL".red, " ] !\n"
+    "\n#{OUTPUT_TITLE}\nUpload #{host}:#{src} to #{dst}: [ #{"FAIL".red} ] !\n"
   end
 
   def dl(src, dst)
     self.scp.download!(src, dst, :recursive => true)
-    return "\n#{OUTPUT_TITLE}\nDownload #{host}:#{src} to #{dst}: [ ", "OK".green, " ] !\n"
+    "\n#{OUTPUT_TITLE}\nDownload #{host}:#{src} to #{dst}: [ #{"OK".green} ] !\n"
   rescue
-    return "\n#{OUTPUT_TITLE}\nDownload #{host}:#{src} to #{dst}: [ ", "FAIL".red, " ] !\n"
+    "\n#{OUTPUT_TITLE}\nDownload #{host}:#{src} to #{dst}: [ #{"FAIL".red} ] !\n"
   end
 end
 

data/lib/tinysshoptparse.rb

@@ -18,37 +18,37 @@ class TinysshOptparse
       opts.separator ""
       opts.separator "Specific options:"
 
-      opts.on("-u", "--user [user]", 
+      opts.on("-u", "--user [user]",
               "Specify a user for accessing remote hosts.(default: root)") do |user|
         options.user = user
       end
 
-      opts.on("-p", "--port [port]", 
-              "Port to connect to on the remote host(default: 59878)") do |port|
+      opts.on("-p", "--port [port]",
+              "Port to connect to on the remote host(default: 22)") do |port|
         options.port = port
       end
 
-      opts.on("-t", "--timeout [time]", 
+      opts.on("-t", "--timeout [time]",
               "Set the command timeout to seconds(default: 0)") do |timeout|
         options.timeout = timeout.to_i
       end
 
-      opts.on("-l", "--list-file [file]", 
+      opts.on("-l", "--list-file [file]",
               "File containing a list of hosts' IP Address") do |file|
         options.host_file = file
       end
 
-      opts.on("-o", "--output-file [file]", 
+      opts.on("-o", "--output-file [file]",
               "Output result to log file") do |output_file|
         options.output_file = output_file
       end
 
-      opts.on("-i", "--identity-keys [keys]", 
+      opts.on("-i", "--identity-keys [keys]",
               "identity (private) keys for authentication(default: /root/.ssh/id_rsa)") do |keys|
         options.keys = keys
       end
 
-      opts.on("-n", "--number-of-thread [number]", 
+      opts.on("-n", "--number-of-thread [number]",
               "Specify the number of concurrent jobs for each execution") do |num|
         options.num = num
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tinyssh
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - William Herry
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tiny SSH