bard-backup 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b2f29911f73ce6b73f1adce60d4595854edac99e4d0664a39c1b01c5680076
-  data.tar.gz: 7f17e3ce3ed4c71555039b6b384759d5e5ddd3d3c17085014c3fccc2b41e593e
+  metadata.gz: c66bfeccaabd27a54df1d8b24e333a07d2ae06280e42b1ed9f66f0b8efe52b5e
+  data.tar.gz: 0af92ab20c579f1cc42b35a7452c8719ab24372228384f3752f7f7a92f8aa0c0
 SHA512:
-  metadata.gz: ad7eb50c8781bed4f6ec83359afd2f7d029087e52574678bbed7578dbb64b01e0e9636e65cb98794bae2214a1fea3db956894d803a8af3a29b626cce52d1f692
-  data.tar.gz: 3e0a8974d131887b9da4d5f82a71608f56d28af077a88abd2d03bd267c74769dbeadbe974bb653ec1d433c6fe1956e6367706e6fe53484b93dc3f7cf43a6f39f
+  metadata.gz: f75e352e04b247fe34165d316538a87e596edd09f26627b514ae52fc74f28881e1f34d3c8d5101570ab77f41fb6764dc6c55407d81c21e6de71422a3dd534531
+  data.tar.gz: 23b16bc9572158fb2968eafbd72bb9559815796ea618c542fe69c6dce6be8632c556dd83441748f43a0c72c21b23b92b3cb9c139d31be3f4cf606599563a2881

data/CLAUDE.md

@@ -50,12 +50,12 @@ Tests require AWS credentials at `spec/support/credentials.json`. In CI, this is
 - `S3Destination` — dumps DB locally via backhoe, uploads to S3, runs `Deleter` for retention, verifies previous hour's backup
 - `UploadDestination` — dumps DB and uploads to presigned URLs (multi-threaded)
 
-**Config DSL** (loaded via `bard/plugins/backup` and `bard/plugins/encrypt`, which extend `Bard::Config`):
+**Config DSL** (loaded via `bard/plugins/backup` and `bard/plugins/encrypt`; `backup` extends `Bard::Config`, `encrypt` extends `Bard::BackupConfig`):
 ```ruby
 backup do
   s3 "primary", path: "bucket/subfolder", region: "us-west-2"
+  encrypt true  # reads key from config/master.key
 end
-encrypt true  # reads key from config/master.key
 ```
 
 **Key classes**:

data/README.md

@@ -22,10 +22,8 @@ In a Rails app, configure destinations in `config/bard.rb` using the `Bard::Conf
 ```ruby
 backup do
   s3 "primary", path: "my-bucket/my-project", region: "us-west-2"
+  encrypt true  # optional: encrypt payloads at rest. Reads key from config/master.key.
 end
-
-# Optional: encrypt payloads at rest. Reads the key from config/master.key.
-encrypt true
 ```
 
 Credentials live in Rails encrypted credentials under `bard_backup` (matched by `name:`):

data/lib/bard/backup/database.rb

@@ -17,7 +17,7 @@ module Bard
           Array(destination_hashes)
         end
 
-        encryption_key = bard_config&.respond_to?(:encryption_key) ? bard_config.encryption_key : nil
+        encryption_key = bard_config&.backup&.encryption_key
         if encryption_key
           destinations = destinations.map { |h| { encryption_key: encryption_key, **h } }
         end

data/lib/bard/backup/file_tree.rb

@@ -15,7 +15,7 @@ module Bard
         return if data_paths.empty?
 
         encryption_key = s3_config.delete(:encryption_key)
-        encryption_key ||= bard_config&.respond_to?(:encryption_key) ? bard_config.encryption_key : nil
+        encryption_key ||= bard_config&.backup&.encryption_key
 
         s3_tree = S3Tree.new(path: "#{bucket}/#{project_name}", encryption_key: encryption_key, **s3_config)
         new(s3_tree, data_paths).call

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
   class Backup
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end
 

data/lib/bard/backup.rb

@@ -1,7 +1,9 @@
+require "bard"
+require "bard/plugins/backup"
+require "bard/plugins/encrypt"
 require "bard/backup/database"
 require "bard/backup/file_tree"
 require "bard/backup/latest_finder"
-require "bard"
 require "bard/backup/railtie" if defined?(Rails)
 
 module Bard

data/lib/bard/plugins/encrypt.rb

@@ -1,16 +1,18 @@
-require "bard/config"
+require "bard/plugins/backup"
 
-class Bard::Config
-  def encrypt(value = nil)
-    if value.nil?
-      @encrypt
-    else
-      @encrypt = value
+module Bard
+  class BackupConfig
+    def encrypt(value = nil)
+      if value.nil?
+        @encrypt
+      else
+        @encrypt = value
+      end
     end
-  end
 
-  def encryption_key
-    return nil unless encrypt
-    File.read("config/master.key").strip
+    def encryption_key
+      return nil unless encrypt
+      File.read("config/master.key").strip
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Micah Geisel