kamal-backup 0.3.0.beta7 → 0.3.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841b29d2ee8cc4598cb1880da4a7bf884cef141816432a9d960ff400b7535d25
-  data.tar.gz: 3784f1bfe50f1480f457bfb40a18e30ab5905db4a300a193fe5d68ac50d67f2f
+  metadata.gz: d920c58d8ff83794df465f0549d8599ea6a5e815b800221fa850ce024241abfa
+  data.tar.gz: feb8374a19862349d1fb0b3d55e3e697b45df66d58fc0c0f63ddba4767ed01f9
 SHA512:
-  metadata.gz: 9929349441963b8297254c10faa1446cf4f7602638a7637ab655ffcadb32d31d012ea8827890fc29175dfc4e344a5afc1edacbf960cfe86d6aec2a83c88385c6
-  data.tar.gz: fbfee00eae64424a92e5d039512ff51d01abecb6dd6a61d8d44ec97dc2e86208f06fd5c191947107a9c9adaa4da80a77a9eebabc9e9e12b96d7e60dcb0ce0e06
+  metadata.gz: 9e36489f2557dca0695be87b779a9b20f96148b141e67a9422bc8933c925ea68a17a73d221c56f4a51585258194752f0db4f0b6fed4a4845783334e6dc0d8e0e
+  data.tar.gz: f8bb63eb69f7da8bdfcc001e07c95495ac60fa6996eb4b4188cfb2a8bc453979176985703f897c8e5ac4a9b02faec5cf3d76aad15862b0c964d6c961c2910556

data/lib/kamal_backup/cli.rb

@@ -129,11 +129,13 @@ module KamalBackup
 
       def print_remote_version_status
         status = remote_version == VERSION ? "in sync" : "out of sync"
+        status_color = status == "in sync" ? :green : :red
+        status_output = CommandOutput.new(io: $stdout, env: command_env)
 
         puts("local: #{VERSION}")
         puts("remote: #{remote_version}")
-        puts("status: #{status}")
-        puts("fix: #{accessory_reboot_command}") if status == "out of sync"
+        puts("status: #{status_output.decorate(status, status_color, :bold)}")
+        puts("fix: #{status_output.decorate(accessory_reboot_command, :yellow, :bold)}") if status == "out of sync"
       end
 
       def validate_deploy_config
@@ -399,14 +401,17 @@ module KamalBackup
 
     def self.start(argv = ARGV, env: ENV)
       self.command_env = env
-      Command.with_output(CommandOutput.new(io: $stderr)) do
+      output = CommandOutput.new(io: $stderr, env: env)
+      Command.with_output(output) do
         super(normalize_global_options(argv))
       end
     rescue Error => e
-      warn("kamal-backup: #{Redactor.new(env: env).redact_string(e.message)}")
+      output ||= CommandOutput.new(io: $stderr, env: env)
+      output.error("(#{e.class}): #{e.message}", redactor: Redactor.new(env: env))
       exit(1)
     rescue Interrupt
-      warn("kamal-backup: interrupted")
+      output ||= CommandOutput.new(io: $stderr, env: env)
+      output.error("(Interrupt): interrupted", redactor: Redactor.new(env: env))
       exit(130)
     ensure
       self.command_env = nil

data/lib/kamal_backup/command.rb

@@ -72,6 +72,14 @@ module KamalBackup
       write_message("INFO", redactor.redact_string(message))
     end
 
+    def error(message, redactor:)
+      write_message("ERROR", colorize(redactor.redact_string(message), :red, :bold))
+    end
+
+    def decorate(value, color, mode = nil)
+      colorize(value, color, mode)
+    end
+
     def command_start(spec, redactor:)
       id = SecureRandom.hex(4)
       started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)

data/lib/kamal_backup/kamal_bridge.rb

@@ -215,10 +215,10 @@ module KamalBackup
       end
 
       def capture_kamal(argv, stream: false)
-        spec = CommandSpec.new(argv: argv)
+        spec = CommandSpec.new(argv: argv, env: kamal_stream_env(stream))
         options = {
           redactor: @redactor,
-          log: false,
+          log: !stream,
           log_output: false,
           tee_stdout: stream ? @stdout : nil,
           tee_stderr: stream ? @stderr : nil
@@ -231,6 +231,20 @@ module KamalBackup
         end
       end
 
+      def kamal_stream_env(stream)
+        return {} unless stream
+
+        if @env["SSHKIT_COLOR"].to_s.empty?
+          stream_color? ? { "SSHKIT_COLOR" => "1" } : {}
+        else
+          { "SSHKIT_COLOR" => @env["SSHKIT_COLOR"] }
+        end
+      end
+
+      def stream_color?
+        [@stdout, @stderr].any? { |io| io.respond_to?(:tty?) && io.tty? }
+      end
+
       def parse_version_line(output)
         output.to_s.lines.map(&:strip).reverse.find { |line| line.match?(VERSION_LINE_PATTERN) }.to_s
       end

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta7"
+  VERSION = "0.3.0.beta8"
 end

metadata

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