kamal-backup 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49afc009b695f3cf7f456e1b68b2b744f5adc7138f7ca4d0c84ffb1f0d3b766d
-  data.tar.gz: fc0261dc6c744a19e02460f27aab7e8f7555de779ea1fe7827a2fdf077042071
+  metadata.gz: '009f30f01097f555a3406c2c95920e902f558a878ec3b9a979966a469f5a8bc6'
+  data.tar.gz: 80c16762979f20700d77ee7bcb4dc5304af995e32902e5010cc4be019ee83744
 SHA512:
-  metadata.gz: 39839b0f31f1e5a9bf561e63ee2248330d1857f5f21c2736e1668aed2e226c79e3c6063c6195a6bb09e05c180bfd42a6cd6901271638e3dbba2a36ab8146844f
-  data.tar.gz: 3bb459e3ff320cff130ac29c523a09c50b85b3efb98ad977410cdd2db0a53e333fce935f8a92aaa65325b7d421ce36be4ed92c49a6f46d5836184f2a4009e94e
+  metadata.gz: ccda8ac86c357f17665bf66956c40c20838a07271a3fbb4c7e5c4e959f240229a6f78c8fe5efe3641a25ead65f4ea14c945db8724319e019b365a98356657d8c
+  data.tar.gz: 794c437faa846c180290bd86c631fef310ff6066a5c5948efedd1a76f24e505e2f62b1acd5b76f8cd78d44aa263d6e84329e98ec2ed78cacd1560099024645a8

data/lib/kamal_backup/kamal_bridge.rb

@@ -6,11 +6,12 @@ module KamalBackup
     DEFAULT_CONFIG_FILE = "config/deploy.yml"
     VERSION_LINE_PATTERN = /\A\d+(?:\.\d+)+(?:[-.][A-Za-z0-9]+)*\z/
 
-    def initialize(redactor:, config_file: nil, destination: nil, env: ENV)
+    def initialize(redactor:, config_file: nil, destination: nil, env: ENV, cwd: Dir.pwd)
       @redactor = redactor
       @config_file = config_file
       @destination = destination
       @env = env
+      @cwd = cwd
     end
 
     def accessory_name(preferred: nil)
@@ -159,7 +160,7 @@ module KamalBackup
 
       def kamal_config_argv
         [
-          "kamal",
+          *kamal_command,
           "config",
           *kamal_option_argv,
           "--version",
@@ -169,24 +170,34 @@ module KamalBackup
 
       def kamal_exec_argv(accessory_name, command)
         [
-          "kamal",
+          *kamal_command,
           "accessory",
           "exec",
+          *kamal_option_argv,
           accessory_name,
-          command,
-          *kamal_option_argv
+          command
         ]
       end
 
       def kamal_secrets_print_argv
         [
-          "kamal",
+          *kamal_command,
           "secrets",
           "print",
           *kamal_option_argv
         ]
       end
 
+      def kamal_command
+        if File.executable?(File.join(@cwd, "bin", "kamal"))
+          [ "bin/kamal" ]
+        elsif File.file?(File.join(@cwd, "Gemfile"))
+          [ "bundle", "exec", "kamal" ]
+        else
+          [ "kamal" ]
+        end
+      end
+
       def kamal_option_argv
         argv = []
         argv.concat(["-c", @config_file]) if @config_file

data/lib/kamal_backup/scheduler.rb

@@ -9,6 +9,9 @@ module KamalBackup
     end
 
     def run
+      $stdout.sync = true
+      $stderr.sync = true
+
       install_signal_handlers
       sleep_interruptibly(@config.backup_start_delay_seconds)
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - crmne