bard-backup 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 760a50cd9995dcdb13d1e89906f3898a5eae0423e0f6945e33a851439e5a9354
-  data.tar.gz: 95f7c3ccaa81fb55f8ac4e535c26a9260822131291f407a8ebf4bad4b7eab9be
+  metadata.gz: 452af7bfaa1d38372eb29a727e0b78200d479cb8f3eec98088aad4734bfae827
+  data.tar.gz: 7408415418eda357aceda59944720a63e50d19f10f34b29d43b2709ec713fd2e
 SHA512:
-  metadata.gz: 96a4e68dc17386716e68f8d8c4c917e86388d1b3ffecce50951b2901ee12ce1b8560f86fc9450074dfcc4c54d90e8e0ed2e308ac27ac810576b0a339f180f469
-  data.tar.gz: 4c9d2b692bf56286abedd0c8deb7ec443adebbfd95c0300127b37b951bb27d99d551f7922a0059d3e9c666bd833b7af52634a765a2344b36f03343d344c099c3
+  metadata.gz: 8c16a1f42236bfc41d42a68db41b1e7e806c737508a0b7b0aac5c87984107d5e77fd1446445b4daf1ba460c24e7ac6870eb62e612d49091febf74902325e3e22
+  data.tar.gz: cb10ae30ececa98bbf031ed4a6500cde3b73a5a1564891d39a517f4c7f252da27108432ba50cabf894160c81e489cbcf84d28c6fc592daf6f2d8cb21f7c4825d

data/README.md

@@ -9,7 +9,7 @@ Bard::Backup does 3 things in a bard project
 
 ## Usage
 
-Run with `Bard::Backup.call s3_path, access_key: "...", secret_key: "..."`
+Run with `Bard::Backup.call s3_path, 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/controller.rb

@@ -5,7 +5,7 @@ module Bard
         filename = "#{now.iso8601}.sql.gz"
         path = "/tmp/#{filename}"
         dumper.dump path
-        s3_dir.put path
+        s3_dir.mv path
       end
     end
   end

data/lib/bard/backup/s3_dir.rb

@@ -3,7 +3,7 @@ require "rexml"
 
 module Bard
   module Backup
-    class S3Dir < Data.define(:path, :access_key, :secret_key)
+    class S3Dir < Data.define(:path, :access_key, :secret_key, :region)
       def keys
         response = client.list_objects_v2({
           bucket: bucket_name,
@@ -16,11 +16,16 @@ module Bard
       def put file_path, body: File.read(file_path)
         client.put_object({
           bucket: bucket_name,
-          key: "#{folder_prefix}/#{File.basename(file_path)}",
+          key: [folder_prefix, File.basename(file_path)].compact.join("/"),
           body: body,
         })
       end
 
+      def mv file_path, body: File.read(file_path)
+        put file_path, body: body
+        FileUtils.rm file_path
+      end
+
       def delete keys
         return if keys.empty?
         objects_to_delete = Array(keys).map { |key| { key: key } }
@@ -44,6 +49,7 @@ module Bard
       end
 
       def folder_prefix
+        return nil if !path.include?("/")
         path.split("/")[1..].join("/")
       end
 
@@ -51,7 +57,7 @@ module Bard
 
       def client
         Aws::S3::Client.new({
-          region: "us-west-2",
+          region: region,
           access_key_id: access_key,
           secret_access_key: secret_key,
         })

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Backup
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 end
 

data/lib/bard/backup.rb

@@ -5,9 +5,9 @@ require "backhoe"
 
 module Bard
   module Backup
-    def self.call s3_path, access_key:, secret_key:, now: Time.now.utc
+    def self.call s3_path, access_key:, secret_key:, region: "us-west-2", now: Time.now.utc
       dumper = Backhoe
-      s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:)
+      s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:, region:)
       Controller.new(dumper, s3_dir, now).call
       Deleter.new(s3_dir, now).call
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backhoe