kdeploy 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a20ba2b482ea270782499a512f4058f1b022f2733d185f2e002f58c1d402b44
-  data.tar.gz: 8fdce45af09af95b3bff7c89d20c742853945e500837a804c09f4932865b7f66
+  metadata.gz: 8ab3017f4d6818b4e46db9bfa55414452a87f71bc7d13dda423c34fab995262a
+  data.tar.gz: 26b691b159c54d5d438573c539454ddd58c0d0aa6063cd18cac4469bb873d9b9
 SHA512:
-  metadata.gz: 3c2f0ac8ea5f4bbf6442c597a54ae5d9b64b7255430636803d1533a1cd0f33e8a58e4d0a673d902a0ad0c83f95eccea7e6ad2f5a091b45d4cbf9334ebddd7bf0
-  data.tar.gz: 269d74c398731804261ee871adca6f2df7f1a4fb88371cd9111831f257693e2fa1170618f032b3f56e9b7c51ee0ce30fee90e33dc3b8be0ec00f8a6c032af086
+  metadata.gz: 205246f7917997566e83cd15eacaad6d497aaf0ca6fb99de778277786abb0a71233f3782feb4f822efc7a023c0fad80f9193e9bcd970883ed2c523475d30e597
+  data.tar.gz: f0fa8718a2646fa053c3d3bb662b773cdf6c1e9f42e6a36f137f9a74bdb97bdef060832c745cec37883e026d5c3f367ee5f6587a4b51a338be76ab3827d0e779

data/lib/kdeploy/cli.rb

@@ -188,20 +188,37 @@ module Kdeploy
         puts pastel.bright_white("\n#{host.ljust(24)} : #{status}")
 
         if %i[success changed].include?(result[:status])
-          result[:output].each do |step|
-            if step[:command].to_s.start_with?('upload:')
-              puts pastel.green("  [upload] #{step[:command].sub('upload: ', '')}")
-            elsif step[:command].to_s.start_with?('upload_template:')
-              puts pastel.yellow("  [template] #{step[:command].sub('upload_template: ', '')}")
-            else
-              puts pastel.cyan("  [run]    #{step[:command].to_s.lines.first.strip}")
-              if step[:output].is_a?(Hash) && step[:output][:stdout]
-                step[:output][:stdout].each_line do |line|
-                  puts "           > #{line.strip}" unless line.strip.empty?
-                end
-              elsif step[:output].is_a?(String)
-                step[:output].each_line do |line|
-                  puts "           > #{line.strip}" unless line.strip.empty?
+          shown = {}
+          grouped = result[:output].group_by { |step| step[:type] || :run }
+          grouped.each do |type, steps|
+            case type
+            when :upload
+              puts pastel.green('  === Upload ===')
+            when :upload_template
+              puts pastel.yellow('  === Template ===')
+            when :run
+              puts pastel.cyan('  === Run ===')
+            end
+            steps.each do |step|
+              key = [step[:command], step[:output]].hash
+              next if shown[key]
+
+              shown[key] = true
+              duration_str = step[:duration] ? pastel.dim(" [#{'%.2f' % step[:duration]}s]") : ''
+              if step[:command].to_s.start_with?('upload:')
+                puts pastel.green("    [upload] #{step[:command].sub('upload: ', '')}#{duration_str}")
+              elsif step[:command].to_s.start_with?('upload_template:')
+                puts pastel.yellow("    [template] #{step[:command].sub('upload_template: ', '')}#{duration_str}")
+              else
+                puts pastel.cyan("    [run]    #{step[:command].to_s.lines.first.strip}#{duration_str}")
+                if step[:output].is_a?(Hash) && step[:output][:stdout]
+                  step[:output][:stdout].each_line do |line|
+                    puts "        #{line.rstrip}" unless line.strip.empty?
+                  end
+                elsif step[:output].is_a?(String)
+                  step[:output].each_line do |line|
+                    puts "        #{line.rstrip}" unless line.strip.empty?
+                  end
                 end
               end
             end
@@ -222,13 +239,17 @@ module Kdeploy
       # summary
       puts pastel.cyan("\nPLAY RECAP #{'*' * 64}")
       max_host_len = results.keys.map(&:length).max || 16
-      results.each do |host, result|
+      ok_w = 7
+      changed_w = 11
+      failed_w = 10
+      results.keys.sort.each do |host|
+        result = results[host]
         ok = %i[success changed].include?(result[:status]) ? result[:output].size : 0
         failed = result[:status] == :failed ? 1 : 0
         changed = result[:status] == :changed ? result[:output].size : 0
-        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)}")
+        ok_str = pastel.green("ok=#{ok.to_s.ljust(ok_w - 3)}")
+        changed_str = pastel.yellow("changed=#{changed.to_s.ljust(changed_w - 8)}")
+        failed_str = pastel.red("failed=#{failed.to_s.ljust(failed_w - 7)}")
         line = "#{host.ljust(max_host_len)} : #{ok_str}  #{changed_str}  #{failed_str}"
         if failed.positive?
           puts pastel.red(line)

data/lib/kdeploy/runner.rb

@@ -49,27 +49,37 @@ module Kdeploy
                 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? }
+                t1 = Time.now
                 output = executor.execute(command[:command])
+                t2 = Time.now
+                duration = t2 - t1
                 # 统一输出命令结果
                 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.cyan("    #{line.rstrip}") unless line.strip.empty? }
+                  output[:stderr].each_line { |line| puts pastel.green("    #{line.rstrip}") unless line.strip.empty? }
                 end
-                result[:output] << { command: command[:command], output: output }
+                result[:output] << { command: command[:command], output: output, duration: duration, type: :run }
               when :upload
                 pastel = Pastel.new
                 puts pastel.bright_white("\n#{name.ljust(24)} : ")
                 puts pastel.green("  [upload] #{command[:source]} -> #{command[:destination]}")
+                t1 = Time.now
                 executor.upload(command[:source], command[:destination])
-                result[:output] << { command: "upload: #{command[:source]} -> #{command[:destination]}" }
+                t2 = Time.now
+                duration = t2 - t1
+                result[:output] << { command: "upload: #{command[:source]} -> #{command[:destination]}", duration: duration, type: :upload }
               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]}" }
+                t1 = Time.now
+                executor.upload_template(command[:source], command[:destination], command[:vars])
+                t2 = Time.now
+                duration = t2 - t1
+                result[:output] << { command: "upload_template: #{command[:source]} -> #{command[:destination]}", duration: duration,
+                                     type: :upload_template }
               end
             end
           end

data/lib/kdeploy/version.rb

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

metadata

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