octosh 0.0.4 → 0.0.5

data/Gemfile

@@ -4,6 +4,7 @@ gem 'net-ssh', '2.6.1'
 gem 'net-scp', '1.0.4'
 gem 'highline', '1.6.15'
 gem 'uuid', '2.3.5'
+gem 'parallel', '0.5.19'
 
 group :test do
   gem 'rake', '0.9.2.2'

data/Gemfile.lock

@@ -3,9 +3,12 @@ GEM
   specs:
     diff-lcs (1.1.3)
     highline (1.6.15)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.6.1)
+    parallel (0.5.19)
     rake (0.9.2.2)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -15,6 +18,9 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
+    systemu (2.5.2)
+    uuid (2.3.5)
+      macaddr (~> 1.0)
 
 PLATFORMS
   ruby
@@ -23,6 +29,8 @@ DEPENDENCIES
   highline (= 1.6.15)
   net-scp (= 1.0.4)
   net-ssh (= 2.6.1)
+  parallel (= 0.5.19)
   rake (= 0.9.2.2)
   rspec (= 2.12.0)
   rspec-mocks (= 2.12.0)
+  uuid (= 2.3.5)

data/lib/octosh/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'ostruct'
+require 'parallel'
 
 $:.push File.dirname(__FILE__) + '../'
 require 'octosh'
@@ -108,6 +109,8 @@ module Octosh
     end
     
     def self.inline_bash(hosts, bash, user, password_prompt=true, uniform_password=false)
+      workers = []
+      
       hosts.each do |host|
         prompt_for_password(password_prompt, uniform_password)
         exec_user,hostname = ""
@@ -119,12 +122,17 @@ module Octosh
           hostname = host
         end
         worker = Octosh::Worker.new(hostname, exec_user, @password)
-        
-        puts "#{host} -- #{worker.exec(bash)}"
+        workers << worker
+      end
+      
+      Parallel.each(workers, :in_threads => workers.length) do |worker|
+        puts "#{worker.host} -- #{worker.exec(bash)}"
       end
     end
     
     def self.exec_script(hosts, script, user, password_prompt=true, uniform_password=false)
+      workers = []
+      
       hosts.each do |host|
         prompt_for_password(password_prompt, uniform_password)
         exec_user,hostname = ""
@@ -136,8 +144,13 @@ module Octosh
           hostname = host
         end
         worker = Octosh::Worker.new(hostname, exec_user, @password)
-        puts "#{host} -- #{worker.exec_script(script)}"
+        workers << worker
+      end
+      
+      Parallel.each(workers, :in_threads => workers.length) do |worker|
+        puts "#{worker.host} -- #{worker.exec_script(script)}"
       end
+      
     end
     
   end

data/lib/octosh/version.rb

@@ -1,3 +1,3 @@
 module Octosh
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/octosh/worker/worker.rb

@@ -17,7 +17,25 @@ module Octosh
     end
     
     def exec(command)
-      return @ssh.exec!(command)
+      channel = @ssh.open_channel do |ch|
+        ch.exec(command) do |ch, success|
+          raise "Error executing #{command}" unless success
+          
+          ch.on_data do |c, data|
+            puts "#{@host} -- #{data.to_s}"
+          end
+          
+          ch.on_extended_data do |c, type, data|
+            puts "#{@host} -- #{data}"
+          end
+          
+          ch.on_close do
+            puts "Octosh execution complete!"
+          end
+        end
+      end
+      
+      channel.wait
     end
     
     def put(local_path, remote_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octosh
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: