kamal-backup 0.3.0.beta15 → 0.3.0.beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7640fc151eabbf4abbcd390ce9633d85638fd7a9d9580652af69567be2c02178
-  data.tar.gz: 39976b40a0987b36f01b6ed835ea6f32486ef5a6e512eeae522c2e431d3b0c06
+  metadata.gz: 88d55c67a4d6276ea516c9d3149ee486c3da3587a438856fa08ba0050f0b99d0
+  data.tar.gz: '09290fe105b1ef100c9d59f8631426f86ee169977cb5561e4308aec05f3e3eb5'
 SHA512:
-  metadata.gz: abae67de65b6c5e5af29da2f3cca84122e145ef6b2c460ee3bc71aa05c3d1c4bf67d2973a5ea5e65bf43437c5a64849a449b3e50909ea11dee7a1c2049f3c95b
-  data.tar.gz: a6d2036b16727cf72b13a1622ddf49e62eda37ca70fb9c48a41a730cfead991e75485aa6deb5160be0f7c3739f6f9147606c0755a7b9d7f2e72f085473016107
+  metadata.gz: 3f0de6a3b23a06e127b860b63d2227ba154272ef6da3e011943f8d82fae445b4f676ae89e8f52931aaf11ea142c73d5fb417e8e360c04912bb42604d2fcf6b76
+  data.tar.gz: a26fb0fbc1b23f03a0e3316606e07c3df718368e42bb3ac8d082218dc9c1bf4e3ff010695812e3532b1f09bd1c878b979aaff0098b9c04389c07abd097a38354

data/lib/kamal_backup/command.rb

@@ -1,4 +1,5 @@
 require "open3"
+require "pty"
 require "securerandom"
 require "shellwords"
 require_relative "errors"
@@ -169,6 +170,10 @@ module KamalBackup
       end
 
       def local_target
+        if remote_host = @env["KAMAL_HOST"].to_s
+          return "on #{colorize(remote_host, :blue)}" unless remote_host.empty?
+        end
+
         user = @env["USER"].to_s.empty? ? @env["USERNAME"].to_s : @env["USER"].to_s
 
         if user.empty?
@@ -250,6 +255,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,9 @@ 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..." ||
+            stripped.match?(/\AConnection to .+ closed\.\z/)
         end
       end
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta15"
+  VERSION = "0.3.0.beta17"
 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.beta17
 platform: ruby
 authors:
 - crmne