pg_export 0.7.5 → 1.0.0.rc3

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 :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 :close_ftp_connection
+      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_to_ftp(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

@@ -13,41 +13,41 @@ class PgExport
       include Dry::Transaction(container: PgExport::Container)
       include Import[
         'adapters.bash_adapter',
-        'repositories.ftp_dump_repository',
-        'repositories.ftp_dump_file_repository',
+        'repositories.gateway_dump_repository',
+        'repositories.gateway_dump_file_repository',
         'ui_input'
       ]
 
-      step :open_ftp_connection, with: 'operations.open_ftp_connection'
+      step :open_connection, with: 'operations.open_connection'
       step :fetch_dumps_from_ftp
       step :select_dump
       step :download_dump_from_ftp
-      step :close_ftp_connection
+      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_from_ftp(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:)
+      def select_dump(dumps:, gateway:)
         dump = ui_input.select_dump(dumps)
-        Success(dump: dump, ftp_adapter: ftp_adapter)
+        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_from_ftp(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
 

data/lib/pg_export/lib/pg_export/types.rb

@@ -5,7 +5,7 @@ require 'pg_export/lib/pg_export/value_objects/dump_file'
 
 class PgExport
   module Types
-    include Dry::Types.module
+    include Dry::Types()
 
     DumpName = Strict::String.constrained(format: /.+_20[0-9]{6}_[0-9]{6}\Z/)
     DumpType = Types::Coercible::String.enum('plain', 'encrypted')

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

@@ -17,7 +17,7 @@ PgExport::Container.boot(:interactive) do
       use :logger
 
       %i[
-        open_ftp_connection
+        open_connection
         fetch_dumps_from_ftp
         download_dump_from_ftp
         decrypt_dump

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

@@ -19,10 +19,10 @@ PgExport::Container.boot(:plain) do
       %i[
         build_dump
         encrypt_dump
-        open_ftp_connection
+        open_connection
         upload_dump_to_ftp
         remove_old_dumps_from_ftp
-        close_ftp_connection
+        close_connection
       ].each do |step|
         transaction.subscribe(step => target["listeners.#{type}.#{step}"])
       end

data/lib/pg_export/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PgExport
-  VERSION = '0.7.5'
+  VERSION = '1.0.0.rc3'
 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 'dry-initializer', '~> 2.5.0'
-  spec.add_dependency 'dry-types', '~> 0.12.0'
-  spec.add_dependency 'dry-struct', '~> 0.4.0'
-  spec.add_dependency 'dry-system', '~> 0.9.0'
-  spec.add_dependency 'dry-transaction', '~> 0.13.0'
+  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 'ed25519'
+  spec.add_dependency 'net-ssh'
+  spec.add_dependency 'net-scp'
   spec.add_dependency 'tty-prompt'
   spec.add_dependency 'tty-spinner'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_export
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Krzysztof Maicher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -16,70 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: dry-transaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +210,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +248,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.59.2
-description: CLI for creating and exporting PostgreSQL dumps to FTP.                        Can
+description: CLI for exporting/importing PostgreSQL dumps via FTP/SSH.                        Can
   be used for backups or synchronizing databases between production and development
   environments.
 email:
@@ -222,39 +278,41 @@ files:
 - lib/pg_export/container.rb
 - lib/pg_export/import.rb
 - lib/pg_export/lib/pg_export/adapters/bash_adapter.rb
-- lib/pg_export/lib/pg_export/adapters/ftp_adapter.rb
 - lib/pg_export/lib/pg_export/entities/dump.rb
 - lib/pg_export/lib/pg_export/factories/cipher_factory.rb
 - lib/pg_export/lib/pg_export/factories/dump_factory.rb
-- lib/pg_export/lib/pg_export/factories/ftp_adapter_factory.rb
+- lib/pg_export/lib/pg_export/factories/ftp_gateway_factory.rb
+- lib/pg_export/lib/pg_export/factories/ssh_gateway_factory.rb
+- lib/pg_export/lib/pg_export/gateways/ftp.rb
+- lib/pg_export/lib/pg_export/gateways/ssh.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/build_dump.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/close_ftp_connection.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/encrypt_dump.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/fetch_dumps_from_ftp.rb
-- lib/pg_export/lib/pg_export/listeners/interactive/open_ftp_connection.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/restore.rb
 - lib/pg_export/lib/pg_export/listeners/interactive/upload_dump_to_ftp.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_ftp_connection.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/encrypt_dump.rb
 - lib/pg_export/lib/pg_export/listeners/plain/fetch_dumps_from_ftp.rb
-- lib/pg_export/lib/pg_export/listeners/plain/open_ftp_connection.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/restore.rb
 - lib/pg_export/lib/pg_export/listeners/plain/upload_dump_to_ftp.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_ftp_connection.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/repositories/ftp_dump_file_repository.rb
-- lib/pg_export/lib/pg_export/repositories/ftp_dump_repository.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
 - lib/pg_export/lib/pg_export/transactions/import_dump_interactively.rb
 - lib/pg_export/lib/pg_export/types.rb
@@ -282,13 +340,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: CLI for creating and exporting PostgreSQL dumps to FTP.
+summary: CLI for exporting/importing PostgreSQL dumps via FTP/SSH.
 test_files: []

data/lib/pg_export/lib/pg_export/factories/ftp_adapter_factory.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# auto_register: false
-
-require 'pg_export/lib/pg_export/adapters/ftp_adapter'
-require 'pg_export/import'
-
-class PgExport
-  module Factories
-    class FtpAdapterFactory
-      include Import['config']
-
-      def ftp_adapter
-        ::PgExport::Adapters::FtpAdapter.new(
-          host: config.ftp_host,
-          user: config.ftp_user,
-          password: config.ftp_password
-        )
-      end
-    end
-  end
-end