pec2 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d212e880ee55a9fd7282d28c16d77b9435019b3
-  data.tar.gz: 582aa6fd904cc9a75ec0d6a2063706ceada859d7
+  metadata.gz: 33e2d6953534f1dbc33754e2c61a0590562b28b8
+  data.tar.gz: 2d6b953f43d8dbedb76769e98e565300d9a08044
 SHA512:
-  metadata.gz: ba417870100d95967e9df7dcbcd501bb7e15e81905554295d1a2acaa1ff732a45424c69903cb1f19510009dd66ff56812943db26526e99821664829639ba7053
-  data.tar.gz: 7cc2a92acc8c92ab9b96235e32765bb86e8e89928b2abef6ae554d549425c36db6e4ef33101d707698e597da0feeb3e575ddf63e99c1a90a64ddf44df0de6ad9
+  metadata.gz: 33926a7b625ad0f58e5ad5022255c1845bc3bd538a96849fcf031604c30cb6e76caac04e3f9ce8ca308b8da77ffc66ee5bd0790816d5bc5dda70de2cc7f73cde
+  data.tar.gz: c117a938f7a882ce16d011ac6593a6b263b7cca3e9df4380519d7614c60c0b951ca62df24323d757e32bfcee3eff18bf0a74db10632f46b8a2821d5719ecd26c

data/lib/pec2/pssh.rb

@@ -34,37 +34,50 @@ module Pec2
 
     def exec_pssh_command(command)
       return false if command.nil? || command.empty?
-      error_servers = []
-      Parallel.each(@servers, in_threads: @parallel) do |server|
-        begin
-          Net::SSH.start(server[:host], @user, @ssh_options) do |ssh|
-            channel = ssh.open_channel do |channel, success|
-              channel.on_data do |channel, data|
-                if data =~ /^\[sudo\] password for /
-                  channel.send_data "#{@sudo_password}\n"
-                else
-                  data.to_s.lines.each do |line|
-                    if @print
-                      print %Q{#{server[:host]}:#{line}}.colorize(server[:color])
-                    end
+      exit_status = {}
+      Parallel.map(@servers, in_threads: @parallel) do |server|
+        exit_status[server[:host]] = exec_ssh(server, command)
+      end
+      errors = exit_status.select {|k, v| v != 0 }
+      if errors.size > 0
+        @logger.error "error servers => #{errors.keys.join(', ')}".colorize(:red)
+        return false
+      end
+      return true
+    end
+
+    private
+
+    def exec_ssh(server, command)
+      exit_code = nil
+      begin
+        Net::SSH.start(server[:host], @user, @ssh_options) do |ssh|
+          channel = ssh.open_channel do |channel, success|
+            channel.on_data do |channel, data|
+              if data =~ /^\[sudo\] password for /
+                channel.send_data "#{@sudo_password}\n"
+              else
+                data.to_s.lines.each do |line|
+                  if @print
+                    print %Q{#{server[:host]}:#{line}}.colorize(server[:color])
                   end
                 end
               end
-              channel.request_pty
-              channel.exec(command)
-              channel.wait
+            end
+            channel.request_pty
+            channel.exec(command) do |ch, success|
+              channel.on_request("exit-status") do |ch,data|
+                exit_code = data.read_long
+              end
             end
             channel.wait
           end
-        rescue => e
-          error_servers << server[:host]
-          puts "\n#{e.message}\n#{e.backtrace.join("\n")}"
+          channel.wait
         end
+      rescue => e
+        puts "\n#{e.message}\n#{e.backtrace.join("\n")}"
       end
-      if error_servers.size > 0
-        @logger.error "error servers => #{error_servers.join(', ')}".colorize(:red)
-      end
-      return true
+      return exit_code
     end
   end
 end

data/lib/pec2/version.rb

@@ -1,4 +1,4 @@
 module Pec2
   # pec2 version
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec2
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor