kdeploy 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb093825d57b14ed8e603e760f2561b6b0e78d3ffb907efd11fbb0a6eddb069e
-  data.tar.gz: 679556c416416a010fca552c5dbbf656961dbbd8dc3a90180261a4f4addf9409
+  metadata.gz: 9583a9a5362b5bf116325f3e9f930ff19be72c76d82060869284921079f93b19
+  data.tar.gz: cbfa824d6defd7511a71d985073de549442a34ed4e165093e422543e33c1e321
 SHA512:
-  metadata.gz: e03245531beafbb2010b4e00a466aea4e5f756b60628ce2206355387046ae70a2ec0aca1ec1a0e7243a2b240d9cf569168b243a9e67cea637fef0f5e0f26428e
-  data.tar.gz: 129aa8dc62528d63bb99d0e60af780fc241691daafeb3fcb51940d4f2355902fca068d3bbcd60c0f2bd487228f859f58145f279c695c813b5f32d0f48ec4fb90
+  metadata.gz: b20ac3a10b3de646fe5c23a96cebae09a0fb825fde88b3698a3a7beb2715abf7e05076ca2b4cc04715ee54935053cb23d1b392f8f726af79c15c244c7bed32a7
+  data.tar.gz: 446eb1df1186929fc9576e55b558c869b01cfa7466f53a09e65836a59b365b5e3cb88bf98616393efd9181d84bc08b45b7e8348f89fa07ee75d5b9a53f9af173

data/lib/kdeploy/cli.rb

@@ -189,24 +189,46 @@ module Kdeploy
 
         if %i[success changed].include?(result[:status])
           shown = {}
-          result[:output].each do |step|
-            key = [step[:command], step[:output]].hash
-            next if shown[key]
-
-            shown[key] = true
-            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.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?
+          grouped = result[:output].group_by { |step| step[:type] || :run }
+          grouped.each do |type, steps|
+            case type
+            when :upload
+              puts pastel.green('  === Upload ===')
+              steps.each do |step|
+                key = [step[:command], type].hash
+                next if shown[key]
+
+                shown[key] = true
+                duration_str = step[:duration] ? pastel.dim(" [#{'%.2f' % step[:duration]}s]") : ''
+                puts pastel.green("    [upload] #{step[:command].sub('upload: ', '')}#{duration_str}")
+              end
+            when :upload_template
+              puts pastel.yellow('  === Template ===')
+              steps.each do |step|
+                key = [step[:command], type].hash
+                next if shown[key]
+
+                shown[key] = true
+                duration_str = step[:duration] ? pastel.dim(" [#{'%.2f' % step[:duration]}s]") : ''
+                puts pastel.yellow("    [template] #{step[:command].sub('upload_template: ', '')}#{duration_str}")
+              end
+            when :run
+              puts pastel.cyan('  === Run ===')
+              steps.each do |step|
+                key = [step[:command], type].hash
+                next if shown[key]
+
+                shown[key] = true
+                duration_str = step[:duration] ? pastel.dim(" [#{'%.2f' % step[:duration]}s]") : ''
+                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

data/lib/kdeploy/runner.rb

@@ -49,7 +49,10 @@ 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? }
@@ -57,19 +60,26 @@ module Kdeploy
                 if output[:stderr] && !output[:stderr].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.3'
+  VERSION = '1.1.5'
 end

metadata

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