kamal-backup 0.3.0.beta13 → 0.3.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db60902f3b1adadb65d4cadd4c97939976e9fd2c9508ced7972417d63996e0f
-  data.tar.gz: 61a0ec544ee7ca806c698e53fd5b22896b08d309bd8d51ccb23a9cd23a4110f0
+  metadata.gz: 7640fc151eabbf4abbcd390ce9633d85638fd7a9d9580652af69567be2c02178
+  data.tar.gz: 39976b40a0987b36f01b6ed835ea6f32486ef5a6e512eeae522c2e431d3b0c06
 SHA512:
-  metadata.gz: 0b17700d7f5ffaf7db4a2f56ad4b2efd6378281242b32f90937e8e8f3a94e3007d403a8fc7e15a54ba06f69e5532b2abacec2d891ee4c6be9d3ecceddebea30a
-  data.tar.gz: 95fb53b3513d242ea36b0b1beecbe5791d48a549b1320898941caa3e7e191930954ecef33171d3b1cfaf750b9c376691c2930ce6fd32814abcbe87c432d5afa4
+  metadata.gz: abae67de65b6c5e5af29da2f3cca84122e145ef6b2c460ee3bc71aa05c3d1c4bf67d2973a5ea5e65bf43437c5a64849a449b3e50909ea11dee7a1c2049f3c95b
+  data.tar.gz: a6d2036b16727cf72b13a1622ddf49e62eda37ca70fb9c48a41a730cfead991e75485aa6deb5160be0f7c3739f6f9147606c0755a7b9d7f2e72f085473016107

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,102 @@ 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
+
+        return hosts.first if hosts.size == 1
+        return if hosts.any?
+
+        all_hosts = normalized_hosts(fetch(config, :hosts))
+        all_hosts.first if all_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 = service_from_rendered_config if service.empty?
+        "#{service}-#{accessory_name}" unless service.empty?
+      end
+
+      def service_from_rendered_config
+        service_with_version = fetch(config, :service_with_version).to_s
+        version = fetch(config, :version).to_s
+        suffix = "-#{version}"
+
+        if !service_with_version.empty? && !version.empty? && service_with_version.end_with?(suffix)
+          service_with_version.delete_suffix(suffix)
+        end
+      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.beta13"
+  VERSION = "0.3.0.beta15"
 end

metadata

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