kdeploy 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0acb567d3c34e2937de6f0f4c455928ab071d9b0951499ba34c3dd10fc39b6dc
-  data.tar.gz: 96d62a683a09abcbce1b309294ccf8584ddb275fa4ed68f5ca09bb7efa1ee611
+  metadata.gz: 71b80d4b4cf5194def86c21793e7a284f524288f06e215fd6d44f0fa408dfe18
+  data.tar.gz: d8f28a18304adc12256633567c872d1368a29a644c9e4b1f2cdd44e5ba3d9413
 SHA512:
-  metadata.gz: fdbc032e54d7915bc5d56d271ca54244d555f7d5b6200ee4b76dd9a6c6f060c5bc50408cd7e870cf2978f95901efd1ecd4805a2de3488df4fad95c6310b2bfdd
-  data.tar.gz: d629aaa50931b626de2fd11e8d4c4286f984dbff82a8f8e0fb8146ded23b5fbbb30536e031ec859a6558bcd75176198f55cb98a098c70b327bf3b9dd6b2d5cad
+  metadata.gz: f2e3a70987d5390dc53c4c68091533dfb6f8e9e9b695f03aeaa5c5e1c48c7d646cac698ac5760bb30d5a32a7c1b0ee51ca720e2d9507253d87b2ac01ea0a19ce
+  data.tar.gz: b6908b7720edda9e4ff81a2b5f2d679e5ffe7774d62d33de91dd191b5773590020ec49c43b45d58d520da6d7ef6193bca6120e6b7dd1d46b84344081081d80fa

data/exe/kdeploy

@@ -1,6 +1,19 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# 自动修复常见 gem 扩展
+%w[debug rbs].zip(%w[1.7.1 2.8.2]).each do |gem_name, version|
+  require gem_name
+rescue LoadError
+  warn "[Kdeploy] 自动修复 #{gem_name}-#{version} ..."
+  system("gem pristine #{gem_name} --version #{version}")
+  begin
+    require gem_name
+  rescue LoadError
+    warn "[Kdeploy] 依然无法加载 #{gem_name}-#{version}，请手动修复。"
+  end
+end
+
 require 'kdeploy'
 
 Kdeploy::CLI.start(ARGV)

data/lib/kdeploy/cli.rb

@@ -79,6 +79,13 @@ module Kdeploy
     method_option :parallel, type: :numeric, default: 5, desc: 'Number of parallel executions'
     method_option :dry_run, type: :boolean, desc: 'Show what would be done'
     def execute(task_file, task_name = nil)
+      # 只在最前面输出一次 banner
+      @banner_printed ||= false
+      unless @banner_printed
+        puts Kdeploy::Banner.show
+        @banner_printed = true
+      end
+
       load_task_file(task_file)
 
       tasks_to_run = if task_name
@@ -169,55 +176,57 @@ module Kdeploy
     end
 
     def print_results(results, task_name)
-      puts Kdeploy::Banner.show
       pastel = Pastel.new
-
-      puts "#{pastel.bright_cyan('Task:')} #{pastel.bright_white(task_name)}"
-      puts
+      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 "    #{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}")
+      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}"
+      end
     end
   end
 end

data/lib/kdeploy/version.rb

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

metadata

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