pg_export 0.7.7 → 1.0.0.rc5

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.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../plain_listener'
+
+class PgExport
+  module Listeners
+    class Plain
+      class RemoveOldDumps < PlainListener
+        def on_step_succeeded(event)
+          event[:value][:removed_dumps].each do |filename|
+            logger.info("Remove #{filename} from #{event[:value][:gateway]}")
+          end
+        end
+      end
+    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.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../plain_listener'
+
+class PgExport
+  module Listeners
+    class Plain
+      class UploadDump < PlainListener
+        def on_step_succeeded(event)
+          logger.info("Upload #{event[:value][:dump]} to #{event[:value][:gateway]}")
+        end
+      end
+    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 → remove_old_dumps.rb}

@@ -5,21 +5,21 @@ require 'pg_export/import'
 
 class PgExport
   module Operations
-    class RemoveOldDumpsFromFtp
+    class RemoveOldDumps
       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).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 :upload_dump_to_ftp
-      step :remove_old_dumps_from_ftp, with: 'operations.remove_old_dumps_from_ftp'
-      step :close_ftp_connection
+      step :open_connection, with: 'operations.open_connection'
+      step :upload_dump
+      step :remove_old_dumps, with: 'operations.remove_old_dumps'
+      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(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

@@ -12,47 +12,47 @@ class PgExport
     class ImportDumpInteractively
       include Dry::Transaction(container: PgExport::Container)
       include Import[
+        'ui.interactive.input',
         'adapters.bash_adapter',
-        'repositories.ftp_dump_repository',
-        'repositories.ftp_dump_file_repository',
-        'ui_input'
+        'repositories.gateway_dump_repository',
+        'repositories.gateway_dump_file_repository'
       ]
 
-      step :open_ftp_connection, with: 'operations.open_ftp_connection'
-      step :fetch_dumps_from_ftp
+      step :open_connection, with: 'operations.open_connection'
+      step :fetch_dumps
       step :select_dump
-      step :download_dump_from_ftp
-      step :close_ftp_connection
+      step :download_dump
+      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(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:)
-        dump = ui_input.select_dump(dumps)
-        Success(dump: dump, ftp_adapter: ftp_adapter)
+      def select_dump(dumps:, gateway:)
+        dump = input.select_dump(dumps)
+        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(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
 
       def select_database(dump:)
-        name = ui_input.enter_database_name(dump.database)
+        name = input.enter_database_name(dump.database)
         Success(dump: dump, database: name)
       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: ->(*) {},
+      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))
+    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,27 +6,11 @@ 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_ftp_connection
-        fetch_dumps_from_ftp
-        download_dump_from_ftp
-        decrypt_dump
-        restore
-      ].each do |step|
-        transaction.subscribe(step => target["listeners.#{type}.#{step}"])
-      end
+    transaction = PgExport::Transactions::ImportDumpInteractively.new
+    transaction.steps.each do |step|
+      transaction.subscribe(step.name => target["listeners.interactive.#{step.name}"])
     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,11 @@ 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_ftp_connection
-        upload_dump_to_ftp
-        remove_old_dumps_from_ftp
-        close_ftp_connection
-      ].each do |step|
-        transaction.subscribe(step => target["listeners.#{type}.#{step}"])
-      end
+    transaction.steps.each do |step|
+      transaction.subscribe(step.name => target["listeners.plain.#{step.name}"])
     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 = '0.7.7'
+  VERSION = '1.0.0.rc5'
 end

data/pg_export.gemspec

@@ -10,29 +10,33 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Krzysztof Maicher']
   spec.email         = ['krzysztof.maicher@gmail.com']
 
-  spec.summary       = 'CLI for creating and exporting PostgreSQL dumps to FTP.'
-  spec.description   = "CLI for creating and exporting PostgreSQL dumps to FTP.\
+  spec.summary       = 'CLI for exporting/importing PostgreSQL dumps via FTP/SSH.'
+  spec.description   = "CLI for exporting/importing PostgreSQL dumps via FTP/SSH.\
                         Can be used for backups or synchronizing databases between production and development environments."
   spec.homepage      = 'https://github.com/maicher/pg_export'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.executables   = ['pg_export']
   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 'dry-types', '~> 1.0'
+  spec.add_dependency 'ed25519'
+  spec.add_dependency 'net-scp'
+  spec.add_dependency 'net-ssh'
   spec.add_dependency 'tty-prompt'
   spec.add_dependency 'tty-spinner'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'pg', '~> 0.21'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.4'
   spec.add_development_dependency 'rubocop', '~> 0.59.2'
 end