kamal-backup 0.3.0 → 0.4.0

data/lib/kamal_backup/restic.rb

@@ -91,14 +91,6 @@ module KamalBackup
       run(['backup'] + host_args + exclude_args(excludes) + paths + tag_args(common_tags + tags + path_tags))
     end
 
-    def backup_path(path, tags:)
-      backup_paths([path], tags: tags)
-    end
-
-    def forget_after_success
-      prune
-    end
-
     def prune
       retention_tag_sets.map do |tags|
         args = ['forget', '--prune', '--group-by', 'host'] + config.retention_args + filter_tag_args(tags)
@@ -107,6 +99,11 @@ module KamalBackup
       end
     end
 
+    def unlock
+      log('clearing stale restic locks')
+      run(%w[unlock])
+    end
+
     def check
       args = %w[check]
       args.concat(['--read-data-subset', config.check_read_data_subset]) if config.check_read_data_subset
@@ -150,21 +147,25 @@ module KamalBackup
       end
     end
 
-    def database_file(snapshot, adapter, database_name: nil)
+    # Database dumps from 0.2 and earlier used different layouts. Keep matching
+    # them so snapshots taken before 0.3 stay restorable:
+    # databases/<app>/<database>/<adapter>.<ext> is current,
+    # databases/<app>/<adapter>/... is 0.2 (no database name), and the
+    # databases-<app>-... basenames are the earliest flat filenames.
+    def database_file(snapshot, adapter, database_name:)
       legacy_prefix = "databases/#{config.app_name}/#{adapter}/"
       app = config.app_name.gsub(/[^A-Za-z0-9_.-]+/, '-')
       database = database_name.to_s.gsub(/[^A-Za-z0-9_.-]+/, '-')
-      stable_prefix = database.empty? ? nil : "databases/#{app}/#{database}/#{adapter}."
+      prefix = "databases/#{app}/#{database}/#{adapter}."
       flat_prefix = "databases-#{app}-#{adapter}-"
-      named_flat_prefix = database.empty? ? nil : "databases-#{app}-#{database}-#{adapter}-"
+      named_flat_prefix = "databases-#{app}-#{database}-#{adapter}-"
       ls_json(snapshot).find do |entry|
         next false unless entry['type'] == 'file'
 
         normalized = entry['path'].to_s.sub(%r{\A/+}, '')
-        (stable_prefix && normalized.start_with?(stable_prefix)) ||
+        normalized.start_with?(prefix) ||
           normalized.start_with?(legacy_prefix) ||
-          File.basename(normalized).start_with?(flat_prefix) ||
-          (named_flat_prefix && File.basename(normalized).start_with?(named_flat_prefix))
+          File.basename(normalized).start_with?(flat_prefix, named_flat_prefix)
       end&.fetch('path')
     end
 
@@ -208,6 +209,8 @@ module KamalBackup
       run(['restore', snapshot, '--target', target])
     end
 
+    private
+
     def run(args, log_output: true)
       Command.capture(
         CommandSpec.new(argv: ['restic'] + args, env: restic_env),
@@ -220,7 +223,26 @@ module KamalBackup
       ['kamal-backup', "app:#{config.app_name}"]
     end
 
-    private
+    def host_args
+      ['--host', restic_host]
+    end
+
+    def restic_host
+      normalize_restic_host([config.app_name, config.accessory_name || 'backup'].compact.join('-'))
+    end
+
+    def normalize_restic_host(value)
+      normalized = value.to_s.gsub(/[^A-Za-z0-9_.-]+/, '-').gsub(/\A-+|-+\z/, '')
+      normalized.empty? ? 'kamal-backup' : normalized
+    end
+
+    def tag_args(tags)
+      tags.compact.each_with_object([]) { |tag, args| args.concat(['--tag', tag]) }
+    end
+
+    def exclude_args(patterns)
+      patterns.compact.each_with_object([]) { |pattern, args| args.concat(['--exclude', pattern]) }
+    end
 
     def retention_tag_sets
       database_retention_tag_sets + file_retention_tag_sets
@@ -229,8 +251,8 @@ module KamalBackup
     def database_retention_tag_sets
       config.databases.group_by(&:database_adapter).flat_map do |adapter, databases|
         if databases.one?
-          # Pre-0.3 database snapshots did not include database:<name>, so keep
-          # the single-database filter broad enough for retention to prune them.
+          # Snapshots from 0.2 carry no database:<name> tag, so keep the
+          # single-database filter broad enough for retention to prune them too.
           [common_tags + ['type:database', "adapter:#{adapter}"]]
         else
           databases.map do |database|
@@ -248,25 +270,13 @@ module KamalBackup
       tags.reject { |tag| tag == 'kamal-backup' || tag.start_with?('app:') }.join(', ')
     end
 
-    def tag_args(tags)
-      tags.compact.each_with_object([]) { |tag, args| args.concat(['--tag', tag]) }
-    end
-
-    def exclude_args(patterns)
-      patterns.compact.each_with_object([]) { |pattern, args| args.concat(['--exclude', pattern]) }
-    end
-
-    def host_args
-      ['--host', restic_host]
-    end
-
-    def restic_host
-      normalize_restic_host([config.app_name, config.accessory_name || 'backup'].compact.join('-'))
-    end
-
-    def normalize_restic_host(value)
-      normalized = value.to_s.gsub(/[^A-Za-z0-9_.-]+/, '-').gsub(/\A-+|-+\z/, '')
-      normalized.empty? ? 'kamal-backup' : normalized
+    def write_last_check(payload)
+      FileUtils.mkdir_p(config.state_dir)
+      File.write(config.last_check_path, JSON.pretty_generate(payload.transform_values do |value|
+        value.respond_to?(:iso8601) ? value.iso8601 : redactor.redact_string(value.to_s)
+      end))
+    rescue SystemCallError
+      nil
     end
 
     def filter_tag_args(tags)
@@ -360,15 +370,6 @@ module KamalBackup
       )
     end
 
-    def write_last_check(payload)
-      FileUtils.mkdir_p(config.state_dir)
-      File.write(config.last_check_path, JSON.pretty_generate(payload.transform_values do |value|
-        value.respond_to?(:iso8601) ? value.iso8601 : redactor.redact_string(value.to_s)
-      end))
-    rescue SystemCallError
-      nil
-    end
-
     def log(message)
       if Command.output
         Command.output.info(message, redactor: redactor)

data/lib/kamal_backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KamalBackup
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/kamal_backup/yaml_access.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module KamalBackup
+  # Kamal and Rails YAML configs mix string and symbol keys depending on how
+  # they were rendered, so look up both.
+  module YamlAccess
+    private
+
+    def fetch(hash, key)
+      hash[key] || hash[key.to_s] || hash[key.to_sym]
+    end
+  end
+end

data/lib/kamal_backup.rb

@@ -3,8 +3,11 @@
 require_relative 'kamal_backup/version'
 require_relative 'kamal_backup/schema'
 require_relative 'kamal_backup/errors'
+require_relative 'kamal_backup/yaml_access'
 require_relative 'kamal_backup/command'
+require_relative 'kamal_backup/command_output'
 require_relative 'kamal_backup/redactor'
+require_relative 'kamal_backup/config_file'
 require_relative 'kamal_backup/config'
 require_relative 'kamal_backup/rails_app'
 require_relative 'kamal_backup/kamal_bridge'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - crmne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-06 00:00:00.000000000 Z
+date: 2026-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -26,6 +26,20 @@ dependencies:
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Back up PostgreSQL, MySQL, SQLite, and file-backed Active Storage files
   into restic on a schedule, then run restore drills and produce review evidence.
 email:
@@ -80,8 +122,11 @@ files:
 - lib/kamal_backup.rb
 - lib/kamal_backup/app.rb
 - lib/kamal_backup/cli.rb
+- lib/kamal_backup/cli/helpers.rb
 - lib/kamal_backup/command.rb
+- lib/kamal_backup/command_output.rb
 - lib/kamal_backup/config.rb
+- lib/kamal_backup/config_file.rb
 - lib/kamal_backup/databases/base.rb
 - lib/kamal_backup/databases/mysql.rb
 - lib/kamal_backup/databases/postgres.rb
@@ -95,6 +140,7 @@ files:
 - lib/kamal_backup/scheduler.rb
 - lib/kamal_backup/schema.rb
 - lib/kamal_backup/version.rb
+- lib/kamal_backup/yaml_access.rb
 homepage: https://github.com/crmne/kamal-backup
 licenses:
 - MIT