kamal-backup 0.3.0.beta15 → 0.3.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7640fc151eabbf4abbcd390ce9633d85638fd7a9d9580652af69567be2c02178
-  data.tar.gz: 39976b40a0987b36f01b6ed835ea6f32486ef5a6e512eeae522c2e431d3b0c06
+  metadata.gz: 4459cc1c5b400de2e07ab808a8788c3364965bf5f332cc45fafe8388e04e2d59
+  data.tar.gz: 1fc19515ad7da4d62f21b8437e58f70e4af65954cdcb2953e5e820c298935476
 SHA512:
-  metadata.gz: abae67de65b6c5e5af29da2f3cca84122e145ef6b2c460ee3bc71aa05c3d1c4bf67d2973a5ea5e65bf43437c5a64849a449b3e50909ea11dee7a1c2049f3c95b
-  data.tar.gz: a6d2036b16727cf72b13a1622ddf49e62eda37ca70fb9c48a41a730cfead991e75485aa6deb5160be0f7c3739f6f9147606c0755a7b9d7f2e72f085473016107
+  metadata.gz: cb97e1c203a0078a1023e30e2f0206a28fd1020edee11108bd88ac081fb35909eb8637d616e1e81b0390ad54905573534147d3e57a660695c033b129113fbaec
+  data.tar.gz: aa521cc3dc479d4b37cb9447b7ff2985b96c68323c586d060911d94b445edd1bf680b7094ab88b4a2cca0ebf6f6e0424f0e941d85155a14e7085db114ef9a22b

data/lib/kamal_backup/command.rb

@@ -1,4 +1,5 @@
 require "open3"
+require "pty"
 require "securerandom"
 require "shellwords"
 require_relative "errors"
@@ -250,6 +251,39 @@ module KamalBackup
         raise command_not_found(spec, e)
       end
 
+      def capture_pty(spec, redactor:, tee_stdout: nil)
+        output = +""
+        tee_buffer = +""
+        result = nil
+
+        PTY.spawn(spec.env, *spec.argv) do |reader, writer, pid|
+          writer.close
+
+          begin
+            loop do
+              chunk = reader.readpartial(16 * 1024)
+              output << chunk
+              tee_buffer = tee_stream(tee_stdout, redactor, tee_buffer, chunk) if tee_stdout
+            end
+          rescue EOFError, Errno::EIO
+            flush_tee_stream(tee_stdout, redactor, tee_buffer) if tee_stdout
+          ensure
+            reader.close unless reader.closed?
+          end
+
+          _, status = Process.wait2(pid)
+          result = CommandResult.new(stdout: output, stderr: "", status: status.exitstatus, streamed: !!tee_stdout)
+
+          unless status.success?
+            raise command_failure(spec, status.exitstatus, output, output, redactor)
+          end
+        end
+
+        result
+      rescue Errno::ENOENT => e
+        raise command_not_found(spec, e)
+      end
+
       def collect_stream(io, command_output: self.output, context: nil, stream: :stdout, log_output: true, tee_io: nil, redactor: nil)
         captured_output = +""
         tee_buffer = +""

data/lib/kamal_backup/kamal_bridge.rb

@@ -219,7 +219,7 @@ module KamalBackup
         argv
       end
 
-      def capture_kamal(argv, stream: false, log: !stream, stdout: @stdout, stderr: @stderr)
+      def capture_kamal(argv, stream: false, log: !stream, stdout: @stdout, stderr: @stderr, pty: false)
         spec = CommandSpec.new(argv: argv, env: kamal_stream_env(stream))
         options = {
           redactor: @redactor,
@@ -230,7 +230,15 @@ module KamalBackup
         }
 
         if defined?(Bundler)
-          Bundler.with_unbundled_env { Command.capture(spec, **options) }
+          Bundler.with_unbundled_env { capture_command(spec, options, pty: pty) }
+        else
+          capture_command(spec, options, pty: pty)
+        end
+      end
+
+      def capture_command(spec, options, pty:)
+        if pty
+          Command.capture_pty(spec, redactor: options.fetch(:redactor), tee_stdout: options[:tee_stdout])
         else
           Command.capture(spec, **options)
         end
@@ -249,7 +257,8 @@ module KamalBackup
           kamal_exec_argv(accessory_name, command, interactive: true),
           stream: true,
           log: false,
-          stdout: filtered_interactive_stdout
+          stdout: filtered_interactive_stdout,
+          pty: true
         )
         Command.output&.command_exit(context, result.status) if context
         result
@@ -260,7 +269,8 @@ module KamalBackup
 
       def filtered_interactive_stdout
         FilteringIO.new(@stdout) do |output|
-          output == "Launching interactive command via SSH from existing container...\n"
+          stripped = output.to_s.gsub(/\e\[[0-9;]*m/, "").delete("\r").strip
+          stripped == "Launching interactive command via SSH from existing container..."
         end
       end
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta15"
+  VERSION = "0.3.0.beta16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta15
+  version: 0.3.0.beta16
 platform: ruby
 authors:
 - crmne