pg_export 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88abb5cb79d5009b4742cceb392a94ca858de65a2b7facf387884e5bb690eb59
-  data.tar.gz: fd2ee2742374eb0224c2c2a70de40b04bf504c65aa766f9b65cabb01fca738a2
+  metadata.gz: b37e313458127333a2dbe576aa319542438d996d10874cf545054b83a056dfc2
+  data.tar.gz: 5b64bcdc82a31242b7dd0c1676771a8942f06ce5ca884bb66bcb664001001b17
 SHA512:
-  metadata.gz: 6feab2892af772029554639588d077c5dba10c63228bded95642328de820dce4f292cfa7e230558ce6097011b25eb2133d39c12bc559b1dac4bdb6a887fcbd5f
-  data.tar.gz: 1386af9f7f0f9d71bfe9247ef938727da5088e9144cf58bad30da6d15890f29029b402fc0732c0ab0f1e4b207e96c8549843b3ba0ba546b76da7e9ab2690d239
+  metadata.gz: fcd767643cba4b7834600d7715fe76605f76f04606f9c01b4f938ff9a02e50399fa5629f931881ddc8afba117c44bb6466ec4f55aad6c900acb818347b2ab4a1
+  data.tar.gz: 4ad8e9393779a16fcf40e38acb4074df20fe134e071842d13386899ef65af58d977900dc16bd699ea3c846d229b49bf7114fab253960c7a925b4d3b8811f8dfa

data/lib/pg_export/lib/pg_export/adapters/ftp_adapter.rb

@@ -32,8 +32,8 @@ class PgExport
           .reverse
       end
 
-      def delete(filename)
-        ftp.delete(filename)
+      def delete(name)
+        ftp.delete(name)
       end
 
       def persist(file, name)

data/lib/pg_export/lib/pg_export/operations/remove_old_dumps_from_ftp.rb

@@ -10,9 +10,13 @@ class PgExport
       include Import['repositories.ftp_dump_repository', 'config']
 
       def call(dump:, ftp_adapter:)
-        dumps = ftp_adapter.list(dump.database + '_*').drop(config.keep_dumps)
-        dumps.each do |filename|
-          ftp_adapter.delete(filename)
+        dumps = ftp_dump_repository.by_database_name(
+          database_name: dump.database,
+          ftp_adapter: ftp_adapter,
+          offset: config.keep_dumps
+        )
+        dumps.each do |d|
+          ftp_adapter.delete(d.name)
         end
 
         Success(removed_dumps: dumps, ftp_adapter: ftp_adapter)

data/lib/pg_export/lib/pg_export/repositories/ftp_dump_repository.rb

@@ -18,6 +18,16 @@ class PgExport
         end.compact
       end
 
+      def by_database_name(database_name:, ftp_adapter:, offset:)
+        ftp_adapter.list(database_name + '_*').drop(offset).map do |name:, size:|
+          begin
+            dump(name, database_name, size)
+          rescue Dry::Types::ConstraintError
+            nil
+          end
+        end.compact
+      end
+
       private
 
       FilePlaceholder = Struct.new(:size)

data/lib/pg_export/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PgExport
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_export
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Krzysztof Maicher