kamal-backup 0.3.0.beta4 → 0.3.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78778951b0506ad5ef03f4e644f19a76ab1f7a882512f2a65cf23e1e53557669
-  data.tar.gz: 24c346091e522d02a9233bdffec2b86e7acc3e704485498039d6506fc9780f77
+  metadata.gz: 0b92197e0f2d480ca2cebd5e2505304686b739ca0ed4c61c24b4b4caca39054d
+  data.tar.gz: ff2b00e495d6690956d1ed8070bc43989ca1a9e4b9846b6503ababa26adbd01f
 SHA512:
-  metadata.gz: a7642dd936a98360f3fb2230a7886878342ba4bb5c68df5ee250bb11ad6d917cfafcc72f86a9d5759edba35d928c298d4639eabab0b252ed54bf2f1e7fad67af
-  data.tar.gz: 24bd2e79792381abf43a3f9f846eb2665596d1b67e4a47cd687717009c119ab51a830447ee52dc37ce40ae10da19bc08ce0d75ce2dccf1d1cf3e289c910ecdc3
+  metadata.gz: c8f93d59add03f4bf66b48ae0ea61cf46c7682c527ac604fcbd98a8c0790e6cc77d9d45759fabbfb5d6fcbce25da0e82b421f56cc8771820c57b1933539634c2
+  data.tar.gz: ebd54357f4bdc1829a71cb76fcef4e60000661ce7eb8f4d1a974fb22438b1054fe96bfa26095509d74fd50e5a13d5e234fa0c845440c8f33ddfd49e798b307f4

data/README.md

@@ -141,7 +141,7 @@ Run the release helper from a clean `master` checkout:
 bin/release 0.2.9
 ```
 
-It updates `lib/kamal_backup/version.rb`, runs the test suite and docs build, commits `Release 0.2.9`, and pushes `master`. CI publishes the RubyGem and Docker image tags first, then creates `v0.2.9`, the GitHub release, and the docs deployment from the release commit.
+It updates `lib/kamal_backup/version.rb`, syncs `Gemfile.lock`, commits `Release 0.2.9`, and pushes `master`. CI runs the test suite and docs build, publishes the RubyGem and Docker image tags, then creates `v0.2.9`, the GitHub release, and the docs deployment from the release commit.
 
 Use `bin/release 0.2.9 --no-push` to prepare the commit locally without publishing.
 

data/lib/kamal_backup/app.rb

@@ -31,10 +31,9 @@ module KamalBackup
       config.validate_backup
       require_restic!
 
-      timestamp = current_timestamp
       restic.ensure_repository
-      databases.each { |database| database.backup(restic, timestamp) }
-      restic.backup_paths(config.backup_paths, tags: ["type:files", "run:#{timestamp}"])
+      databases.each { |database| database.backup(restic) }
+      restic.backup_paths(config.backup_paths, tags: ["type:files"])
 
       if config.forget_after_backup?
         restic.forget_after_success
@@ -135,10 +134,6 @@ module KamalBackup
     end
 
     private
-      def current_timestamp
-        Time.now.utc.strftime("%Y%m%dT%H%M%SZ")
-      end
-
       def build_restore_result(scope, snapshot)
         started_at = Time.now.utc
         result = Schema.record(

data/lib/kamal_backup/databases/base.rb

@@ -24,11 +24,11 @@ module KamalBackup
         @redactor = redactor
       end
 
-      def backup(restic, timestamp)
+      def backup(restic)
         restic.backup_stream(
           dump_command,
-          filename: database_filename(timestamp),
-          tags: backup_tags(timestamp)
+          filename: database_filename,
+          tags: backup_tags
         )
       end
 
@@ -41,14 +41,14 @@ module KamalBackup
         restic.pipe_dump_to_command(snapshot, filename, scratch_restore_command(target))
       end
 
-      def database_filename(timestamp)
+      def database_filename
         app = config.app_name.gsub(/[^A-Za-z0-9_.-]+/, "-")
         database = config.database_name.gsub(/[^A-Za-z0-9_.-]+/, "-")
-        "databases-#{app}-#{database}-#{adapter_name}-#{timestamp}.#{dump_extension}"
+        "databases/#{app}/#{database}/#{adapter_name}.#{dump_extension}"
       end
 
-      def backup_tags(timestamp)
-        ["type:database", "database:#{config.database_name}", "adapter:#{adapter_name}", "run:#{timestamp}"]
+      def backup_tags
+        ["type:database", "database:#{config.database_name}", "adapter:#{adapter_name}"]
       end
 
       def adapter_name

data/lib/kamal_backup/databases/sqlite.rb

@@ -13,7 +13,7 @@ module KamalBackup
         "sqlite3"
       end
 
-      def backup(restic, timestamp)
+      def backup(restic)
         source = sqlite_source
         Tempfile.create(["kamal-backup-", ".sqlite3"]) do |tempfile|
           tempfile.close
@@ -23,8 +23,8 @@ module KamalBackup
           )
           restic.backup_file(
             tempfile.path,
-            filename: database_filename(timestamp),
-            tags: backup_tags(timestamp)
+            filename: database_filename,
+            tags: backup_tags
           )
         end
       end

data/lib/kamal_backup/restic.rb

@@ -28,7 +28,7 @@ module KamalBackup
 
     def backup_stream(command, filename:, tags:)
       restic_command = CommandSpec.new(
-        argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
+        argv: ["restic", "backup"] + host_args + ["--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
         env: restic_env
       )
       log("backing up stream as #{filename}")
@@ -37,7 +37,7 @@ module KamalBackup
 
     def backup_file(path, filename:, tags:)
       command = CommandSpec.new(
-        argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
+        argv: ["restic", "backup"] + host_args + ["--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
         env: restic_env
       )
       log("backing up file content as #{filename}")
@@ -66,7 +66,7 @@ module KamalBackup
       if paths.any?
         path_tags = paths.map { |path| "path:#{config.backup_path_label(path)}" }
         log("backing up #{paths.size} file path(s): #{paths.join(", ")}")
-        run(["backup"] + paths + tag_args(common_tags + tags + path_tags))
+        run(["backup"] + host_args + paths + tag_args(common_tags + tags + path_tags))
       end
     end
 
@@ -128,13 +128,15 @@ module KamalBackup
       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}."
       flat_prefix = "databases-#{app}-#{adapter}-"
       named_flat_prefix = database.empty? ? nil : "databases-#{app}-#{database}-#{adapter}-"
       ls_json(snapshot).find do |entry|
         next false unless entry["type"] == "file"
 
         normalized = entry["path"].to_s.sub(%r{\A/+}, "")
-        normalized.start_with?(legacy_prefix) ||
+        (stable_prefix && normalized.start_with?(stable_prefix)) ||
+          normalized.start_with?(legacy_prefix) ||
           File.basename(normalized).start_with?(flat_prefix) ||
           (named_flat_prefix && File.basename(normalized).start_with?(named_flat_prefix))
       end&.fetch("path")
@@ -213,6 +215,19 @@ module KamalBackup
         tags.compact.each_with_object([]) { |tag, args| args.concat(["--tag", tag]) }
       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
+      end
+
       def filter_tag_args(tags)
         tags = tags.compact
         tags.empty? ? [] : ["--tag", tags.join(",")]

data/lib/kamal_backup/version.rb

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

metadata

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