pg_export 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c43da7e8d06b79d2a09c0d4f41f7a9ffcb7766ec3129f8fa7323147af23b28
-  data.tar.gz: 4bcf143f440f6ffbcce3b456d6afa9e4d84f05d545aaa2199706931c757068c8
+  metadata.gz: d0f62f09db68ae3716d4ae83fea7780240cc66af83d7cbe813cd5d2e7bfae3e7
+  data.tar.gz: 0f80f6ad47217232ec83877f4bfc1b15c62a248e214229a9a6444bdecee61f44
 SHA512:
-  metadata.gz: 39acecf631b54e5216e65b3d8db6f13fbd0dc3042bf1a86ecc85d3edfd774a83fed62784d99f85859436661763ffab59ab1b94072fb51bad35a47ea581b77840
-  data.tar.gz: f7d2bce1bdc045fad6841806c195ff1c7385f5fc516a9af3933e2260f62f6cc4efbbeca1321ac1a75b794ed45e57dc900a0967897672e5e00ec602705c5f39cb
+  metadata.gz: ecb017891a15fd94e15eef06972066655f13aeff22a4030ea840dc1ff2df6dd00451b2c7eb2e1dad248f95bc27b63d56cfe6275f675c0f2a2be6ab6f0ad7bdcd
+  data.tar.gz: e89de78f4a3a3d804f3ee82573fd97d03154a8f792f3e1a63a52f475798a091e96d0fc556e4dabbe8aa3c37497a7ae69c743a232e7bdd8a3a19d70547468df69

data/CHANGELOG.md

@@ -7,6 +7,7 @@
   - DUMP_ENCRYPTION_KEY -> PG_EXPORT_ENCRYPTION_KEY
 - Drop Ruby 2.3 support
 - Add SSH option
+- Add +encryption_algorith+ moption to interface
 
 ### 0.7.7 - 2020.09.07
 

data/README.md

@@ -87,7 +87,7 @@ Note, that variables cannot include `#` sign, [more info](http://serverfault.com
 __Step 2.__ Print the configuration to verify if env variables has been loaded properly.
 
     $ pg_export --configuration
-    => {:dump_encryption_key=>"k4***", :gateway_host=>"yourftp.example.com", :gateway_user=>"your_gateway_user",
+    => {:encryption_key=>"k4***", :gateway_host=>"yourftp.example.com", :gateway_user=>"your_gateway_user",
        :gateway_password=>"pass***", :logger_format=>"plain", :keep_dumps=>2}
        
 __Step 3.__ Try connecting to FTP to verify the connection.

data/bin/pg_export

@@ -7,30 +7,33 @@ require 'pg_export'
 
 ENV['KEEP_DUMPS'] = ENV['KEEP_DUMPS'] || '10'
 ENV['GATEWAY'] = 'ftp'
+ENV['PG_EXPORT_MODE'] = 'plain'
+ENV['PG_EXPORT_ENCRYPTION_ALGORITHM'] = 'AES-128-CBC'
 
-interactive = false
 database = nil
 
-
 option_parser = OptionParser.new do |opts|
   opts.banner = <<~TXT
-NAME
-    pg_export - CLI for exporting/importing PostgreSQL dumps via FTP/SSH
+    NAME
+        pg_export - CLI for exporting/importing PostgreSQL dumps via FTP/SSH
 
-SYNOPSIS (default mode)      
-    pg_export DATABASE [options]
+    SYNOPSIS (default mode)
+        pg_export DATABASE [options]
 
-SYNOPSIS (interactive mode)      
-    pg_export --interactive [DATABASE] [options]
+    SYNOPSIS (interactive mode)
+        pg_export --interactive [DATABASE] [options]
 
-ARGUMENTS
-    DATABASE - database name to export (when default mode)
-             - phrase to filter database dumps by (when interactive mode)
+    ARGUMENTS
+        DATABASE - database name to export (when default mode)
+                 - phrase to filter database dumps by (when interactive mode)
 
-OPTIONS
+    OPTIONS
   TXT
 
-  opts.on('-g', '--gateway GATEWAY', String, 'ssh or ftp (default: ftp) - credentials need to be set via ENVs') do |g|
+  opts.program_name = 'pg_export'
+  opts.version = PgExport::VERSION
+
+  opts.on('-g', '--gateway GATEWAY', %w[ftp ssh], 'Allowed values: ftp, ssh. Default: ftp. Credentials need to be set via ENVs') do |g|
     ENV['GATEWAY'] = g
   end
 
@@ -46,11 +49,15 @@ OPTIONS
     database = d
   end
 
-  opts.on('-e', '--encryption_key KEY', String, 'Dumps will be SSL(AES-128-CBC) encrypted using this key. Should have exactly 16 characters. Overwrites PG_EXPORT_ENCRYPTION_KEY env') do |key|
+  opts.on('-e', '--encryption_key KEY', String, 'Dumps will be SSL encrypted using this key. Should have exactly 16 characters. Overwrites PG_EXPORT_ENCRYPTION_KEY env') do |key|
     ENV['PG_EXPORT_ENCRYPTION_KEY'] = key
   end
 
-  opts.on('-k', '--keep KEEP', String, "Number of dump files to keep on FTP (default: 10). Overwrites KEEP_DUMPS env") do |keep|
+  opts.on('-a', '--algorithm ALGORITHM', String, 'Encryption cipher algorithm (default: AES-128-CBC). Overwrites PG_EXPORT_ENCRYPTION_ALGORITHM env. For available option see `$ openssl list -cipher-algorithms`') do |key|
+    ENV['PG_EXPORT_ENCRYPTION_KEY'] = key
+  end
+
+  opts.on('-k', '--keep KEEP', String, 'Number of dump files to keep on FTP (default: 10). Overwrites KEEP_DUMPS env') do |keep|
     ENV['KEEP_DUMPS'] = keep
   end
 
@@ -63,7 +70,7 @@ OPTIONS
   end
 
   opts.on('-i', '--interactive', 'Interactive mode, for importing dumps') do
-    interactive = true
+    ENV['PG_EXPORT_MODE'] = 'interactive'
   end
 
   opts.on('-v', '--version', 'Show version') do
@@ -78,11 +85,12 @@ OPTIONS
 
   opts.separator <<~TXT
 
-ENV
-    PG_EXPORT_GATEWAY_HOST           required
-    PG_EXPORT_GATEWAY_USER           required
-    PG_EXPORT_GATEWAY_PASSWORD       optional when eg. authorized key is added
-    PG_EXPORT_ENCRYPTION_KEY         required or set by --encryption_key)
+    ENV
+        PG_EXPORT_GATEWAY_HOST           required
+        PG_EXPORT_GATEWAY_USER           required
+        PG_EXPORT_GATEWAY_PASSWORD       optional when eg. authorized key is added
+        PG_EXPORT_ENCRYPTION_KEY         required or set by --encryption_key)
+        PG_EXPORT_ENCRYPTION_ALGORITHM   required or set by --algorithm)
   TXT
 
   opts.separator "\nTEST RUN"
@@ -113,6 +121,8 @@ begin
   database = ARGV.first unless ARGV.empty?
 rescue OptionParser::ParseError => e
   warn e.message.capitalize
+  warn 'Details:'
+  warn option_parser.to_s.split("\n").grep(/ #{e.args.first}/).join("\n")
   warn 'Type "pg_export" for available options'
   exit
 end
@@ -120,19 +130,18 @@ end
 require 'pg_export/container'
 
 begin
-  pg_export =
-    if interactive
-      PgExport.interactive
-    else
-      PgExport.plain
-    end
+  pg_export = PgExport.boot
 rescue PgExport::InitializationError => e
   warn 'Unable to initialize PgExport due to invalid configuration. Check you ENVs.'
   warn "Detailed message: #{e.message}"
   exit
 end
 
-pg_export.call(database) do |result|
-  result.success { puts 'Success' }
-  result.failure { |outcome| warn outcome[:message] }
+begin
+  pg_export.call(database) do |result|
+    result.success { puts 'Success' }
+    result.failure { |outcome| warn outcome[:message] }
+  end
+rescue Interrupt
+  puts
 end

data/lib/pg_export.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
 require 'pg_export/container'
+require 'pg_export/import'
 
 class PgExport
   class InitializationError < StandardError; end
 
-  class << self
-    def interactive
-      PgExport::Container.start(:interactive)
-      new(transaction: PgExport::Container['transactions.import_dump_interactively'])
-    end
+  include Import['transaction']
 
-    def plain
-      PgExport::Container.start(:plain)
-      new(transaction: PgExport::Container['transactions.export_dump'])
-    end
-  end
-
-  def initialize(transaction:)
-    @transaction = transaction
+  def self.boot
+    PgExport::Container.start(:main)
+    new
   end
 
   def call(database_name, &block)

data/lib/pg_export/configuration.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require 'dry-types'
+require 'pg_export/lib/pg_export/types'
 require 'dry-struct'
 
 class PgExport
   class Configuration < Dry::Struct
-    include Dry::Types()
-
-    attribute :dump_encryption_key, Strict::String.constrained(size: 16)
-    attribute :gateway_host,        Strict::String
-    attribute :gateway_user,        Strict::String
-    attribute :gateway_password,    Strict::String.optional
-    attribute :logger_format,       Coercible::String.enum('plain', 'timestamped', 'muted')
-    attribute :keep_dumps,          Coercible::Integer.constrained(gteq: 0)
+    attribute :encryption_key,       PgExport::Types::Strict::String.constrained(size: 16)
+    attribute :encryption_algorithm, PgExport::Types::Strict::String
+    attribute :gateway_host,         PgExport::Types::Strict::String
+    attribute :gateway_user,         PgExport::Types::Strict::String
+    attribute :gateway_password,     PgExport::Types::Strict::String.optional
+    attribute :logger_format,        PgExport::Types::Coercible::String.enum('plain', 'timestamped', 'muted')
+    attribute :keep_dumps,           PgExport::Types::Coercible::Integer.constrained(gteq: 0)
 
     def self.build(env)
       new(
-        dump_encryption_key: env['PG_EXPORT_ENCRYPTION_KEY'],
+        encryption_key: env['PG_EXPORT_ENCRYPTION_KEY'],
+        encryption_algorithm: env['PG_EXPORT_ENCRYPTION_ALGORITHM'],
         gateway_host: env['PG_EXPORT_GATEWAY_HOST'],
         gateway_user: env['PG_EXPORT_GATEWAY_USER'],
         gateway_password: env['PG_EXPORT_GATEWAY_PASSWORD'] == '' ? nil : env['PG_EXPORT_GATEWAY_PASSWORD'],
@@ -31,6 +31,10 @@ class PgExport
       ENV['GATEWAY'].to_sym
     end
 
+    def mode
+      ENV['PG_EXPORT_MODE'].to_sym
+    end
+
     def logger_muted?
       logger_format == 'muted'
     end

data/lib/pg_export/container.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'dry/system/container'
-require 'pg_export/lib/pg_export/types'
 
 class PgExport
   class Container < Dry::System::Container
@@ -14,44 +13,11 @@ class PgExport
 
     load_paths!('lib')
 
-    boot(:ftp) do
-      init do
-        require 'pg_export/lib/pg_export/factories/ftp_gateway_factory'
-      end
-
-      start do
-        use :config
-        register('factories.gateway_factory') { ::PgExport::Factories::FtpGatewayFactory.new }
-      end
-    end
-
-    boot(:ssh) do
-      init do
-        require 'pg_export/lib/pg_export/factories/ssh_gateway_factory'
-      end
-
-      start do
-        use :config
-        register('factories.gateway_factory') { ::PgExport::Factories::SshGatewayFactory.new }
-      end
-    end
-
     boot(:main) do |system|
-      init do
-        require 'pg_export/lib/pg_export/operations/encrypt_dump'
-        require 'pg_export/lib/pg_export/operations/decrypt_dump'
-        require 'pg_export/lib/pg_export/operations/remove_old_dumps_from_ftp'
-        require 'pg_export/lib/pg_export/operations/open_connection'
-      end
-
-      start do
-        use(system[:config].gateway)
-
-        register('operations.encrypt_dump') { ::PgExport::Operations::EncryptDump.new }
-        register('operations.decrypt_dump') { ::PgExport::Operations::DecryptDump.new }
-        register('operations.remove_old_dumps_from_ftp') { ::PgExport::Operations::RemoveOldDumpsFromFtp.new }
-        register('operations.open_connection') { ::PgExport::Operations::OpenConnection.new }
-      end
+      use(:config)
+      use(system[:config].gateway) # ftp/ssh
+      use(:operations)
+      use(system[:config].mode)    # plain/interactive
     end
   end
 end

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

@@ -9,23 +9,20 @@ class PgExport
       include Import['config']
 
       def encryptor
-        cipher(:encrypt)
+        build_cipher(:encrypt)
       end
 
       def decryptor
-        cipher(:decrypt)
+        build_cipher(:decrypt)
       end
 
       private
 
-      ALGORITHM = 'AES-128-CBC'
-      private_constant :ALGORITHM
-
-      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(config.encryption_algorithm)
+        cipher.public_send(type)
+        cipher.key = config.encryption_key
+        cipher
       end
     end
   end

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

@@ -16,11 +16,12 @@ class PgExport
       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

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,7 +5,7 @@ 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]}")
         end

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

@@ -5,7 +5,7 @@ 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]}")
         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/{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/operations/{remove_old_dumps_from_ftp.rb → remove_old_dumps.rb}

@@ -5,7 +5,7 @@ require 'pg_export/import'
 
 class PgExport
   module Operations
-    class RemoveOldDumpsFromFtp
+    class RemoveOldDumps
       include Dry::Transaction::Operation
       include Import['repositories.gateway_dump_repository', 'config']
 

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

@@ -18,8 +18,8 @@ class PgExport
       step :build_dump
       step :encrypt_dump, with: 'operations.encrypt_dump'
       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 :upload_dump
+      step :remove_old_dumps, with: 'operations.remove_old_dumps'
       step :close_connection
 
       private
@@ -42,7 +42,7 @@ class PgExport
         Failure(message: 'Unable to dump database: ' + e.to_s)
       end
 
-      def upload_dump_to_ftp(dump:, gateway:)
+      def upload_dump(dump:, gateway:)
         gateway.persist(dump.file, dump.name)
         Success(dump: dump, gateway: gateway)
       end

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

@@ -19,9 +19,9 @@ class PgExport
       ]
 
       step :open_connection, with: 'operations.open_connection'
-      step :fetch_dumps_from_ftp
+      step :fetch_dumps
       step :select_dump
-      step :download_dump_from_ftp
+      step :download_dump
       step :close_connection
       step :decrypt_dump, with: 'operations.decrypt_dump'
       step :select_database
@@ -29,7 +29,7 @@ class PgExport
 
       private
 
-      def fetch_dumps_from_ftp(database_name:, gateway:)
+      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?
 
@@ -41,7 +41,7 @@ class PgExport
         Success(dump: dump, gateway: gateway)
       end
 
-      def download_dump_from_ftp(dump:, gateway:)
+      def download_dump(dump:, gateway:)
         dump.file = gateway_dump_file_repository.by_name(name: dump.name, gateway: gateway)
         Success(dump: dump, gateway: gateway)
       end

data/lib/pg_export/system/boot/config.rb

@@ -2,10 +2,26 @@
 
 PgExport::Container.boot :config do
   init do
+    require 'logger'
+    require 'pg_export/lib/pg_export/types'
     require 'pg_export/configuration'
   end
 
   start do
-    register(:config, memoize: true) { PgExport::Configuration.build(ENV) }
+    config = PgExport::Configuration.build(ENV)
+
+    formatters = {
+      plain: ->(_, _, _, message) { "#{message}\n" },
+      muted: ->(*) { raise 'Do not initialize logger when it is muted' },
+      timestamped: lambda do |severity, datetime, progname, message|
+        "#{datetime} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{progname} #{severity}: #{message}\n"
+      end
+    }
+
+    register(:logger, memoize: true) do
+      Logger.new($stdout, formatter: formatters.fetch(config.logger_format.to_sym))
+    end
+
+    register(:config, memoize: true) { config }
   end
 end

data/lib/pg_export/system/boot/ftp.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+PgExport::Container.boot(:ftp) do
+  init do
+    require 'pg_export/lib/pg_export/factories/ftp_gateway_factory'
+  end
+
+  start do
+    register('factories.gateway_factory') { ::PgExport::Factories::FtpGatewayFactory.new }
+  end
+end

data/lib/pg_export/system/boot/interactive.rb

@@ -6,20 +6,14 @@ PgExport::Container.boot(:interactive) do
   end
 
   start do
-    use :main
-
-    # type = 'plain'
     type = 'interactive'
-
     transaction = PgExport::Transactions::ImportDumpInteractively.new(ui_input: target["ui.#{type}.input"])
 
     unless target[:config].logger_muted?
-      use :logger
-
       %i[
         open_connection
-        fetch_dumps_from_ftp
-        download_dump_from_ftp
+        fetch_dumps
+        download_dump
         decrypt_dump
         restore
       ].each do |step|
@@ -27,6 +21,6 @@ PgExport::Container.boot(:interactive) do
       end
     end
 
-    register('transactions.import_dump_interactively', memoize: true) { transaction }
+    register('transaction', memoize: true) { transaction }
   end
 end

data/lib/pg_export/system/boot/operations.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+PgExport::Container.boot(:operations) do
+  init do
+    require 'pg_export/lib/pg_export/operations/encrypt_dump'
+    require 'pg_export/lib/pg_export/operations/decrypt_dump'
+    require 'pg_export/lib/pg_export/operations/remove_old_dumps'
+    require 'pg_export/lib/pg_export/operations/open_connection'
+  end
+
+  start do
+    register('operations.encrypt_dump') { ::PgExport::Operations::EncryptDump.new }
+    register('operations.decrypt_dump') { ::PgExport::Operations::DecryptDump.new }
+    register('operations.remove_old_dumps') { ::PgExport::Operations::RemoveOldDumps.new }
+    register('operations.open_connection') { ::PgExport::Operations::OpenConnection.new }
+  end
+end

data/lib/pg_export/system/boot/plain.rb

@@ -6,28 +6,22 @@ PgExport::Container.boot(:plain) do
   end
 
   start do
-    use :main
-
     transaction = PgExport::Transactions::ExportDump.new
 
     unless target[:config].logger_muted?
-      use :logger
-
       type = 'plain'
-      # type = 'interactive'
-
       %i[
         build_dump
         encrypt_dump
         open_connection
-        upload_dump_to_ftp
-        remove_old_dumps_from_ftp
+        upload_dump
+        remove_old_dumps
         close_connection
       ].each do |step|
         transaction.subscribe(step => target["listeners.#{type}.#{step}"])
       end
     end
 
-    register('transactions.export_dump', memoize: true) { transaction }
+    register('transaction', memoize: true) { transaction }
   end
 end

data/lib/pg_export/system/boot/ssh.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+PgExport::Container.boot(:ssh) do
+  init do
+    require 'pg_export/lib/pg_export/factories/ssh_gateway_factory'
+  end
+
+  start do
+    register('factories.gateway_factory') { ::PgExport::Factories::SshGatewayFactory.new }
+  end
+end

data/lib/pg_export/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PgExport
-  VERSION = '1.0.0.rc3'
+  VERSION = '1.0.0.rc4'
 end

data/pg_export.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
+  spec.add_dependency 'bcrypt_pbkdf'
   spec.add_dependency 'dry-initializer', '~> 3.0'
-  spec.add_dependency 'dry-types', '~> 1.0'
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-system', '~> 0.18'
   spec.add_dependency 'dry-transaction', '~> 0.13'
-  spec.add_dependency 'bcrypt_pbkdf'
+  spec.add_dependency 'dry-types', '~> 1.0'
   spec.add_dependency 'ed25519'
-  spec.add_dependency 'net-ssh'
   spec.add_dependency 'net-scp'
+  spec.add_dependency 'net-ssh'
   spec.add_dependency 'tty-prompt'
   spec.add_dependency 'tty-spinner'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_export
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Krzysztof Maicher
@@ -11,33 +11,33 @@ cert_chain: []
 date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-scp
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -273,7 +273,6 @@ files:
 - bin/pg_export
 - bin/setup
 - lib/pg_export.rb
-- lib/pg_export/build_logger.rb
 - lib/pg_export/configuration.rb
 - lib/pg_export/container.rb
 - lib/pg_export/import.rb
@@ -288,29 +287,29 @@ files:
 - lib/pg_export/lib/pg_export/listeners/interactive/build_dump.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/close_connection.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/decrypt_dump.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/download_dump_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/interactive/download_dump.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/encrypt_dump.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/fetch_dumps_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/interactive/fetch_dumps.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/open_connection.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/remove_old_dumps_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/interactive/remove_old_dumps.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/restore.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/upload_dump_to_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/interactive/upload_dump.rb
 - lib/pg_export/lib/pg_export/listeners/interactive_listener.rb
 - lib/pg_export/lib/pg_export/listeners/plain/build_dump.rb
 - lib/pg_export/lib/pg_export/listeners/plain/close_connection.rb
 - lib/pg_export/lib/pg_export/listeners/plain/decrypt_dump.rb
-- lib/pg_export/lib/pg_export/listeners/plain/download_dump_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/plain/download_dump.rb
 - lib/pg_export/lib/pg_export/listeners/plain/encrypt_dump.rb
-- lib/pg_export/lib/pg_export/listeners/plain/fetch_dumps_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/plain/fetch_dumps.rb
 - lib/pg_export/lib/pg_export/listeners/plain/open_connection.rb
-- lib/pg_export/lib/pg_export/listeners/plain/remove_old_dumps_from_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/plain/remove_old_dumps.rb
 - lib/pg_export/lib/pg_export/listeners/plain/restore.rb
-- lib/pg_export/lib/pg_export/listeners/plain/upload_dump_to_ftp.rb
+- lib/pg_export/lib/pg_export/listeners/plain/upload_dump.rb
 - lib/pg_export/lib/pg_export/listeners/plain_listener.rb
 - lib/pg_export/lib/pg_export/operations/decrypt_dump.rb
 - lib/pg_export/lib/pg_export/operations/encrypt_dump.rb
 - lib/pg_export/lib/pg_export/operations/open_connection.rb
-- lib/pg_export/lib/pg_export/operations/remove_old_dumps_from_ftp.rb
+- lib/pg_export/lib/pg_export/operations/remove_old_dumps.rb
 - lib/pg_export/lib/pg_export/repositories/gateway_dump_file_repository.rb
 - lib/pg_export/lib/pg_export/repositories/gateway_dump_repository.rb
 - lib/pg_export/lib/pg_export/transactions/export_dump.rb
@@ -320,9 +319,11 @@ files:
 - lib/pg_export/lib/pg_export/ui/plain/input.rb
 - lib/pg_export/lib/pg_export/value_objects/dump_file.rb
 - lib/pg_export/system/boot/config.rb
+- lib/pg_export/system/boot/ftp.rb
 - lib/pg_export/system/boot/interactive.rb
-- lib/pg_export/system/boot/logger.rb
+- lib/pg_export/system/boot/operations.rb
 - lib/pg_export/system/boot/plain.rb
+- lib/pg_export/system/boot/ssh.rb
 - lib/pg_export/version.rb
 - pg_export.gemspec
 homepage: https://github.com/maicher/pg_export

data/lib/pg_export/build_logger.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'logger'
-
-class PgExport
-  class BuildLogger
-    FORMATS = {
-      plain: ->(_, _, _, message) { "#{message}\n" },
-      muted: ->(*) { raise 'Do not initialize logger when it is muted' },
-      timestamped: lambda do |severity, datetime, progname, message|
-        "#{datetime} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{progname} #{severity}: #{message}\n"
-      end
-    }.freeze
-
-    def self.call(stream:, format:)
-      Logger.new(stream).tap do |logger|
-        logger.formatter = FORMATS.fetch(format.to_sym)
-      end
-    end
-  end
-end

data/lib/pg_export/system/boot/logger.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-PgExport::Container.boot :logger do
-  init do
-    require 'pg_export/build_logger'
-  end
-
-  start do
-    use :config
-
-    register(:logger, memoize: true) do
-      PgExport::BuildLogger.call(stream: $stdout, format: target[:config].logger_format)
-    end
-  end
-end