kdeploy 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c00c00789f233f007546ca34305f421da37baf99cdbae2f025335f1be06c19
-  data.tar.gz: 6bf1d8e927c30f0e11d11aa14e1290ff8e7d224adb53a884fe621daf5776d7b1
+  metadata.gz: 15b3fbf88bffba0ba35c0b75e18cf57e5665d6bb512c354835574b07359de60a
+  data.tar.gz: 5e94c13abd994f4e2e445527aacd42dfd7a7e825f4a78c114b9c5aae78f928b0
 SHA512:
-  metadata.gz: 6827b3c353a608b1c554cb5ddd4c32909a938dd5125b9ab0175312b7a8b41b68830c578e11f6616ecb9fb884516a59eede85ecd8df321319334f49952d688761
-  data.tar.gz: fe23ae3d9b659ae1124dad9b8c5804c07884bdd463315f96aac4a988a29f9c86035c6f73fc74ae40846fbb3e747d597f89af9d79751dbbf5b4e7446835ed24fd
+  metadata.gz: 30e9abe01d5f729092df74cf6065279042421c42bde354c8214a497af56e6d0084f4618ef16ab9ec05d9f9adf9c8b8ab627d7fb22b59b407fdc904cf06917c79
+  data.tar.gz: 36827e5d4dd7178def48f0602d57ec5c1ee829a163082088915e1aad48f9a98feb00a7f04b6be80b6be802ec9d2ab3fed5b22bb1f3067db022e880f642bf50e9

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
@@ -118,7 +125,8 @@ module Kdeploy
         exit 1
       end
 
-      self.class.class_eval(File.read(file), file)
+      # 用 instance_eval 并传递顶层 binding，兼容 heredoc
+      self.class.module_eval(File.read(file), file)
     end
 
     def filter_hosts(limit, task_hosts)
@@ -168,31 +176,26 @@ 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.bright_cyan("\n=== Task: #{task_name} ===\n")
 
       results.each do |host, result|
         status = result[:status] == :success ? pastel.green('✓ Success') : pastel.red('✗ Failed')
-        puts "#{pastel.bright_white(host)} - #{status}"
+        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}"
+              puts pastel.bright_yellow("    $ #{first_line}")
               cmd[:command].lines[1..].each do |line|
                 next if line.strip.empty?
 
-                puts "  #{pastel.bright_yellow('>')} #{line.strip}"
+                puts pastel.bright_yellow("    > #{line.strip}")
               end
             else
-              # 单行命令显示
-              puts "  #{pastel.bright_yellow('$')} #{cmd[:command].strip}"
+              puts pastel.bright_yellow("    $ #{cmd[:command].strip}")
             end
 
             # 显示输出
@@ -200,20 +203,20 @@ module Kdeploy
             output.each_line do |line|
               next if line.strip.empty?
 
-              puts "    #{line.rstrip}"
+              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.red("      #{line.rstrip}") unless line.strip.empty?
               end
             end
 
             puts
           end
         else
-          puts "  #{pastel.red(result[:error])}"
+          puts pastel.red("    #{result[:error]}")
           puts
         end
       end

data/lib/kdeploy/runner.rb

@@ -24,12 +24,16 @@ 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? }
               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]}" }
             end

data/lib/kdeploy/version.rb

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

metadata

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