kdeploy 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b80d4b4cf5194def86c21793e7a284f524288f06e215fd6d44f0fa408dfe18
-  data.tar.gz: d8f28a18304adc12256633567c872d1368a29a644c9e4b1f2cdd44e5ba3d9413
+  metadata.gz: 361d3e4177d88e983400481dbfcbd8ae4c3e6e4f7964e547cdfb9fbdf333ba6c
+  data.tar.gz: d9c0aa6de6a5741f15cc175dffdc247903b4070fbd3ccfe66bb39bdcf8d52181
 SHA512:
-  metadata.gz: f2e3a70987d5390dc53c4c68091533dfb6f8e9e9b695f03aeaa5c5e1c48c7d646cac698ac5760bb30d5a32a7c1b0ee51ca720e2d9507253d87b2ac01ea0a19ce
-  data.tar.gz: b6908b7720edda9e4ff81a2b5f2d679e5ffe7774d62d33de91dd191b5773590020ec49c43b45d58d520da6d7ef6193bca6120e6b7dd1d46b84344081081d80fa
+  metadata.gz: b24732771d9e0cbee179aeffcc83b2c3f99a9711c4730b00b33a7a7536ac5cf362dbf8462940c91a0314c4bb7b2547880c04dd402e6b2eba36ca355aa7973657
+  data.tar.gz: b64dcf2f6498fd6b5f6d53c1738dbe719be7d033925e8e0b046bd5a6be5d2d93915e87ac4860079bb356d080b1e4170ec5398f10309dc0e2733c2a40147a3f46

data/lib/kdeploy/cli.rb

@@ -221,11 +221,23 @@ module Kdeploy
 
       # summary
       puts pastel.cyan("\nPLAY RECAP #{'*' * 64}")
+      max_host_len = results.keys.map(&:length).max || 16
       results.each do |host, result|
         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
-        puts "#{host.ljust(24)} : ok=#{ok}    changed=#{changed}    failed=#{failed}"
+        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)}")
+        line = "#{host.ljust(max_host_len)} : #{ok_str}  #{changed_str}  #{failed_str}"
+        case result[:status]
+        when :success
+          puts pastel.green(line)
+        when :changed
+          puts pastel.yellow(line)
+        else
+          puts pastel.red(line)
+        end
       end
     end
   end

data/lib/kdeploy/runner.rb

@@ -21,21 +21,49 @@ module Kdeploy
           executor = Executor.new(config)
           result = { status: :success, output: [] }
 
-          task[:block].call.each do |command|
-            case command[:type]
-            when :run
-              puts "[#{name}] $ #{command[:command].lines.first.strip}" # 实时输出主机和命令
-              command[:command].lines[1..].each { |line| puts "[#{name}] > #{line.strip}" unless line.strip.empty? }
-              output = executor.execute(command[:command])
-              result[:output] << { command: command[:command], output: output }
-            when :upload
-              puts "[#{name}] upload: #{command[:source]} -> #{command[:destination]}"
-              executor.upload(command[:source], command[:destination])
-              result[:output] << { command: "upload: #{command[:source]} -> #{command[:destination]}" }
-            when :upload_template
-              puts "[#{name}] upload_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])
+                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.8'
+  VERSION = '1.1.0'
 end

metadata

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