bard-backup 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a87dace6348cc41462c0192446af581cb9253d218d4c32c0c98667fe26c73a
-  data.tar.gz: 86eac09b1520f87f7bedd20bff84afd94496416d715947ea49f6047fdc45ed72
+  metadata.gz: c646d0f6f82c6bc07b6fdfc94256094e60ec681bde22b295aa7ad7f6766a0a23
+  data.tar.gz: 05f47f4952af321ac6a7183ed0643ecf134e9f847b42b3a14a05c0b30399d26f
 SHA512:
-  metadata.gz: 40fa5aa6fa1ee989cad053b08a529173376ebb3d18ee38d72024a5bbe5a0fe0cd222698664791490edc799200e77f7df7685eec8d561c995925f597a0121f36b
-  data.tar.gz: 384b78be14d95ee94dafd9941242818b84b073acc11e6833ace1cd011f95583630aeef27d22428c5a1b9864175989bbe40d292196c1908d884461310f138aa81
+  metadata.gz: 8eea608f2e85b5bb968985e57a6ca0a87f127516e6e0638ab0657dc829f68f46c9a467d18e53c9b0fdb128c83aa88b25c6fa814d079777b506e592ce21cf34f2
+  data.tar.gz: 7aaac7dad88c8ca3c1f50d7a95157adb5c096a41347accd498c46f08905c3f573cd934f6aa7f3c364250628af3126b0e45fd65ec03dc26b70d0209c82ef04586

data/lib/bard/backup/deleter.rb

@@ -6,24 +6,24 @@ module Bard
   module Backup
     class Deleter < Struct.new(:s3_dir, :now)
       def call
-        s3_dir.delete keys_to_delete
+        s3_dir.delete files_to_delete
       end
 
-      def keys_to_delete
-        s3_dir.keys.select do |key|
+      def files_to_delete
+        s3_dir.files.select do |file|
           [
             Filter.new(now, 72, :hours),
             Filter.new(now, 60, :days),
             Filter.new(now, 52, :weeks),
             Filter.new(now, 48, :months),
             Filter.new(now, 100, :years),
-          ].all? { |filter| !filter.cover?(key) }
+          ].all? { |filter| !filter.cover?(file) }
         end
       end
 
       class Filter < Struct.new(:now, :limit, :unit)
-        def cover? key
-          remote = DateTime.parse(key).beginning_of_hour
+        def cover? file
+          remote = DateTime.parse(file).beginning_of_hour
           limit.times.any? do |count|
             remote == ago(count)
           end

data/lib/bard/backup/s3_dir.rb

@@ -4,13 +4,15 @@ require "rexml"
 module Bard
   module Backup
     class S3Dir < Data.define(:path, :access_key, :secret_key, :region)
-      def keys
+      def files
         response = client.list_objects_v2({
           bucket: bucket_name,
           prefix: folder_prefix,
         })
         raise if response.is_truncated
-        response.contents.map(&:key)
+        response.contents.map do |object|
+          object.key.sub("#{folder_prefix}/", "")
+        end
       end
 
       def put file_path, body: File.read(file_path)
@@ -35,9 +37,11 @@ module Bard
         FileUtils.rm file_path
       end
 
-      def delete keys
-        return if keys.empty?
-        objects_to_delete = Array(keys).map { |key| { key: key } }
+      def delete file_paths
+        return if file_paths.empty?
+        objects_to_delete = Array(file_paths).map do |file_path|
+          { key: [folder_prefix, File.basename(file_path)].compact.join("/") }
+        end
         client.delete_objects({
           bucket: bucket_name,
           delete: {
@@ -48,8 +52,8 @@ module Bard
       end
 
       def empty!
-        keys.each_slice(1000) do |key_batch|
-          delete key_batch
+        files.each_slice(1000) do |batch|
+          delete batch
         end
       end
 

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Backup
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end
 

metadata

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