pg_export 1.0.0.rc5 → 1.0.0.rc6

data/lib/pg_export/lib/pg_export/factories/ftp_gateway_factory.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
 require 'pg_export/lib/pg_export/gateways/ftp'
-require 'pg_export/import'
 
 class PgExport
   module Factories
     class FtpGatewayFactory
-      include Import['config']
+      def initialize(config:)
+        @config = config
+      end
 
       def gateway
         ::PgExport::Gateways::Ftp.new(
@@ -17,6 +16,10 @@ class PgExport
           password: config.gateway_password
         )
       end
+
+      private
+
+      attr_reader :config
     end
   end
 end

data/lib/pg_export/lib/pg_export/factories/ssh_gateway_factory.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
 require 'pg_export/lib/pg_export/gateways/ssh'
-require 'pg_export/import'
 
 class PgExport
   module Factories
     class SshGatewayFactory
-      include Import['config']
+      def initialize(config:)
+        @config = config
+      end
 
       def gateway
         ::PgExport::Gateways::Ssh.new(
@@ -17,6 +16,10 @@ class PgExport
           password: config.gateway_password
         )
       end
+
+      private
+
+      attr_reader :config
     end
   end
 end

data/lib/pg_export/lib/pg_export/gateways/ftp.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
 require 'net/ftp'
 
 class PgExport
   module Gateways
     class Ftp
-      CHUNK_SIZE = (2**16).freeze
+      CHUNK_SIZE = (2**16)
 
       def initialize(host:, user:, password:)
         @host, @user, @password, @logger = host, user, password

data/lib/pg_export/lib/pg_export/gateways/ssh.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
 require 'ed25519'
 require 'net/ssh'
 require 'net/scp'
@@ -9,8 +7,6 @@ require 'net/scp'
 class PgExport
   module Gateways
     class Ssh
-      CHUNK_SIZE = (2**16).freeze
-
       def initialize(host:, user:, password:)
         @host, @user, @password, @logger = host, user, password
       end
@@ -25,7 +21,7 @@ class PgExport
       end
 
       def welcome
-        open.exec!('hostname')
+        open.exec!('hostname; whoami')
       end
 
       def close
@@ -49,7 +45,7 @@ class PgExport
       end
 
       def delete(name)
-        # @TODO
+        ssh.exec!("rm #{name}")
       end
 
       def persist(file, name)

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

@@ -7,7 +7,7 @@ class PgExport
     class Interactive
       class BuildDump < InteractiveListener
         def on_step(event)
-          @spinner = build_spinner("Dumping database #{event[:args].first[:database_name]}")
+          @spinner = build_spinner("Dumping database #{event[:value][:database_name]}")
         end
 
         def on_step_succeeded(event)

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

@@ -7,7 +7,7 @@ class PgExport
     class Interactive
       class CloseConnection < InteractiveListener
         def on_step(*)
-          @spinner = build_spinner('Closing FTP')
+          @spinner = build_spinner('Closing connection')
         end
 
         def on_step_succeeded(*)

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

@@ -7,7 +7,7 @@ class PgExport
     class Interactive
       class RemoveOldDumps < InteractiveListener
         def on_step(event)
-          @spinner = build_spinner("Checking for old dumps on #{event[:args].first[:gateway]}")
+          @spinner = build_spinner("Checking for old dumps on #{event[:value][:gateway]}")
         end
 
         def on_step_succeeded(event)

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

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

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

@@ -7,7 +7,7 @@ class PgExport
     class Interactive
       class UploadDump < InteractiveListener
         def on_step(event)
-          @spinner = build_spinner("Uploading #{event[:args].first[:dump]} to #{event[:args].first[:gateway]}")
+          @spinner = build_spinner("Uploading #{event[:value][:dump]} to #{event[:value][:gateway]}")
         end
 
         def on_step_succeeded(*)

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

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
-require 'pg_export/import'
 require 'tty-spinner'
 
 class PgExport
   module Listeners
     class InteractiveListener
+      def on_step(*); end
+
+      def on_step_succeeded(*); end
+
       def on_step_failed(event)
         @spinner.error([error, self.class.red(event[:value][:message])].join("\n"))
       end

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

@@ -7,7 +7,7 @@ class PgExport
     class Plain
       class PrepareParams < PlainListener
         def on_step_succeeded(event)
-          logger.info("Init")
+          logger.info('Init')
         end
       end
     end

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

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
-require 'pg_export/import'
-
 class PgExport
   module Listeners
     class PlainListener
-      include Import['logger']
+      def initialize(logger:)
+        @logger = logger
+      end
+
+      def on_step(*); end
+
+      def on_step_succeeded(*); end
 
       def on_step_failed(event)
         logger.info("Error: #{event[:value][:message]}")
       end
+
+      private
+
+      attr_reader :logger
     end
   end
 end

data/lib/pg_export/lib/pg_export/operations/decrypt_dump.rb

@@ -1,20 +1,30 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/operation'
-require 'pg_export/import'
+require 'pg_export'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Operations
     class DecryptDump
-      include Dry::Transaction::Operation
-      include Import['factories.cipher_factory']
+      def initialize(cipher_factory:)
+        @cipher_factory = cipher_factory
+      end
+
+      def name
+        :decrypt_dump
+      end
 
       def call(dump:)
         dump.decrypt(cipher_factory: cipher_factory)
-        Success(dump: dump)
+
+        ValueObjects::Success.new(dump: dump)
       rescue OpenSSL::Cipher::CipherError => e
-        Failure(message: "Problem decrypting dump file: #{e}. Try again.")
+        ValueObjects::Failure.new(message: "Problem decrypting dump file: #{e}. Try again.")
       end
+
+      private
+
+      attr_reader :cipher_factory
     end
   end
 end

data/lib/pg_export/lib/pg_export/operations/encrypt_dump.rb

@@ -1,18 +1,27 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/operation'
-require 'pg_export/import'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Operations
     class EncryptDump
-      include Dry::Transaction::Operation
-      include Import['factories.cipher_factory']
+      def initialize(cipher_factory:)
+        @cipher_factory = cipher_factory
+      end
+
+      def name
+        :encrypt_dump
+      end
 
       def call(dump:)
         dump.encrypt(cipher_factory: cipher_factory)
-        Success(dump: dump)
+
+        ValueObjects::Success.new(dump: dump)
       end
+
+      private
+
+      attr_reader :cipher_factory
     end
   end
 end

data/lib/pg_export/lib/pg_export/operations/open_connection.rb

@@ -1,19 +1,28 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/operation'
-require 'pg_export/import'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Operations
     class OpenConnection
-      include Dry::Transaction::Operation
-      include Import['factories.gateway_factory']
+      def initialize(gateway_factory:)
+        @gateway_factory = gateway_factory
+      end
+
+      def name
+        :open_connection
+      end
 
       def call(inputs)
         gateway = gateway_factory.gateway
         gateway.open
-        Success(inputs.merge(gateway: gateway))
+
+        ValueObjects::Success.new(inputs.merge(gateway: gateway))
       end
+
+      private
+
+      attr_reader :gateway_factory
     end
   end
 end

data/lib/pg_export/lib/pg_export/operations/remove_old_dumps.rb

@@ -1,26 +1,34 @@
 # frozen_string_literal: true
 
-require 'dry/transaction/operation'
-require 'pg_export/import'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Operations
     class RemoveOldDumps
-      include Dry::Transaction::Operation
-      include Import['repositories.gateway_dump_repository', 'config']
+      def initialize(gateway_dump_repository:, keep:)
+        @gateway_dump_repository, @keep = gateway_dump_repository, keep
+      end
+
+      def name
+        :remove_old_dumps
+      end
 
       def call(dump:, gateway:)
         dumps = gateway_dump_repository.by_database_name(
           database_name: dump.database,
           gateway: gateway,
-          offset: config.keep_dumps
+          offset: keep
         )
         dumps.each do |d|
           gateway.delete(d.name)
         end
 
-        Success(removed_dumps: dumps, gateway: gateway)
+        ValueObjects::Success.new(removed_dumps: dumps, gateway: gateway)
       end
+
+      private
+
+      attr_reader :gateway_dump_repository, :keep
     end
   end
 end

data/lib/pg_export/lib/pg_export/repositories/gateway_dump_file_repository.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open3'
-require 'pg_export/import'
 require 'pg_export/lib/pg_export/entities/dump'
 require 'pg_export/lib/pg_export/value_objects/dump_file'
 

data/lib/pg_export/lib/pg_export/repositories/gateway_dump_repository.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'open3'
-require 'pg_export/import'
 require 'pg_export/lib/pg_export/entities/dump'
 require 'pg_export/lib/pg_export/value_objects/dump_file'
 
@@ -10,11 +9,7 @@ class PgExport
     class GatewayDumpRepository
       def all(database_name:, gateway:)
         gateway.list(database_name).map do |item|
-          begin
-            dump(item[:name], database_name, item[:size])
-          rescue Dry::Types::ConstraintError
-            nil
-          end
+          dump(item[:name], database_name, item[:size])
         end.compact
       end
 
@@ -22,7 +17,7 @@ class PgExport
         gateway.list(database_name).drop(offset).map do |item|
           begin
             dump(item[:name], database_name, item[:size])
-          rescue Dry::Types::ConstraintError
+          rescue ArgumentError
             nil
           end
         end.compact

data/lib/pg_export/lib/pg_export/transactions/evaluator.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class PgExport
+  module Transactions
+    class Evaluator
+      def initialize(listeners)
+        @operations = []
+        @listeners = listeners
+      end
+
+      def <<(operation)
+        operations << operation
+      end
+
+      def call(input)
+        result = ValueObjects::Success.new(input)
+
+        operations.each do |operation|
+          result = result.bind do
+            call_operation(operation, result)
+          end
+        end
+
+        result
+      end
+
+      private
+
+      attr_reader :operations, :listeners
+
+      def call_operation(operation, input)
+        listener = listeners[operation.name]
+
+        before_call(listener, input)
+        result = operation.call(**input.value)
+        after_call(listener, result)
+        result
+      end
+
+      def before_call(listener, input)
+        return if listener.nil?
+
+        listener.on_step(value: input.value)
+      end
+
+      def after_call(listener, result)
+        return if listener.nil?
+
+        result.on_success do
+          listener.on_step_succeeded(value: result.value)
+        end
+
+        result.on_failure do
+          listener.on_step_failed(value: result.value)
+        end
+      end
+    end
+  end
+end

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

@@ -1,35 +1,41 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
-require 'dry/transaction'
-
-require 'pg_export/import'
-require 'pg_export/container'
+require 'pg_export/lib/pg_export/transactions/evaluator'
 require 'pg_export/lib/pg_export/value_objects/dump_file'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Transactions
     class ExportDump
-      include Dry::Transaction(container: PgExport::Container)
-      include Import['factories.dump_factory', 'adapters.bash_adapter']
+      def initialize(dump_factory:, bash_adapter:, encrypt_dump:, open_connection:, remove_old_dumps:, listeners:)
+        @dump_factory = dump_factory
+        @bash_adapter = bash_adapter
+
+        @evaluator = Evaluator.new(listeners)
+        @evaluator << method(:prepare_params)
+        @evaluator << method(:build_dump)
+        @evaluator << encrypt_dump
+        @evaluator << open_connection
+        @evaluator << method(:upload_dump)
+        @evaluator << remove_old_dumps
+        @evaluator << method(:close_connection)
+      end
 
-      step :prepare_params
-      step :build_dump
-      step :encrypt_dump, with: 'operations.encrypt_dump'
-      step :open_connection, with: 'operations.open_connection'
-      step :upload_dump
-      step :remove_old_dumps, with: 'operations.remove_old_dumps'
-      step :close_connection
+      def call(input)
+        evaluator.call(input)
+      end
 
       private
 
+      attr_reader :evaluator, :dump_factory, :bash_adapter
+
+
       def prepare_params(database_name:)
         database_name = database_name.to_s
 
-        return Failure(message: 'Invalid database name') if database_name.empty?
+        return ValueObjects::Failure.new(message: 'Invalid database name') if database_name.empty?
 
-        Success(database_name: database_name)
+        ValueObjects::Success.new(database_name: database_name)
       end
 
       def build_dump(database_name:)
@@ -37,19 +43,19 @@ class PgExport
           database: database_name,
           file: bash_adapter.pg_dump(ValueObjects::DumpFile.new, database_name)
         )
-        Success(dump: dump)
+        ValueObjects::Success.new(dump: dump)
       rescue bash_adapter.class::PgDumpError => e
-        Failure(message: 'Unable to dump database: ' + e.to_s)
+        ValueObjects::Failure.new(message: 'Unable to dump database: ' + e.to_s)
       end
 
       def upload_dump(dump:, gateway:)
         gateway.persist(dump.file, dump.name)
-        Success(dump: dump, gateway: gateway)
+        ValueObjects::Success.new(dump: dump, gateway: gateway)
       end
 
       def close_connection(removed_dumps:, gateway:)
         gateway.close
-        Success(gateway: gateway)
+        ValueObjects::Success.new(gateway: gateway)
       end
     end
   end

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

@@ -1,66 +1,68 @@
 # frozen_string_literal: true
 
-# auto_register: false
-
-require 'dry/transaction'
-
-require 'pg_export/import'
-require 'pg_export/container'
+require 'pg_export/lib/pg_export/transactions/evaluator'
+require 'pg_export/lib/pg_export/value_objects/result'
 
 class PgExport
   module Transactions
     class ImportDumpInteractively
-      include Dry::Transaction(container: PgExport::Container)
-      include Import[
-        'ui.interactive.input',
-        'adapters.bash_adapter',
-        'repositories.gateway_dump_repository',
-        'repositories.gateway_dump_file_repository'
-      ]
+      def initialize(input:, bash_adapter:, gateway_dump_repository:, gateway_dump_file_repository:, open_connection:, decrypt_dump:, listeners:)
+        @input = input
+        @bash_adapter = bash_adapter
+        @gateway_dump_repository = gateway_dump_repository
+        @gateway_dump_file_repository = gateway_dump_file_repository
+
+        @evaluator = Evaluator.new(listeners)
+        @evaluator << open_connection
+        @evaluator << method(:fetch_dumps)
+        @evaluator << method(:select_dump)
+        @evaluator << method(:download_dump)
+        @evaluator << method(:close_connection)
+        @evaluator << decrypt_dump
+        @evaluator << method(:select_database)
+        @evaluator << method(:restore)
+      end
 
-      step :open_connection, with: 'operations.open_connection'
-      step :fetch_dumps
-      step :select_dump
-      step :download_dump
-      step :close_connection
-      step :decrypt_dump, with: 'operations.decrypt_dump'
-      step :select_database
-      step :restore
+      def call(input)
+        evaluator.call(input)
+      end
 
       private
 
+      attr_reader :evaluator, :input, :bash_adapter, :gateway_dump_repository, :gateway_dump_file_repository
+
       def fetch_dumps(database_name:, gateway:)
         dumps = gateway_dump_repository.all(database_name: database_name, gateway: gateway)
-        return Failure(message: 'No dumps') if dumps.none?
+        return ValueObjects::Failure.new(message: 'No dumps') if dumps.none?
 
-        Success(gateway: gateway, dumps: dumps)
+        ValueObjects::Success.new(gateway: gateway, dumps: dumps)
       end
 
       def select_dump(dumps:, gateway:)
         dump = input.select_dump(dumps)
-        Success(dump: dump, gateway: gateway)
+        ValueObjects::Success.new(dump: dump, gateway: gateway)
       end
 
       def download_dump(dump:, gateway:)
         dump.file = gateway_dump_file_repository.by_name(name: dump.name, gateway: gateway)
-        Success(dump: dump, gateway: gateway)
+        ValueObjects::Success.new(dump: dump, gateway: gateway)
       end
 
       def close_connection(dump:, gateway:)
         Thread.new { gateway.close }
-        Success(dump: dump)
+        ValueObjects::Success.new(dump: dump)
       end
 
       def select_database(dump:)
         name = input.enter_database_name(dump.database)
-        Success(dump: dump, database: name)
+        ValueObjects::Success.new(dump: dump, database: name)
       end
 
       def restore(dump:, database:)
         bash_adapter.pg_restore(dump.file, database)
-        Success({})
+        ValueObjects::Success.new({})
       rescue bash_adapter.class::PgRestoreError => e
-        Failure(message: e.to_s)
+        ValueObjects::Failure.new(message: e.to_s)
       end
     end
   end

data/lib/pg_export/lib/pg_export/value_objects/dump_file.rb

@@ -54,9 +54,9 @@ class PgExport
 
       private
 
-      CHUNK_SIZE = (2**16).freeze
+      CHUNK_SIZE = (2**16)
       MAPPING = {
-        'B'  => 1024,
+        'B' => 1024,
         'kB' => 1024 * 1024,
         'MB' => 1024 * 1024 * 1024,
         'GB' => 1024 * 1024 * 1024 * 1024,