pg_export 1.0.0.rc4 → 1.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f62f09db68ae3716d4ae83fea7780240cc66af83d7cbe813cd5d2e7bfae3e7
-  data.tar.gz: 0f80f6ad47217232ec83877f4bfc1b15c62a248e214229a9a6444bdecee61f44
+  metadata.gz: b927b4b2f8c0ca36682a15ae9f90aa975980d9d3874989f7ab19fe256fcecb7d
+  data.tar.gz: b653c480d52143bf58864f7904a404a21802aa389e9b24ee9f271dbafa064969
 SHA512:
-  metadata.gz: ecb017891a15fd94e15eef06972066655f13aeff22a4030ea840dc1ff2df6dd00451b2c7eb2e1dad248f95bc27b63d56cfe6275f675c0f2a2be6ab6f0ad7bdcd
-  data.tar.gz: e89de78f4a3a3d804f3ee82573fd97d03154a8f792f3e1a63a52f475798a091e96d0fc556e4dabbe8aa3c37497a7ae69c743a232e7bdd8a3a19d70547468df69
+  metadata.gz: c1ae01b513f51ef4675b1dbae7337ac6ffe11d3ca481bf272ea6338e1f1b1bcd5fb75b240aefdcc12117e721a6097e945b1832af56344ac232ebfad55a5e98db
+  data.tar.gz: 31dc4ab7b943ce973f14b6a42867d388fa18a8c8f56d52bd9c0e5e30b241258555e804a4d59b53ed9d409fae8d7a8aa8ad8a130356383b66cbbbc4b1a1b75aba

data/bin/pg_export

@@ -4,6 +4,7 @@
 require 'optparse'
 
 require 'pg_export'
+require 'pg_export/version'
 
 ENV['KEEP_DUMPS'] = ENV['KEEP_DUMPS'] || '10'
 ENV['GATEWAY'] = 'ftp'

data/lib/pg_export/configuration.rb

@@ -10,8 +10,10 @@ class PgExport
     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 :logger_format,        PgExport::Types::Coercible::Symbol.enum(:plain, :timestamped, :muted)
     attribute :keep_dumps,           PgExport::Types::Coercible::Integer.constrained(gteq: 0)
+    attribute :gateway,              PgExport::Types::Coercible::Symbol.enum(:ftp, :ssh)
+    attribute :mode,                 PgExport::Types::Coercible::Symbol.enum(:plain, :interactive)
 
     def self.build(env)
       new(
@@ -21,22 +23,12 @@ class PgExport
         gateway_user: env['PG_EXPORT_GATEWAY_USER'],
         gateway_password: env['PG_EXPORT_GATEWAY_PASSWORD'] == '' ? nil : env['PG_EXPORT_GATEWAY_PASSWORD'],
         logger_format: env['LOGGER_FORMAT'] || 'plain',
-        keep_dumps: env['KEEP_DUMPS'] || 10
+        keep_dumps: env['KEEP_DUMPS'] || 10,
+        gateway: env['GATEWAY'],
+        mode: env['PG_EXPORT_MODE']
       )
     rescue Dry::Struct::Error => e
       raise PgExport::InitializationError, e.message.gsub('[PgExport::Configuration.new] ', '')
     end
-
-    def gateway
-      ENV['GATEWAY'].to_sym
-    end
-
-    def mode
-      ENV['PG_EXPORT_MODE'].to_sym
-    end
-
-    def logger_muted?
-      logger_format == 'muted'
-    end
   end
 end

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/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/transactions/import_dump_interactively.rb

@@ -12,10 +12,10 @@ class PgExport
     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',
-        'ui_input'
+        'repositories.gateway_dump_file_repository'
       ]
 
       step :open_connection, with: 'operations.open_connection'
@@ -37,7 +37,7 @@ class PgExport
       end
 
       def select_dump(dumps:, gateway:)
-        dump = ui_input.select_dump(dumps)
+        dump = input.select_dump(dumps)
         Success(dump: dump, gateway: gateway)
       end
 
@@ -52,7 +52,7 @@ class PgExport
       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

@@ -12,14 +12,14 @@ PgExport::Container.boot :config do
 
     formatters = {
       plain: ->(_, _, _, message) { "#{message}\n" },
-      muted: ->(*) { raise 'Do not initialize logger when it is muted' },
+      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))
+      Logger.new($stdout, formatter: formatters.fetch(config.logger_format))
     end
 
     register(:config, memoize: true) { config }

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

@@ -6,19 +6,9 @@ PgExport::Container.boot(:interactive) do
   end
 
   start do
-    type = 'interactive'
-    transaction = PgExport::Transactions::ImportDumpInteractively.new(ui_input: target["ui.#{type}.input"])
-
-    unless target[:config].logger_muted?
-      %i[
-        open_connection
-        fetch_dumps
-        download_dump
-        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('transaction', memoize: true) { transaction }

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

@@ -7,19 +7,8 @@ PgExport::Container.boot(:plain) do
 
   start do
     transaction = PgExport::Transactions::ExportDump.new
-
-    unless target[:config].logger_muted?
-      type = 'plain'
-      %i[
-        build_dump
-        encrypt_dump
-        open_connection
-        upload_dump
-        remove_old_dumps
-        close_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('transaction', memoize: true) { transaction }

data/lib/pg_export/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_export
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc5
 platform: ruby
 authors:
 - Krzysztof Maicher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -293,6 +293,8 @@ files:
 - lib/pg_export/lib/pg_export/listeners/interactive/open_connection.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/select_database.rb
+- lib/pg_export/lib/pg_export/listeners/interactive/select_dump.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
@@ -302,6 +304,7 @@ files:
 - lib/pg_export/lib/pg_export/listeners/plain/encrypt_dump.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/prepare_params.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.rb