kdeploy 1.0.9 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079548e82a360553e00c1aecb5967fd7d57320dbf5d89684a992885444e0e5ac'
-  data.tar.gz: 4b639818b4116f7111fe44ef3d983abf8fdc0c24ac0ee558f35e09d9d3592722
+  metadata.gz: 0203e26e85d3910ae62da516f229355cc3c19f360f2dd56abfda06e616195258
+  data.tar.gz: 20ab1369c1b7906d6fbe51191c7b999e617e65f1572014ada58eb12f52f5b143
 SHA512:
-  metadata.gz: f07494332413308f446e39e91f75f856ee1b0484c662ac299d2c2300e01b5ece8d32e072cd727371b53d0542df48a1e8678d0de5889696b09903bda6438005a5
-  data.tar.gz: 91ecd8ede72319bf7693424fe6e2efcee9f9ddb7e82ce2db28ae52f69ed622ec57ba019c49c70d3a7aacbc5357b02d4b5c9861dc294fdd4b15e55540b324fa83
+  metadata.gz: 912c3c3eb78ac13a8294f1e1468875bbc45a375701e6312054a51afb37e986eb7bb85061efe16f44a2ed48e2421235b47eedb2f9db6aee8616640e314610bb8c
+  data.tar.gz: 2e502450ba52305c98b294fd0bde975f494d066e9720bcbd504f13b61a9cc6d21930f0b510874e2e18bc27bb637c6d092401a1e13f9f18503e10febe0b2caa69

data/lib/kdeploy/cli.rb

@@ -229,7 +229,14 @@ module Kdeploy
         ok_str = pastel.green("ok=#{ok.to_s.ljust(3)}")
         changed_str = pastel.yellow("changed=#{changed.to_s.ljust(3)}")
         failed_str = pastel.red("failed=#{failed.to_s.ljust(3)}")
-        puts "#{host.ljust(max_host_len)} : #{ok_str}  #{changed_str}  #{failed_str}"
+        line = "#{host.ljust(max_host_len)} : #{ok_str}  #{changed_str}  #{failed_str}"
+        if failed.positive?
+          puts pastel.red(line)
+        elsif ok.positive? && failed.zero?
+          puts pastel.green(line)
+        else
+          puts line
+        end
       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

@@ -21,28 +21,56 @@ module Kdeploy
           executor = Executor.new(config)
           result = { status: :success, output: [] }
 
-          task[:block].call.each do |command|
-            case command[:type]
-            when :run
-              # 美化输出
-              pastel = Pastel.new
-              puts pastel.bright_white("\n#{name.ljust(24)} : ")
-              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])
-              result[:output] << { command: command[:command], output: output }
-            when :upload
-              pastel = Pastel.new
-              puts pastel.bright_white("\n#{name.ljust(24)} : ")
-              puts pastel.green("  [upload] #{command[:source]} -> #{command[:destination]}")
-              executor.upload(command[:source], command[:destination])
-              result[:output] << { command: "upload: #{command[:source]} -> #{command[:destination]}" }
-            when :upload_template
-              pastel = Pastel.new
-              puts pastel.bright_white("\n#{name.ljust(24)} : ")
-              puts pastel.yellow("  [template] #{command[:source]} -> #{command[:destination]}")
-              executor.upload_template(command[:source], command[:destination], command[:variables])
-              result[:output] << { command: "upload_template: #{command[:source]} -> #{command[:destination]}" }
+          task[:block].call.group_by do |cmd|
+            cmd[:type].to_s + (if cmd[:type] == :upload
+                                 cmd[:source].to_s
+                               else
+                                 cmd[:type] == :run ? cmd[:command].to_s.lines.first.strip : ''
+                               end)
+          end.each_value do |commands|
+            # 生成 TASK 横幅
+            pastel = Pastel.new
+            first_cmd = commands.first
+            task_desc = case first_cmd[:type]
+                        when :upload
+                          "upload #{first_cmd[:source]}"
+                        when :upload_template
+                          "template #{first_cmd[:source]}"
+                        when :run
+                          first_cmd[:command].to_s.lines.first.strip
+                        else
+                          first_cmd[:type].to_s
+                        end
+            puts pastel.cyan("\nTASK [#{task_desc}] " + ('*' * 64))
+            commands.each do |command|
+              case command[:type]
+              when :run
+                pastel = Pastel.new
+                puts pastel.bright_white("\n#{name.ljust(24)} : ")
+                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
+                puts pastel.bright_white("\n#{name.ljust(24)} : ")
+                puts pastel.green("  [upload] #{command[:source]} -> #{command[:destination]}")
+                executor.upload(command[:source], command[:destination])
+                result[:output] << { command: "upload: #{command[:source]} -> #{command[:destination]}" }
+              when :upload_template
+                pastel = Pastel.new
+                puts pastel.bright_white("\n#{name.ljust(24)} : ")
+                puts pastel.yellow("  [template] #{command[:source]} -> #{command[:destination]}")
+                executor.upload_template(command[:source], command[:destination], command[:variables])
+                result[:output] << { command: "upload_template: #{command[:source]} -> #{command[:destination]}" }
+              end
             end
           end
 

data/lib/kdeploy/version.rb

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

metadata

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