kdeploy 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03944aa593bff10b74d9e759c5228c3d67ee1d755581634621fe177c603067be'
-  data.tar.gz: 4217dec1ce5d68aafc9bddafd0bb73d7033c30453c9479642c116dff2bc035d7
+  metadata.gz: 0acb567d3c34e2937de6f0f4c455928ab071d9b0951499ba34c3dd10fc39b6dc
+  data.tar.gz: 96d62a683a09abcbce1b309294ccf8584ddb275fa4ed68f5ca09bb7efa1ee611
 SHA512:
-  metadata.gz: 519644cfb036c05fb4939f0c104fdf73dde83b51de13856a7d6d1d1b42590e03bc9114b2736217187fa91e2582a78a28d68bc1b2bb82034cf74773ea64a1eda4
-  data.tar.gz: e6f0f513e91dd14f85a8b859ef47015cb6710a8cb9b00ba07e971b8c59453c1d0e51584cc94a89d2290ce147a5f42fe38413a221dc82cb273e6a2ff8afc363fb
+  metadata.gz: fdbc032e54d7915bc5d56d271ca54244d555f7d5b6200ee4b76dd9a6c6f060c5bc50408cd7e870cf2978f95901efd1ecd4805a2de3488df4fad95c6310b2bfdd
+  data.tar.gz: d629aaa50931b626de2fd11e8d4c4286f984dbff82a8f8e0fb8146ded23b5fbbb30536e031ec859a6558bcd75176198f55cb98a098c70b327bf3b9dd6b2d5cad

data/lib/kdeploy/cli.rb

@@ -118,7 +118,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)

data/lib/kdeploy/executor.rb

@@ -19,15 +19,22 @@ module Kdeploy
         stdout = String.new
         stderr = String.new
 
-        ssh.exec!(command) do |_channel, stream, data|
-          case stream
-          when :stdout
-            stdout << data
-          when :stderr
-            stderr << data
+        ssh.open_channel do |channel|
+          channel.exec(command) do |_ch, success|
+            raise "Could not execute command: #{command}" unless success
+
+            channel.on_data do |_ch, data|
+              print data # 实时输出
+              stdout << data
+            end
+
+            channel.on_extended_data do |_ch, _type, data|
+              print data # 实时输出
+              stderr << data
+            end
           end
         end
-
+        ssh.loop
         {
           stdout: stdout.strip,
           stderr: stderr.strip,

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.4'
+  VERSION = '1.0.6'
 end

metadata

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