fissher 1.0.3 → 1.0.4

data/README.rdoc

@@ -6,17 +6,17 @@ Fissher is a simple utility to run commands on multiple servers, powered by Net:
 === Usage
 
   fissher [flags] [command]:
-  -G Hostgroup       Execute command on all hosts listed in the JSON config for
-                     the specified group.
-  -H Host1,Host2     Execute command on hosts listed on the command line
-  -g jumpbox         Manually specify/override a jump server, if necessary.
-  -s 		   Execute the provided commands with sudo.
-  -u username        Manually specify/override username to connect with.
-  -p                 Use password based authentication, specified via STDIN
-  -c config.json     Manually specify the path to your fissher config file
-  -n num             Number of concurrent connections. Enter 0 for unlimited.
-  -U username	   Specify an alternate user in conjunction with -s
-                   (E.G. -U webmaster)
+    -G Hostgroup       Execute command on all hosts listed in the JSON config for
+                       the specified group.
+    -H Host1,Host2     Execute command on hosts listed on the command line
+    -g jumpbox         Manually specify/override a jump server, if necessary.
+    -s 		       Execute the provided commands with sudo.
+    -u username        Manually specify/override username to connect with.
+    -p                 Use password based authentication, specified via STDIN
+    -c config.json     Manually specify the path to your fissher config file
+    -n num             Number of concurrent connections. Enter 0 for unlimited.
+    -U username	       Specify an alternate user to run the command as. Uses sudo.
+                       (E.G. -U webmaster)
 
 === Installation
 
@@ -24,7 +24,10 @@ Fissher is a simple utility to run commands on multiple servers, powered by Net:
 
 Simply run the following:
 
-  gem install fissher
+  gem install fissher                             
+
+{<img src="https://badge.fury.io/rb/fissher.png" alt="Gem Version" />}[http://badge.fury.io/rb/fissher]
+
 
 ==== Manual
 

data/lib/fissher_base.rb

@@ -13,7 +13,7 @@ class FissherBase
     opts = FissherConf.handle_opts unless !opts.nil?
     abort "No hosts specified! Please use -H or -G!\n" unless !opts[:hostlist].nil?
 
-    Net::SSH::Multi.start(:concurrent_connections => opts[:concurrency]) do |session|
+    Net::SSH::Multi.start(:concurrent_connections => opts[:concurrency], :on_error => :warn) do |session|
       if opts[:gateway]
         session.via opts[:gateway], opts[:user], :password => opts[:password]
       end
@@ -42,7 +42,7 @@ class FissherBase
               end
             end
           end
-        end
+        end 
       else
         # Sudo isn't needed. We don't need a PTY.
         session.exec(opts[:command]) 

data/lib/fissher_conf.rb

@@ -39,18 +39,20 @@ module FissherConf
   # Print usage message
   def usage
     app = File.basename($0)
-    puts "#{app} [flags] [command]:\n"
-    puts "-G Hostgroup       Execute command on all hosts listed in the JSON config for \n"
-    puts "                   the specified group.\n"
-    puts "-H Host1,Host2     Execute command on hosts listed on the command line\n"
-    puts "-g jumpbox         Manually specify/override a jump server, if necessary.\n"
-    puts "-s 		   Execute the provided commands with sudo."
-    puts "-u username        Manually specify/override username to connect with.\n"
-    puts "-p                 Use password based authentication, specified via STDIN\n"
-    puts "-c config.json     Manually specify the path to your fissher config file\n"
-    puts "-n num             Number of concurrent connections. Enter 0 for unlimited.\n"
-    puts "-U username	   Specify an alternate user in conjunction with -s\n" 
-    puts "                   (E.G. -U webmaster)\n"
+    puts <<-EOF
+#{app} [flags] [command]:
+  -G Hostgroup       Execute command on all hosts listed in the JSON config for
+                     the specified group.
+  -H Host1,Host2     Execute command on hosts listed on the command line
+  -g jumpbox         Manually specify/override a jump server, if necessary.
+  -s 		     Execute the provided commands with sudo.   
+  -u username        Manually specify/override username to connect with.
+  -p                 Use password based authentication, specified via STDIN
+  -c config.json     Manually specify the path to your fissher config file
+  -n num             Number of concurrent connections. Enter 0 for unlimited.
+  -U username	     Specify an alternate user to run the command as. Uses sudo.
+                     (E.G. -U webmaster)
+    EOF
   end
 
   # A shortcut method to make errors a little more graceful.
@@ -108,13 +110,14 @@ EOB
       abort
     end
     
+
     # Use sudo for our command
     if opt["s"]
-      if opt["U"]
-        sudo_cmd = "sudo -u #{opt['U']}"
-      else
-        sudo_cmd = "sudo"
-      end
+      sudo_cmd = "sudo"
+    end
+
+    if opt["U"] #&& opt["s"].nil?
+      sudo_cmd = "sudo -u #{opt['U']}"
     end
 
     # Gateway if an edgeserver is present

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fissher
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi