kamal-backup 0.3.0.beta2 → 0.3.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55945234709fcf743588fe6fadf7873ff43dcc832a2bc8303e42ba67e15c13db
-  data.tar.gz: a3e05e3428bdcceafa37d2dc2f0cdea53d50e204f7c9345e38308be0085ba9ea
+  metadata.gz: 78778951b0506ad5ef03f4e644f19a76ab1f7a882512f2a65cf23e1e53557669
+  data.tar.gz: 24c346091e522d02a9233bdffec2b86e7acc3e704485498039d6506fc9780f77
 SHA512:
-  metadata.gz: f23ce66cf13a8b420d6171e16489f2c4e2bc44c522b222637eac0ac809e1092e8634396589a1ea4b58c9f01e3ef446f57e4b8f38a157be3423e482cbe8bd2e9a
-  data.tar.gz: 103ff0d7ffb950b7f6927a8c22591e7f91c8cc06d5456bb04a6b119eda21f7198aa949375d19e3689040db34c8c2a4dc8ed4b2ab6e59911672e4b9033b700fe5
+  metadata.gz: a7642dd936a98360f3fb2230a7886878342ba4bb5c68df5ee250bb11ad6d917cfafcc72f86a9d5759edba35d928c298d4639eabab0b252ed54bf2f1e7fad67af
+  data.tar.gz: 24bd2e79792381abf43a3f9f846eb2665596d1b67e4a47cd687717009c119ab51a830447ee52dc37ce40ae10da19bc08ce0d75ce2dccf1d1cf3e289c910ecdc3

data/lib/kamal_backup/config.rb

@@ -592,6 +592,8 @@ module KamalBackup
           end
         end
 
+        env.merge!(normalize_yaml_restic_rest(hash["rest"], raw_env: raw_env, path: path)) if hash.key?("rest")
+
         {
           "init_if_missing" => "RESTIC_INIT_IF_MISSING",
           "check_after_backup" => "RESTIC_CHECK_AFTER_BACKUP",
@@ -635,6 +637,16 @@ module KamalBackup
         end
       end
 
+      def normalize_yaml_restic_rest(raw_value, raw_env:, path:)
+        hash = require_mapping(raw_value, "#{path} restic.rest")
+        env = {}
+        username = hash.key?("username") ? hash["username"] : hash["user"]
+
+        env["RESTIC_REST_USERNAME"] = resolve_yaml_value(username, raw_env: raw_env, context: "#{path} restic.rest.username") if username
+        env["RESTIC_REST_PASSWORD"] = resolve_yaml_value(hash["password"], raw_env: raw_env, context: "#{path} restic.rest.password") if hash.key?("password")
+        env.compact
+      end
+
       def normalize_yaml_backup(raw_value, path:)
         hash = require_mapping(raw_value, "#{path} backup")
         env = {}

data/lib/kamal_backup/restic.rb

@@ -75,9 +75,11 @@ module KamalBackup
     end
 
     def forget_after_success
-      args = ["forget", "--prune"] + config.retention_args + tag_args(common_tags)
-      log("running restic forget/prune with retention policy")
-      run(args)
+      retention_tag_sets.each do |tags|
+        args = ["forget", "--prune", "--group-by", "host"] + config.retention_args + filter_tag_args(tags)
+        log("running restic forget/prune with retention policy for #{retention_scope(tags)}")
+        run(args)
+      end
     end
 
     def check
@@ -93,11 +95,11 @@ module KamalBackup
     end
 
     def snapshots(tags: common_tags)
-      run(["snapshots"] + tag_args(tags))
+      run(["snapshots"] + filter_tag_args(tags))
     end
 
     def snapshots_json(tags: common_tags)
-      output = run(["snapshots", "--json"] + tag_args(tags)).stdout
+      output = run(["snapshots", "--json"] + filter_tag_args(tags)).stdout
       snapshots = JSON.parse(output)
       required_tags = tags.compact
       snapshots.select do |snapshot|
@@ -181,10 +183,41 @@ module KamalBackup
     end
 
     private
+      def retention_tag_sets
+        database_retention_tag_sets + file_retention_tag_sets
+      end
+
+      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.
+            [common_tags + ["type:database", "adapter:#{adapter}"]]
+          else
+            databases.map do |database|
+              common_tags + ["type:database", "database:#{database.database_name}", "adapter:#{adapter}"]
+            end
+          end
+        end
+      end
+
+      def file_retention_tag_sets
+        config.backup_paths.any? ? [common_tags + ["type:files"]] : []
+      end
+
+      def retention_scope(tags)
+        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 filter_tag_args(tags)
+        tags = tags.compact
+        tags.empty? ? [] : ["--tag", tags.join(",")]
+      end
+
       def restic_env
         config.env.each_with_object({}) do |(key, value), env|
           env[key] = value if key.to_s.match?(RESTIC_ENV_PATTERN)

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta2"
+  VERSION = "0.3.0.beta4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta2
+  version: 0.3.0.beta4
 platform: ruby
 authors:
 - crmne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-27 00:00:00.000000000 Z
+date: 2026-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor