kdeploy 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b3fbf88bffba0ba35c0b75e18cf57e5665d6bb512c354835574b07359de60a
-  data.tar.gz: 5e94c13abd994f4e2e445527aacd42dfd7a7e825f4a78c114b9c5aae78f928b0
+  metadata.gz: '079548e82a360553e00c1aecb5967fd7d57320dbf5d89684a992885444e0e5ac'
+  data.tar.gz: 4b639818b4116f7111fe44ef3d983abf8fdc0c24ac0ee558f35e09d9d3592722
 SHA512:
-  metadata.gz: 30e9abe01d5f729092df74cf6065279042421c42bde354c8214a497af56e6d0084f4618ef16ab9ec05d9f9adf9c8b8ab627d7fb22b59b407fdc904cf06917c79
-  data.tar.gz: 36827e5d4dd7178def48f0602d57ec5c1ee829a163082088915e1aad48f9a98feb00a7f04b6be80b6be802ec9d2ab3fed5b22bb1f3067db022e880f642bf50e9
+  metadata.gz: f07494332413308f446e39e91f75f856ee1b0484c662ac299d2c2300e01b5ece8d32e072cd727371b53d0542df48a1e8678d0de5889696b09903bda6438005a5
+  data.tar.gz: 91ecd8ede72319bf7693424fe6e2efcee9f9ddb7e82ce2db28ae52f69ed622ec57ba019c49c70d3a7aacbc5357b02d4b5c9861dc294fdd4b15e55540b324fa83

data/lib/kdeploy/cli.rb

@@ -177,49 +177,60 @@ module Kdeploy
 
     def print_results(results, task_name)
       pastel = Pastel.new
-      puts pastel.bright_cyan("\n=== Task: #{task_name} ===\n")
+      puts pastel.cyan("\nPLAY [#{task_name}] " + ('*' * 64))
 
       results.each do |host, result|
-        status = result[:status] == :success ? pastel.green('✓ Success') : pastel.red('✗ Failed')
-        puts pastel.bright_white("[#{host}] #{status}")
-
-        if result[:status] == :success
-          result[:output].each do |cmd|
-            # 显示命令
-            if cmd[:command].include?('<<') || cmd[:command].include?("\n")
-              first_line = cmd[:command].lines.first.strip
-              puts pastel.bright_yellow("    $ #{first_line}")
-              cmd[:command].lines[1..].each do |line|
-                next if line.strip.empty?
-
-                puts pastel.bright_yellow("    > #{line.strip}")
-              end
+        status = case result[:status]
+                 when :success then pastel.green('ok')
+                 when :changed then pastel.yellow('changed')
+                 else pastel.red('failed')
+                 end
+        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.bright_yellow("    $ #{cmd[:command].strip}")
-            end
-
-            # 显示输出
-            output = cmd[:output].is_a?(Hash) ? cmd[:output][:stdout] : cmd[:output].to_s
-            output.each_line do |line|
-              next if line.strip.empty?
-
-              puts pastel.white("      #{line.rstrip}")
-            end
-
-            # 显示错误输出
-            if cmd[:output].is_a?(Hash) && !cmd[:output][:stderr].empty?
-              cmd[:output][:stderr].each_line do |line|
-                puts pastel.red("      #{line.rstrip}") unless line.strip.empty?
+              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?
+                end
               end
             end
-
-            puts
           end
         else
-          puts pastel.red("    #{result[:error]}")
-          puts
+          # 失败主机高亮错误
+          err = result[:error] || (if result[:output].is_a?(Array)
+                                     result[:output].map do |o|
+                                       o[:output][:stderr] if o[:output].is_a?(Hash)
+                                     end.compact.join("\n")
+                                   else
+                                     result[:output].to_s
+                                   end)
+          puts pastel.red("  ERROR: #{err}")
         end
       end
+
+      # 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
+        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}"
+      end
     end
   end
 end

data/lib/kdeploy/runner.rb

@@ -24,16 +24,23 @@ module Kdeploy
           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? }
+              # 美化输出
+              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
-              puts "[#{name}] upload: #{command[:source]} -> #{command[:destination]}"
+              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
-              puts "[#{name}] upload_template: #{command[:source]} -> #{command[:destination]}"
+              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

data/lib/kdeploy/version.rb

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

metadata

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