pg_export 0.7.3 → 1.0.0.rc1

data/lib/pg_export/lib/pg_export/listeners/interactive/build_dump.rb

@@ -6,12 +6,12 @@ class PgExport
   module Listeners
     class Interactive
       class BuildDump < InteractiveListener
-        def on_step(step_name:, args:)
-          @spinner = build_spinner("Dumping database #{args.first[:database_name]}")
+        def on_step(event)
+          @spinner = build_spinner("Dumping database #{event[:args].first[:database_name]}")
         end
 
-        def on_step_succeeded(step_name:, args:, value:)
-          @spinner.success([success, value[:dump]].join(' '))
+        def on_step_succeeded(event)
+          @spinner.success([success, event[:value][:dump]].join(' '))
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/interactive/{close_ftp_connection.rb → close_connection.rb}

@@ -5,7 +5,7 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class CloseFtpConnection < InteractiveListener
+      class CloseConnection < InteractiveListener
         def on_step(*)
           @spinner = build_spinner('Closing FTP')
         end

data/lib/pg_export/lib/pg_export/listeners/interactive/decrypt_dump.rb

@@ -10,8 +10,8 @@ class PgExport
           @spinner = build_spinner('Decrypting')
         end
 
-        def on_step_succeeded(step_name:, args:, value:)
-          @spinner.success([success, value[:dump]].join(' '))
+        def on_step_succeeded(event)
+          @spinner.success([success, event[:value][:dump]].join(' '))
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/interactive/download_dump_from_ftp.rb

@@ -10,8 +10,8 @@ class PgExport
           @spinner = build_spinner('Downloading')
         end
 
-        def on_step_succeeded(step_name:, args:, value:)
-          @spinner.success([success, value[:dump]].join(' '))
+        def on_step_succeeded(event)
+          @spinner.success([success, event[:value][:dump]].join(' '))
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/interactive/encrypt_dump.rb

@@ -10,8 +10,8 @@ class PgExport
           @spinner = build_spinner('Encrypting')
         end
 
-        def on_step_succeeded(step_name:, args:, value:)
-          @spinner.success([success, value[:dump]].join(' '))
+        def on_step_succeeded(event)
+          @spinner.success([success, event[:value][:dump]].join(' '))
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/interactive/{open_ftp_connection.rb → open_connection.rb}

@@ -5,7 +5,7 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class OpenFtpConnection < InteractiveListener
+      class OpenConnection < InteractiveListener
         def on_step(*)
           @spinner = build_spinner('Opening ftp connection')
         end

data/lib/pg_export/lib/pg_export/listeners/interactive/remove_old_dumps_from_ftp.rb

@@ -6,13 +6,13 @@ class PgExport
   module Listeners
     class Interactive
       class RemoveOldDumpsFromFtp < InteractiveListener
-        def on_step(step_name:, args:)
-          @spinner = build_spinner("Checking for old dumps on #{args.first[:ftp_adapter]}")
+        def on_step(event)
+          @spinner = build_spinner("Checking for old dumps on #{event[:args].first[:gateway]}")
         end
 
-        def on_step_succeeded(step_name:, args:, value:)
-          if value[:removed_dumps].any?
-            @spinner.success([success, value[:removed_dumps].map { |filename| "    #{filename} removed" }].join("\n"))
+        def on_step_succeeded(event)
+          if event[:value][:removed_dumps].any?
+            @spinner.success([success, event[:value][:removed_dumps].map { |filename| "    #{filename} removed" }].join("\n"))
           else
             @spinner.success([success, 'nothing to remove'].join(' '))
           end

data/lib/pg_export/lib/pg_export/listeners/interactive/restore.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Interactive
       class Restore < InteractiveListener
-        def on_step(step_name:, args:)
-          @spinner = build_spinner("Restoring dump to database #{args.first[:database]}")
+        def on_step(event)
+          @spinner = build_spinner("Restoring dump to database #{event[:args].first[:database]}")
         end
 
         def on_step_succeeded(*)

data/lib/pg_export/lib/pg_export/listeners/interactive/upload_dump_to_ftp.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Interactive
       class UploadDumpToFtp < InteractiveListener
-        def on_step(step_name:, args:)
-          @spinner = build_spinner("Uploading #{args.first[:dump]} to #{args.first[:ftp_adapter]}")
+        def on_step(event)
+          @spinner = build_spinner("Uploading #{event[:args].first[:dump]} to #{event[:args].first[:gateway]}")
         end
 
         def on_step_succeeded(*)

data/lib/pg_export/lib/pg_export/listeners/interactive_listener.rb

@@ -8,8 +8,8 @@ require 'tty-spinner'
 class PgExport
   module Listeners
     class InteractiveListener
-      def on_step_failed(step_name:, args:, value:)
-        @spinner.error([error, self.class.red(value[:message])].join("\n"))
+      def on_step_failed(event)
+        @spinner.error([error, self.class.red(event[:value][:message])].join("\n"))
       end
 
       class << self

data/lib/pg_export/lib/pg_export/listeners/plain/build_dump.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class BuildDump < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Dump database #{value[:dump].database} to #{value[:dump]}")
+        def on_step_succeeded(event)
+          logger.info("Dump database #{event[:value][:dump].database} to #{event[:value][:dump]}")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/{close_ftp_connection.rb → close_connection.rb}

@@ -5,9 +5,9 @@ require_relative '../plain_listener'
 class PgExport
   module Listeners
     class Plain
-      class CloseFtpConnection < PlainListener
+      class CloseConnection < PlainListener
         def on_step_succeeded(*)
-          logger.info('Close FTP')
+          logger.info('Close connection')
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/decrypt_dump.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class DecryptDump < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Decrypt #{value[:dump]}")
+        def on_step_succeeded(event)
+          logger.info("Decrypt #{event[:value][:dump]}")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/download_dump_from_ftp.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class DownloadDumpFromFtp < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Download #{value[:dump]}")
+        def on_step_succeeded(event)
+          logger.info("Download #{event[:value][:dump]}")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/encrypt_dump.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class EncryptDump < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Encrypt #{value[:dump]}")
+        def on_step_succeeded(event)
+          logger.info("Encrypt #{event[:value][:dump]}")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/fetch_dumps_from_ftp.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class FetchDumpsFromFtp < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Fetch dumps (#{value[:dumps].count} items)")
+        def on_step_succeeded(event)
+          logger.info("Fetch dumps (#{event[:value][:dumps].count} items)")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain/open_connection.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../plain_listener'
+
+class PgExport
+  module Listeners
+    class Plain
+      class OpenConnection < PlainListener
+        def on_step_succeeded(event)
+          logger.info("Connect to #{event[:value][:gateway]}")
+        end
+      end
+    end
+  end
+end

data/lib/pg_export/lib/pg_export/listeners/plain/remove_old_dumps_from_ftp.rb

@@ -6,9 +6,9 @@ class PgExport
   module Listeners
     class Plain
       class RemoveOldDumpsFromFtp < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          value[:removed_dumps].each do |filename|
-            logger.info("Remove #{filename} from #{value[:ftp_adapter]}")
+        def on_step_succeeded(event)
+          event[:value][:removed_dumps].each do |filename|
+            logger.info("Remove #{filename} from #{event[:value][:gateway]}")
           end
         end
       end

data/lib/pg_export/lib/pg_export/listeners/plain/restore.rb

@@ -6,7 +6,7 @@ class PgExport
   module Listeners
     class Plain
       class Restore < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
+        def on_step_succeeded(event)
           logger.info("Restore dump to database #{args.first[:database]}")
         end
       end

data/lib/pg_export/lib/pg_export/listeners/plain/upload_dump_to_ftp.rb

@@ -6,8 +6,8 @@ class PgExport
   module Listeners
     class Plain
       class UploadDumpToFtp < PlainListener
-        def on_step_succeeded(step_name:, args:, value:)
-          logger.info("Upload #{value[:dump]} to #{value[:ftp_adapter]}")
+        def on_step_succeeded(event)
+          logger.info("Upload #{event[:value][:dump]} to #{event[:value][:gateway]}")
         end
       end
     end

data/lib/pg_export/lib/pg_export/listeners/plain_listener.rb

@@ -9,8 +9,8 @@ class PgExport
     class PlainListener
       include Import['logger']
 
-      def on_step_failed(step_name:, args:, value:)
-        logger.info("Error: #{value[:message]}")
+      def on_step_failed(event)
+        logger.info("Error: #{event[:value][:message]}")
       end
     end
   end

data/lib/pg_export/lib/pg_export/operations/{open_ftp_connection.rb → open_connection.rb}

@@ -5,14 +5,14 @@ require 'pg_export/import'
 
 class PgExport
   module Operations
-    class OpenFtpConnection
+    class OpenConnection
       include Dry::Transaction::Operation
-      include Import['factories.ftp_adapter_factory']
+      include Import['factories.gateway_factory']
 
       def call(inputs)
-        ftp_adapter = ftp_adapter_factory.ftp_adapter
-        ftp_adapter.open_ftp
-        Success(inputs.merge(ftp_adapter: ftp_adapter))
+        gateway = gateway_factory.gateway
+        gateway.open
+        Success(inputs.merge(gateway: gateway))
       end
     end
   end

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

@@ -7,19 +7,19 @@ class PgExport
   module Operations
     class RemoveOldDumpsFromFtp
       include Dry::Transaction::Operation
-      include Import['repositories.ftp_dump_repository', 'config']
+      include Import['repositories.gateway_dump_repository', 'config']
 
-      def call(dump:, ftp_adapter:)
-        dumps = ftp_dump_repository.by_database_name(
+      def call(dump:, gateway:)
+        dumps = gateway_dump_repository.by_database_name(
           database_name: dump.database,
-          ftp_adapter: ftp_adapter,
+          gateway: gateway,
           offset: config.keep_dumps
         )
         dumps.each do |d|
-          ftp_adapter.delete(d.name)
+          gateway.delete(d.name)
         end
 
-        Success(removed_dumps: dumps, ftp_adapter: ftp_adapter)
+        Success(removed_dumps: dumps, gateway: gateway)
       end
     end
   end

data/lib/pg_export/lib/pg_export/repositories/{ftp_dump_file_repository.rb → gateway_dump_file_repository.rb}

@@ -7,10 +7,10 @@ require 'pg_export/lib/pg_export/value_objects/dump_file'
 
 class PgExport
   module Repositories
-    class FtpDumpFileRepository
-      def by_name(name:, ftp_adapter:)
+    class GatewayDumpFileRepository
+      def by_name(name:, gateway:)
         file = ValueObjects::DumpFile.new
-        ftp_adapter.get(file, name)
+        gateway.get(file, name)
 
         file
       end

data/lib/pg_export/lib/pg_export/repositories/{ftp_dump_repository.rb → gateway_dump_repository.rb}

@@ -7,21 +7,21 @@ require 'pg_export/lib/pg_export/value_objects/dump_file'
 
 class PgExport
   module Repositories
-    class FtpDumpRepository
-      def all(database_name:, ftp_adapter:)
-        ftp_adapter.list([database_name, '*'].compact.join('_')).map do |name:, size:|
+    class GatewayDumpRepository
+      def all(database_name:, gateway:)
+        gateway.list([database_name, '*'].compact.join('_')).map do |item|
           begin
-            dump(name, database_name, size)
+            dump(item[:name], database_name, item[:size])
           rescue Dry::Types::ConstraintError
             nil
           end
         end.compact
       end
 
-      def by_database_name(database_name:, ftp_adapter:, offset:)
-        ftp_adapter.list(database_name + '_*').drop(offset).map do |name:, size:|
+      def by_database_name(database_name:, gateway:, offset:)
+        gateway.list(database_name + '_*').drop(offset).map do |item|
           begin
-            dump(name, database_name, size)
+            dump(item[:name], database_name, item[:size])
           rescue Dry::Types::ConstraintError
             nil
           end

data/lib/pg_export/lib/pg_export/transactions/export_dump.rb

@@ -17,10 +17,10 @@ class PgExport
       step :prepare_params
       step :build_dump
       step :encrypt_dump, with: 'operations.encrypt_dump'
-      step :open_ftp_connection, with: 'operations.open_ftp_connection'
+      step :open_connection, with: 'operations.open_connection'
       step :upload_dump_to_ftp
       step :remove_old_dumps_from_ftp, with: 'operations.remove_old_dumps_from_ftp'
-      step :close_ftp_connection
+      step :close_connection
 
       private
 
@@ -42,14 +42,14 @@ class PgExport
         Failure(message: 'Unable to dump database: ' + e.to_s)
       end
 
-      def upload_dump_to_ftp(dump:, ftp_adapter:)
-        ftp_adapter.persist(dump.file, dump.name)
-        Success(dump: dump, ftp_adapter: ftp_adapter)
+      def upload_dump_to_ftp(dump:, gateway:)
+        gateway.persist(dump.file, dump.name)
+        Success(dump: dump, gateway: gateway)
       end
 
-      def close_ftp_connection(removed_dumps:, ftp_adapter:)
-        ftp_adapter.close_ftp
-        Success(ftp_adapter: ftp_adapter)
+      def close_connection(removed_dumps:, gateway:)
+        gateway.close
+        Success(gateway: gateway)
       end
     end
   end

data/lib/pg_export/lib/pg_export/transactions/import_dump_interactively.rb

@@ -13,41 +13,41 @@ class PgExport
       include Dry::Transaction(container: PgExport::Container)
       include Import[
         'adapters.bash_adapter',
-        'repositories.ftp_dump_repository',
-        'repositories.ftp_dump_file_repository',
+        'repositories.gateway_dump_repository',
+        'repositories.gateway_dump_file_repository',
         'ui_input'
       ]
 
-      step :open_ftp_connection, with: 'operations.open_ftp_connection'
+      step :open_connection, with: 'operations.open_connection'
       step :fetch_dumps_from_ftp
       step :select_dump
       step :download_dump_from_ftp
-      step :close_ftp_connection
+      step :close_connection
       step :decrypt_dump, with: 'operations.decrypt_dump'
       step :select_database
       step :restore
 
       private
 
-      def fetch_dumps_from_ftp(database_name:, ftp_adapter:)
-        dumps = ftp_dump_repository.all(database_name: database_name, ftp_adapter: ftp_adapter)
+      def fetch_dumps_from_ftp(database_name:, gateway:)
+        dumps = gateway_dump_repository.all(database_name: database_name, gateway: gateway)
         return Failure(message: 'No dumps') if dumps.none?
 
-        Success(ftp_adapter: ftp_adapter, dumps: dumps)
+        Success(gateway: gateway, dumps: dumps)
       end
 
-      def select_dump(dumps:, ftp_adapter:)
+      def select_dump(dumps:, gateway:)
         dump = ui_input.select_dump(dumps)
-        Success(dump: dump, ftp_adapter: ftp_adapter)
+        Success(dump: dump, gateway: gateway)
       end
 
-      def download_dump_from_ftp(dump:, ftp_adapter:)
-        dump.file = ftp_dump_file_repository.by_name(name: dump.name, ftp_adapter: ftp_adapter)
-        Success(dump: dump, ftp_adapter: ftp_adapter)
+      def download_dump_from_ftp(dump:, gateway:)
+        dump.file = gateway_dump_file_repository.by_name(name: dump.name, gateway: gateway)
+        Success(dump: dump, gateway: gateway)
       end
 
-      def close_ftp_connection(dump:, ftp_adapter:)
-        Thread.new { ftp_adapter.close_ftp }
+      def close_connection(dump:, gateway:)
+        Thread.new { gateway.close }
         Success(dump: dump)
       end