kamal-backup 0.3.0.beta12 → 0.3.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ee96d9a7a664d18460f7143c466ebe6d6d75a70031c0c75a070fae2e3fa64b
-  data.tar.gz: 02bc406f76d5010cd9c382c5b6ea4d17bb8dce0dab50d2742d86bec9e7bb93cc
+  metadata.gz: 78dad6331e7a06890125c303e9631e8701d6a1aeffe953134905456910a9e445
+  data.tar.gz: af988f114c9449b3f5d6fe8fecb6b09ecddddf20887aadf7d98700b8f2023c5d
 SHA512:
-  metadata.gz: 45d35e27cb88d61a8996ed5b2158fc59e3f9ef51b615e88919efd83d6174b044d60984d8be5ac15d937229c5b2a9ded61f90053afb5a6569ddb2f8c824b88bad
-  data.tar.gz: 5d0c18b5faf002497831421773ede6b4d50805fdb8d70490c6746b0229f06cf44b59a1c2683913439f4de186aeb2388c69acd97f965d52e266b8921ed4fb2a86
+  metadata.gz: 7af73531536f8179425f95ebd4b5a9d3522e4fe0e2a109564795a4da318e73b9b85e26427bb4d7ee7b388cea94deb9f1670b9ca18c7b5a4592d8906182b9c794
+  data.tar.gz: 4b32db0463641ca0f51dc35f23cb5b6d00bc36ac09518921efec1636d0517bc39624d1ef36fc1f86ad53efb554dd880c583dd5e9e5f4ff6c9efe39a3b5888d75

data/lib/kamal_backup/command.rb

@@ -5,10 +5,11 @@ require_relative "errors"
 
 module KamalBackup
   class CommandSpec
-    attr_reader :argv, :env
+    attr_reader :argv, :env, :host
 
-    def initialize(argv:, env: {})
+    def initialize(argv:, env: {}, host: nil)
       @argv = Array(argv).compact.map(&:to_s)
+      @host = host.to_s unless host.to_s.empty?
       @env = env.each_with_object({}) do |(key, value), result|
         next if value.nil? || value.to_s.empty?
 
@@ -85,7 +86,7 @@ module KamalBackup
       started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       display = spec.display(redactor)
 
-      write_message("INFO", "Running #{colorize(display, :yellow, :bold)} #{local_target}", id)
+      write_message("INFO", "Running #{colorize(display, :yellow, :bold)} #{target_for(spec)}", id)
       write_message("DEBUG", "Command: #{colorize(display, :blue)}", id)
 
       { id: id, started_at: started_at, redactor: redactor }
@@ -177,6 +178,14 @@ module KamalBackup
         end
       end
 
+      def target_for(spec)
+        if spec.host
+          "on #{colorize(spec.host, :blue)}"
+        else
+          local_target
+        end
+      end
+
       def log_level?(level)
         LEVELS.fetch(level) >= @verbosity
       end

data/lib/kamal_backup/kamal_bridge.rb

@@ -53,7 +53,11 @@ module KamalBackup
     end
 
     def execute_on_accessory(accessory_name:, command:, stream: false)
-      capture_kamal(kamal_exec_argv(accessory_name, command), stream: stream)
+      if stream && (target = live_accessory_target(accessory_name))
+        execute_on_accessory_live(accessory_name: accessory_name, command: command, target: target)
+      else
+        capture_kamal(kamal_exec_argv(accessory_name, command), stream: stream)
+      end
     end
 
     def remote_version(accessory_name:)
@@ -176,12 +180,13 @@ module KamalBackup
         ]
       end
 
-      def kamal_exec_argv(accessory_name, command)
+      def kamal_exec_argv(accessory_name, command, interactive: false)
         [
           *kamal_command,
           "accessory",
           "exec",
           *kamal_option_argv,
+          *(["--interactive"] if interactive),
           "--reuse",
           accessory_name,
           command
@@ -214,14 +219,14 @@ module KamalBackup
         argv
       end
 
-      def capture_kamal(argv, stream: false)
+      def capture_kamal(argv, stream: false, log: !stream, stdout: @stdout, stderr: @stderr)
         spec = CommandSpec.new(argv: argv, env: kamal_stream_env(stream))
         options = {
           redactor: @redactor,
-          log: !stream,
+          log: log,
           log_output: false,
-          tee_stdout: stream ? @stdout : nil,
-          tee_stderr: stream ? @stderr : nil
+          tee_stdout: stream ? stdout : nil,
+          tee_stderr: stream ? stderr : nil
         }
 
         if defined?(Bundler)
@@ -231,6 +236,87 @@ module KamalBackup
         end
       end
 
+      def execute_on_accessory_live(accessory_name:, command:, target:)
+        @stdout.puts("Launching command from existing container...")
+
+        spec = CommandSpec.new(
+          argv: ["docker", "exec", target.fetch(:service_name), *Shellwords.split(command)],
+          host: target.fetch(:host)
+        )
+        context = Command.output&.command_start(spec, redactor: @redactor)
+
+        result = capture_kamal(
+          kamal_exec_argv(accessory_name, command, interactive: true),
+          stream: true,
+          log: false,
+          stdout: filtered_interactive_stdout
+        )
+        Command.output&.command_exit(context, result.status) if context
+        result
+      rescue CommandError => e
+        Command.output&.command_exit(context, e.status || 1) if context
+        raise
+      end
+
+      def filtered_interactive_stdout
+        FilteringIO.new(@stdout) do |output|
+          output == "Launching interactive command via SSH from existing container...\n"
+        end
+      end
+
+      def live_accessory_target(accessory_name)
+        return unless defined?(@config)
+
+        accessory_config = accessory(accessory_name)
+        host = single_accessory_host(accessory_config)
+        service_name = fetch(accessory_config, :service) || default_accessory_service_name(accessory_name)
+
+        { host: host, service_name: service_name } if host && service_name
+      rescue ConfigurationError, KeyError, NoMethodError, TypeError
+        nil
+      end
+
+      def single_accessory_host(accessory_config)
+        hosts = if host = fetch(accessory_config, :host)
+          normalized_hosts(host)
+        else
+          normalized_hosts(fetch(accessory_config, :hosts))
+        end
+
+        hosts.first if hosts.size == 1
+      end
+
+      def normalized_hosts(value)
+        case value
+        when nil
+          []
+        when Array
+          value.map(&:to_s).reject(&:empty?)
+        else
+          [value.to_s].reject(&:empty?)
+        end
+      end
+
+      def default_accessory_service_name(accessory_name)
+        service = fetch(config, :service).to_s
+        "#{service}-#{accessory_name}" unless service.empty?
+      end
+
+      class FilteringIO
+        def initialize(io, &reject)
+          @io = io
+          @reject = reject
+        end
+
+        def print(output)
+          @io.print(output) unless @reject.call(output.to_s)
+        end
+
+        def flush
+          @io.flush if @io.respond_to?(:flush)
+        end
+      end
+
       def kamal_stream_env(stream)
         return {} unless stream
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta12"
+  VERSION = "0.3.0.beta14"
 end

metadata

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