bard-backup 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4746616bc6439c661cc7187970f3d72f51df06395e6e7535ce1238465746c1f7
-  data.tar.gz: b1a41fca533525a326fecf71f848477ed31e391346c53cf2db73bf4d1c5e6c23
+  metadata.gz: 5727d5acc23ec75d951a70f062b7bf4da0bbc3ab010c3d96de502530f063497e
+  data.tar.gz: d3d07429a57b4e2ea090216ae954e7e682f5f18c9ddeb44f93446af3b871dd53
 SHA512:
-  metadata.gz: 1c1ee7c76fd20226a6880e7f667a6f9eeb074d073248687673119574501db7e322112ade1de83768034a037a538c08182d8fdbfbab1c14f101e27ea1a86cc212
-  data.tar.gz: 8944a7834916e521b35ec5bf4a09cd4369cfe7613225d5f6e46fff0ffe16729e8ba80a0cdabc99647365ede937103dcc8d083deb9b756304dcff7c2f8dd060de
+  metadata.gz: e6ccbdd2cef3c31c43165bdb4a206b95d5648aaff3722a71e2e7bb644170367b5b74639155e564ee379d0e70066fa9e5ccbf4fdddaf6185331bc2ce7334f6a51
+  data.tar.gz: 9b0a36b4784e890b8c2c77a0e60f8c24ebf5ebd8515739bd9ad678c7237ba7d317bdd51a17847473f7519537664521a7b2165e426990290bfb93c29af18623b1

data/README.md

@@ -2,14 +2,14 @@
 
 Bard::Backup does 3 things in a bard project
 1. Takes a database dump and uploads it to our s3 bucket
-2. Deletes old backups using a backoff heuristic: 72 hours, 60 days, 52 weeks, 48 months, then yearly
+2. Deletes old backups using a backoff heuristic: 48 hours, 30 days, 26 weeks, 24 months, then yearly
 3. Raises an error if we don't have a backup from the previous hour
 
 ## Installation
 
 ## Usage
 
-Run with `Bard::Backup.call s3_path, access_key: "...", secret_key: "...", region: "..."`
+Run with `Bard::Backup.call path: "s3_bucket/optional_subfolder", access_key: "...", secret_key: "...", region: "..."`
 
 Or just run via the `bard-rake` gem: `rake db:backup`, which wires up the above for you.
 

data/lib/bard/backup/cached_local_backhoe.rb

@@ -0,0 +1,27 @@
+require "backhoe"
+
+module Bard
+  class Backup
+    class CachedLocalBackhoe < Struct.new(:s3_dir, :now)
+      def self.call *args
+        new(*args).call
+      end
+
+      def call
+        s3_dir.put path
+      end
+
+      private
+
+      def path
+        @@path ||= begin
+          filename = "#{now.iso8601}.sql.gz"
+          path = "/tmp/#{filename}"
+          Backhoe.dump path
+          at_exit { FileUtils.rm_f path }
+          path
+        end
+      end
+    end
+  end
+end

data/lib/bard/backup/deleter.rb

@@ -3,7 +3,7 @@ require "active_support/core_ext/date_time/calculations"
 require "active_support/core_ext/integer/time"
 
 module Bard
-  module Backup
+  class Backup
     class Deleter < Struct.new(:s3_dir, :now)
       def call
         s3_dir.delete files_to_delete

data/lib/bard/backup/local_backhoe.rb

@@ -1,7 +1,7 @@
 require "backhoe"
 
 module Bard
-  module Backup
+  class Backup
     class LocalBackhoe
       def self.call s3_dir, now
         filename = "#{now.iso8601}.sql.gz"

data/lib/bard/backup/s3_dir.rb

@@ -2,8 +2,13 @@ require "aws-sdk-s3"
 require "rexml"
 
 module Bard
-  module Backup
-    class S3Dir < Data.define(:path, :access_key, :secret_key, :region)
+  class Backup
+    class S3Dir < Data.define(:endpoint, :path, :access_key, :secret_key, :region)
+      def initialize **kwargs
+        kwargs[:endpoint] ||= "https://s3.#{kwargs[:region]}.amazonaws.com"
+        super
+      end
+
       def files
         response = client.list_objects_v2({
           bucket: bucket_name,
@@ -70,6 +75,7 @@ module Bard
 
       def client
         Aws::S3::Client.new({
+          endpoint: endpoint,
           region: region,
           access_key_id: access_key,
           secret_access_key: secret_key,
@@ -78,4 +84,3 @@ module Bard
     end
   end
 end
-

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
-  module Backup
-    VERSION = "0.6.0"
+  class Backup
+    VERSION = "0.8.0"
   end
 end
 

data/lib/bard/backup.rb

@@ -1,14 +1,62 @@
 require "bard/backup/s3_dir"
 require "bard/backup/local_backhoe"
+require "bard/backup/cached_local_backhoe"
 require "bard/backup/deleter"
 
 module Bard
-  module Backup
-    def self.call s3_path, access_key:, secret_key:, region: "us-west-2", now: Time.now.utc, strategy: LocalBackhoe
-      s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:, region:)
+  class Backup
+    def self.call configs
+      configs = [configs] if configs.is_a?(Hash)
+      configs.each do |config|
+        new(config).call
+      end
+    end
+
+    def initialize config
+      @config = config
+    end
+    attr_reader :config
+
+    def call
       strategy.call(s3_dir, now)
       Deleter.new(s3_dir, now).call
     end
+
+    def s3_dir
+      @s3_dir ||= S3Dir.new(endpoint:, path:, access_key:, secret_key:, region:)
+    end
+
+    def strategy
+      return @strategy if @strategy
+      @strategy = config.fetch(:strategy, LocalBackhoe)
+      if @strategy.is_a?(String)
+        @strategy = Bard::Backup.const_get(@strategy)
+      end
+      @strategy
+    end
+
+    def path
+      config.fetch(:path)
+    end
+
+    def access_key
+      config[:access_key_id] || config[:access_key]
+    end
+
+    def secret_key
+      config[:secret_access_key] || config[:secret_key]
+    end
+
+    def region
+      config.fetch(:region, "us-west-2")
+    end
+
+    def now
+      @now ||= config.fetch(:now, Time.now.utc)
+    end
+
+    def endpoint
+      config.fetch(:endpoint, "https://s3.#{region}.amazonaws.com")
+    end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backhoe
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - lib/bard-backup.rb
 - lib/bard/backup.rb
+- lib/bard/backup/cached_local_backhoe.rb
 - lib/bard/backup/deleter.rb
 - lib/bard/backup/local_backhoe.rb
 - lib/bard/backup/s3_dir.rb