kdeploy 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 361d3e4177d88e983400481dbfcbd8ae4c3e6e4f7964e547cdfb9fbdf333ba6c
-  data.tar.gz: d9c0aa6de6a5741f15cc175dffdc247903b4070fbd3ccfe66bb39bdcf8d52181
+  metadata.gz: 0203e26e85d3910ae62da516f229355cc3c19f360f2dd56abfda06e616195258
+  data.tar.gz: 20ab1369c1b7906d6fbe51191c7b999e617e65f1572014ada58eb12f52f5b143
 SHA512:
-  metadata.gz: b24732771d9e0cbee179aeffcc83b2c3f99a9711c4730b00b33a7a7536ac5cf362dbf8462940c91a0314c4bb7b2547880c04dd402e6b2eba36ca355aa7973657
-  data.tar.gz: b64dcf2f6498fd6b5f6d53c1738dbe719be7d033925e8e0b046bd5a6be5d2d93915e87ac4860079bb356d080b1e4170ec5398f10309dc0e2733c2a40147a3f46
+  metadata.gz: 912c3c3eb78ac13a8294f1e1468875bbc45a375701e6312054a51afb37e986eb7bb85061efe16f44a2ed48e2421235b47eedb2f9db6aee8616640e314610bb8c
+  data.tar.gz: 2e502450ba52305c98b294fd0bde975f494d066e9720bcbd504f13b61a9cc6d21930f0b510874e2e18bc27bb637c6d092401a1e13f9f18503e10febe0b2caa69

data/lib/kdeploy/cli.rb

@@ -230,13 +230,12 @@ module Kdeploy
         changed_str = pastel.yellow("changed=#{changed.to_s.ljust(3)}")
         failed_str = pastel.red("failed=#{failed.to_s.ljust(3)}")
         line = "#{host.ljust(max_host_len)} : #{ok_str}  #{changed_str}  #{failed_str}"
-        case result[:status]
-        when :success
+        if failed.positive?
+          puts pastel.red(line)
+        elsif ok.positive? && failed.zero?
           puts pastel.green(line)
-        when :changed
-          puts pastel.yellow(line)
         else
-          puts pastel.red(line)
+          puts line
         end
       end
     end

data/lib/kdeploy/executor.rb

@@ -24,12 +24,10 @@ module Kdeploy
             raise "Could not execute command: #{command}" unless success
 
             channel.on_data do |_ch, data|
-              print data # 实时输出
               stdout << data
             end
 
             channel.on_extended_data do |_ch, _type, data|
-              print data # 实时输出
               stderr << data
             end
           end

data/lib/kdeploy/runner.rb

@@ -50,6 +50,13 @@ module Kdeploy
                 puts pastel.cyan("  [run]    #{command[:command].lines.first.strip}")
                 command[:command].lines[1..].each { |line| puts "           > #{line.strip}" unless line.strip.empty? }
                 output = executor.execute(command[:command])
+                # 统一输出命令结果
+                if output[:stdout] && !output[:stdout].empty?
+                  output[:stdout].each_line { |line| puts "    #{line.rstrip}" unless line.strip.empty? }
+                end
+                if output[:stderr] && !output[:stderr].empty?
+                  output[:stderr].each_line { |line| puts pastel.red("    #{line.rstrip}") unless line.strip.empty? }
+                end
                 result[:output] << { command: command[:command], output: output }
               when :upload
                 pastel = Pastel.new

data/lib/kdeploy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kdeploy
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kdeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kk