pg_export 1.0.0.rc3 → 1.0.0.rc6

data/lib/pg_export/lib/pg_export/entities/dump.rb

@@ -1,17 +1,25 @@
 # frozen_string_literal: true
 
-require 'dry-initializer'
-require 'pg_export/lib/pg_export/types'
-
 class PgExport
   module Entities
     class Dump
-      extend Dry::Initializer[undefined: false]
+      attr_reader :name, :type, :database, :file
+
+      def initialize(name: nil, type: nil, database: nil, file: nil)
+        @name = String(name)
+        raise ArgumentError, 'Dump name must not be empty' if @name.empty?
+        raise ArgumentError, 'Dump name does not match criteria' unless /.+_20[0-9]{6}_[0-9]{6}\Z/.match?(@name)
 
-      option :name,     Types::DumpName
-      option :type,     Types::DumpType
-      option :database, Types::Strict::String.constrained(filled: true)
-      option :file,     Types::DumpFile, default: proc { PgExport::ValueObjects::DumpFile.new }
+        @type = String(type)
+        @type = 'plain' if @type.empty?
+        raise ArgumentError, 'Dump type must be one of: plain, encrypted' unless %w[plain encrypted].include?(@type)
+
+        @database = database
+
+        @file = file
+        @file = ValueObjects::DumpFile.new if @file.nil?
+        raise ArgumentError, "Invalid file type: #{@file.class}" unless @file.is_a?(ValueObjects::DumpFile)
+      end
 
       def encrypt(cipher_factory:)
         self.file = file.copy(cipher: cipher_factory.encryptor)
@@ -32,13 +40,17 @@ class PgExport
       end
 
       def file=(f)
-        @file = Types::DumpFile[f]
+        @file = f
+
+        raise ArgumentError, "Invalid file type: '#{f}'" unless @file.is_a?(ValueObjects::DumpFile)
       end
 
       protected
 
       def type=(t)
-        @type = Types::DumpType[t]
+        @type = t.to_s
+
+        raise ArgumentError, "Dump type '#{t}' must be one of: plain, encrypted" unless %w[plain encrypted].include?(@type)
       end
     end
   end

data/lib/pg_export/lib/pg_export/factories/cipher_factory.rb

@@ -1,31 +1,32 @@
 # frozen_string_literal: true
 
 require 'openssl'
-require 'pg_export/import'
 
 class PgExport
   module Factories
     class CipherFactory
-      include Import['config']
+      def initialize(encryption_algorithm:, encryption_key:)
+        @encryption_algorithm = encryption_algorithm
+        @encryption_key = encryption_key
+      end
 
       def encryptor
-        cipher(:encrypt)
+        build_cipher(:encrypt)
       end
 
       def decryptor
-        cipher(:decrypt)
+        build_cipher(:decrypt)
       end
 
       private
 
-      ALGORITHM = 'AES-128-CBC'
-      private_constant :ALGORITHM
+      attr_reader :encryption_algorithm, :encryption_key
 
-      def cipher(type)
-        OpenSSL::Cipher.new(ALGORITHM).tap do |cipher|
-          cipher.public_send(type)
-          cipher.key = config.dump_encryption_key
-        end
+      def build_cipher(type)
+        cipher = OpenSSL::Cipher.new(encryption_algorithm)
+        cipher.public_send(type)
+        cipher.key = encryption_key
+        cipher
       end
     end
   end

data/lib/pg_export/lib/pg_export/factories/dump_factory.rb

@@ -4,7 +4,6 @@ require 'open3'
 require 'tempfile'
 
 require 'pg_export/lib/pg_export/entities/dump'
-require 'pg_export/import'
 
 class PgExport
   module Factories

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,22 +7,21 @@ 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
 
       def open
-        if password.nil?
-          @ssh = Net::SSH.start(host, user)
-        else
-          @ssh = Net::SSH.start(host, user, password)
-        end
+        @ssh =
+          if password.nil?
+            Net::SSH.start(host, user)
+          else
+            Net::SSH.start(host, user, password)
+          end
       end
 
       def welcome
-        open.exec!('hostname')
+        open.exec!('hostname; whoami')
       end
 
       def close
@@ -48,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/{download_dump_from_ftp.rb → download_dump.rb}

@@ -5,7 +5,7 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class DownloadDumpFromFtp < InteractiveListener
+      class DownloadDump < InteractiveListener
         def on_step(*)
           @spinner = build_spinner('Downloading')
         end

data/lib/pg_export/lib/pg_export/listeners/interactive/{fetch_dumps_from_ftp.rb → fetch_dumps.rb}

@@ -5,7 +5,7 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class FetchDumpsFromFtp < InteractiveListener
+      class FetchDumps < InteractiveListener
         def on_step(*)
           @spinner = build_spinner('Fetching dumps')
         end

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

@@ -7,7 +7,7 @@ class PgExport
     class Interactive
       class OpenConnection < InteractiveListener
         def on_step(*)
-          @spinner = build_spinner('Opening ftp connection')
+          @spinner = build_spinner('Opening connection')
         end
 
         def on_step_succeeded(*)

data/lib/pg_export/lib/pg_export/listeners/interactive/{remove_old_dumps_from_ftp.rb → remove_old_dumps.rb}

@@ -5,9 +5,9 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class RemoveOldDumpsFromFtp < InteractiveListener
+      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/select_database.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative '../interactive_listener'
+
+class PgExport
+  module Listeners
+    class Interactive
+      class SelectDatabase < InteractiveListener
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative '../interactive_listener'
+
+class PgExport
+  module Listeners
+    class Interactive
+      class SelectDump < InteractiveListener
+      end
+    end
+  end
+end

data/lib/pg_export/lib/pg_export/listeners/interactive/{upload_dump_to_ftp.rb → upload_dump.rb}

@@ -5,9 +5,9 @@ require_relative '../interactive_listener'
 class PgExport
   module Listeners
     class Interactive
-      class UploadDumpToFtp < InteractiveListener
+      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/{download_dump_from_ftp.rb → download_dump.rb}

@@ -5,7 +5,7 @@ require_relative '../plain_listener'
 class PgExport
   module Listeners
     class Plain
-      class DownloadDumpFromFtp < PlainListener
+      class DownloadDump < PlainListener
         def on_step_succeeded(event)
           logger.info("Download #{event[:value][:dump]}")
         end

data/lib/pg_export/lib/pg_export/listeners/plain/{fetch_dumps_from_ftp.rb → fetch_dumps.rb}

@@ -5,7 +5,7 @@ require_relative '../plain_listener'
 class PgExport
   module Listeners
     class Plain
-      class FetchDumpsFromFtp < PlainListener
+      class FetchDumps < PlainListener
         def on_step_succeeded(event)
           logger.info("Fetch dumps (#{event[:value][:dumps].count} items)")
         end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../plain_listener'
+
+class PgExport
+  module Listeners
+    class Plain
+      class PrepareParams < PlainListener
+        def on_step_succeeded(event)
+          logger.info('Init')
+        end
+      end
+    end
+  end
+end

data/lib/pg_export/lib/pg_export/listeners/plain/{remove_old_dumps_from_ftp.rb → remove_old_dumps.rb}

@@ -5,7 +5,7 @@ require_relative '../plain_listener'
 class PgExport
   module Listeners
     class Plain
-      class RemoveOldDumpsFromFtp < PlainListener
+      class RemoveOldDumps < PlainListener
         def on_step_succeeded(event)
           event[:value][:removed_dumps].each do |filename|
             logger.info("Remove #{filename} from #{event[:value][:gateway]}")

data/lib/pg_export/lib/pg_export/listeners/plain/{upload_dump_to_ftp.rb → upload_dump.rb}

@@ -5,7 +5,7 @@ require_relative '../plain_listener'
 class PgExport
   module Listeners
     class Plain
-      class UploadDumpToFtp < PlainListener
+      class UploadDump < PlainListener
         def on_step_succeeded(event)
           logger.info("Upload #{event[:value][:dump]} to #{event[:value][:gateway]}")
         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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'pg_export/lib/pg_export/value_objects/result'
+
+class PgExport
+  module Operations
+    class RemoveOldDumps
+      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: keep
+        )
+        dumps.each do |d|
+          gateway.delete(d.name)
+        end
+
+        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