pg_export 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c93cc74e90dc657529afec29a5cf4d5aade8c83c
-  data.tar.gz: 38501e57fae913d6ee8bbdbca4ea1177c3e8c8ab
+  metadata.gz: 69c56bdaa52fa25112c93ffd284cd806ce6fa707
+  data.tar.gz: 285340dfcf4c20067d57e8d805868b453f7cbf5f
 SHA512:
-  metadata.gz: 035ab3c0747580fabf41f5aee899d8598099331a2110cbc58adc4f2623e3dba2e3b756ee2e4883c3618801a8c1a8df9760c16efb1011b9b417b520d790537ba2
-  data.tar.gz: 8a9f5fc5f5a4e40f0d465d8d4c46d7e6b5c97b62c8cca1eeecf8210eecf5de153c6bba9a9e674d09c79186d8364acde98c005d8a5ffa9b80e86b7e4e63cd81e3
+  metadata.gz: 8d51c8854e8d2b4d17dd43c96e43d4e1a97af5c8653472e51898fa3018278b5126629d279e29c407ddf0233bb898da77e3f06456495604a63e2ac07f743b3ca2
+  data.tar.gz: be9ad50fb36708db2e6232168677fc9eb8f24f4491862d37feb73230e0bd3aa550ebd19b1f4def5c6475620be2b507b54b1abce891b327cada84a1d1afbe4a86

data/.rubocop.yml

@@ -3,12 +3,14 @@ AllCops:
   Exclude:
     - 'spec/spec_helper.rb'
 
+Style/BlockLength:
+  Exclude:
+    - 'bin/pg_export'
+    - 'spec/**/*.rb'
+
 Metrics/LineLength:
   Max: 200
 
-Metrics/AbcSize:
-  Max: 20
-
 Lint/AmbiguousOperator:
   Exclude:
     - 'lib/pg_export/configuration.rb'

data/.travis.yml

@@ -2,9 +2,8 @@ sudo: false
 language: ruby
 rvm:
   - 2.1.8
-before_install: gem install bundler -v 1.13.3
-env:
-  global:
-    CODECLIMATE_REPO_TOKEN: db03e5968c5bcd68b12ca50f5d41ae07dd74fe80d4e1421d754e31c316e7477a
+addons:
+  code_climate:
+    repo_token: db03e5968c5bcd68b12ca50f5d41ae07dd74fe80d4e1421d754e31c316e7477a
 before_install: gem install bundler -v 1.13.3
 after_success: codeclimate-test-reporter

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+### 0.5.0 - 2017.03.11
+
+- Add restriction on DUMP_ENCRYPTION_KEY, to be exactly 16 characters length 
+- Make interactive mode more verbose by adding more messages
+- Fix concurrently opening ftp connection
+- Add closing ftp connection while importing dump in interactive mode
+- Fix Cipher deprecation warning
+- Fix typos
+- Improve code architecture

data/README.md

@@ -11,7 +11,7 @@ Can be used for backups or synchronizing databases between production and develo
 
 Example:
 
-    pg_export --database database_name -keep 5
+    pg_export --database database_name --keep 5
     
 Above command will perform database dump, encrypt it, upload it to FTP and remove old dumps from FTP, keeping newest 5.
 
@@ -20,8 +20,8 @@ FTP connection params and encryption key are configured by env variables.
 Features:
 
 - uses shell command `pg_dump` and `pg_restore`
-- no external gem dependencies
-- encrypts dumps by OpenSSL
+- encrypts dumps by OpenSSL AES-128-CBC
+- configurable through env variables
 - uses ruby tempfiles, so local dumps are garbage collected automatically
 - easy restoring dumps through interactive mode
 

data/bin/pg_export

@@ -2,33 +2,35 @@
 
 require 'optparse'
 require 'ostruct'
-require 'pg_export'
-require 'pg_export/interactive'
 
-LOGS_DEFAULT = ->(_, _, _, message) { "#{message}\n" }
-LOGS_TIMESTAMPED = ->(severity, datetime, progname, message) { "#{datetime} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{progname} #{severity}: #{message}\n" }
-LOGS_MUTED = ->(_, _, _, _) {}
+require 'cli_spinnable'
+
+require 'pg_export'
+require 'pg_export/includable_modules/colourable_string'
+require 'pg_export/includable_modules/interactive'
 
-PgExport::Logging.logger.formatter = LOGS_DEFAULT
+config = PgExport::ServicesContainer.config
+pg_export = PgExport.new
 
-options = OpenStruct.new
 option_parser = OptionParser.new do |opts|
   opts.banner = 'Usage: pg_export [options]'
 
   opts.on('-d', '--database DATABASE', '[Required] Name of the database to export') do |database|
-    options.database = database
+    config.database = database
   end
 
-  opts.on('-k', '--keep [KEEP]', Integer, '[Optional] Number of dump files to keep on FTP (default: 10)') do |keep|
-    options.keep = keep
+  opts.on('-k', '--keep [KEEP]', Integer, "[Optional] Number of dump files to keep on FTP (default: #{config.keep_dumps})") do |keep|
+    config.keep_dumps = keep
   end
 
   opts.on('-t', '--timestamped', '[Optional] Enables log messages with timestamps') do
-    options.timestamped = true
+    PgExport::Logging.format_timestamped
   end
 
   opts.on('-i', '--interactive', 'Interactive, command line mode, for restoring dumps into databases') do
-    options.interactive = true
+    PgExport::Logging.mute
+    config.database ||= 'undefined'
+    pg_export.extend(PgExport::Interactive)
   end
 
   opts.on('-h', '--help', 'Show this message') do
@@ -39,33 +41,22 @@ option_parser = OptionParser.new do |opts|
   opts.separator "\nSetting can be verified by running following commands:"
 
   opts.on('-c', '--configuration', 'Prints the configuration') do
-    puts PgExport::Configuration.new.to_s
+    puts config.to_s
     exit
   end
 
   opts.on('-f', '--ftp', 'Tries connecting to FTP to verify the connection') do
-    PgExport::FtpService.new(PgExport::Configuration.new.ftp_params)
+    PgExport::ServicesContainer.ftp_connection.open
     exit
   end
 end
 
 begin
   option_parser.parse!
-
-  options.database ||= 'undefined' if options.interactive
-  PgExport::Logging.logger.formatter = LOGS_TIMESTAMPED if options.timestamped
-  PgExport::Logging.logger.formatter = LOGS_MUTED if options.interactive
-
-  pg_export = PgExport.new do |config|
-    config.database = options.database if options.database
-    config.keep_dumps = options.keep if options.keep
-  end
-  pg_export.extend(PgExport::Interactive) if options.interactive
-
   pg_export.call
-
 rescue OptionParser::MissingArgument, PgExport::InvalidConfigurationError => e
-  puts "Error: #{e}"
+  using PgExport::ColourableString
+  puts "Error: #{e}".red
   puts option_parser
 rescue PgExport::PgDumpError => e
   puts e

data/lib/pg_export.rb

@@ -6,63 +6,64 @@ require 'openssl'
 require 'forwardable'
 require 'open3'
 
-require 'cli_spinnable'
-
 require 'pg_export/version'
-require 'pg_export/logging'
+require 'pg_export/includable_modules/logging'
+require 'pg_export/includable_modules/dump/size_human'
+require 'pg_export/includable_modules/services_container'
 require 'pg_export/errors'
 require 'pg_export/configuration'
-require 'pg_export/concurrency'
-require 'pg_export/entities/dump/size_human'
 require 'pg_export/entities/dump/base'
 require 'pg_export/entities/plain_dump'
 require 'pg_export/entities/encrypted_dump'
-require 'pg_export/services/ftp_service'
-require 'pg_export/services/ftp_service/connection'
-require 'pg_export/services/utils'
+require 'pg_export/services/ftp_adapter'
+require 'pg_export/services/ftp_connection'
+require 'pg_export/services/bash_utils'
 require 'pg_export/services/dump_storage'
 require 'pg_export/services/aes'
+require 'pg_export/services/aes/base'
+require 'pg_export/services/aes/encryptor'
+require 'pg_export/services/aes/decryptor'
 
 class PgExport
-  include Concurrency
+  extend Forwardable
+  include ServicesContainer
+
+  def_delegators :services_container, :config, :bash_utils, :dump_storage, :ftp_connection, :encryptor, :decryptor
 
   def initialize
-    @config = Configuration.new
     yield config if block_given?
-    config.validate
   end
 
   def call
-    concurrently do |job|
-      job << create_dump
-      job << initialize_dump_storage
+    config.validate
+    concurrently do |threads|
+      threads << create_dump
+      threads << open_ftp_connection
     end
     dump_storage.upload(dump)
-    dump_storage.remove_old(keep: config.keep_dumps)
+    dump_storage.remove_old
     self
   end
 
   private
 
-  attr_reader :config
-  attr_accessor :dump, :dump_storage
+  def concurrently
+    [].tap do |threads|
+      yield threads
+    end.each(&:join)
+  end
 
-  def create_dump
-    sql_dump = utils.create_dump(config.database)
-    enc_dump = utils.encrypt(sql_dump)
-    self.dump = enc_dump
+  def dump
+    create_dump[:dump]
   end
 
-  def initialize_dump_storage
-    ftp_service = FtpService.new(config.ftp_params)
-    self.dump_storage = DumpStorage.new(ftp_service, config.database)
-    self
+  def create_dump
+    @create_dump ||= Thread.new do
+      Thread.current[:dump] = encryptor.call(bash_utils.create_dump)
+    end
   end
 
-  def utils
-    @utils ||= Utils.new(
-      Aes.encryptor(config.dump_encryption_key),
-      Aes.decryptor(config.dump_encryption_key)
-    )
+  def open_ftp_connection
+    Thread.new { ftp_connection.open }
   end
 end

data/lib/pg_export/configuration.rb

@@ -1,5 +1,8 @@
 class PgExport
   class Configuration
+    FIELD_REQUIRED = 'Field %s is required'.freeze
+    INVALID_ENCRYPTION_KEY_LENGTH = 'Dump encryption key should have exact 16 characters. Edit your DUMP_ENCRYPTION_KEY env variable.'.freeze
+
     DEFAULTS = {
       database: nil,
       keep_dumps: ENV['KEEP_DUMPS'] || 10,
@@ -19,9 +22,9 @@ class PgExport
 
     def validate
       DEFAULTS.keys.each do |field|
-        raise InvalidConfigurationError, "Field #{field} is required" if send(field).nil?
+        raise InvalidConfigurationError, FIELD_REQUIRED % field if public_send(field).nil?
       end
-      raise InvalidConfigurationError, 'Dump password is to short. It should have at least 16 characters' if dump_encryption_key.length < 16
+      raise InvalidConfigurationError, INVALID_ENCRYPTION_KEY_LENGTH unless dump_encryption_key.length == 16
     end
 
     def ftp_params
@@ -40,13 +43,13 @@ class PgExport
 
     def print_attr(key)
       if %i(ftp_password dump_encryption_key).include?(key)
-        if send(key)
-          "#{key}: #{send(key)[0..2]}***\n"
+        if public_send(key)
+          "#{key}: #{public_send(key)[0..2]}***\n"
         else
           "#{key}:\n"
         end
       else
-        "#{key}: #{send(key)}\n"
+        "#{key}: #{public_send(key)}\n"
       end
     end
   end

data/lib/pg_export/includable_modules/colourable_string.rb

@@ -0,0 +1,17 @@
+class PgExport
+  module ColourableString
+    refine String do
+      def red
+        "\e[31m#{self}\e[0m"
+      end
+
+      def green
+        "\e[0;32;49m#{self}\e[0m"
+      end
+
+      def gray
+        "\e[37m#{self}\e[0m"
+      end
+    end
+  end
+end

data/lib/pg_export/{interactive.rb → includable_modules/interactive.rb}

@@ -1,5 +1,3 @@
-require 'pg_export/interactive/refinements/colourable_string'
-
 class PgExport
   module Interactive
     include CliSpinnable
@@ -10,53 +8,69 @@ class PgExport
     end
 
     def call
-      initialize_dump_storage
+      initialize_connection
       print_all_dumps
-      download_selected_dump
-      restore_downloaded_dump
+      selected_dump = select_dump
+      dump = download_dump(selected_dump)
+      concurrently do |threads|
+        threads << Thread.new(dump) { restore_downloaded_dump(dump) }
+        threads << Thread.new { ftp_connection.close }
+      end
       puts 'Success'.green
       self
     end
 
     private
 
-    def initialize_dump_storage
+    def initialize_connection
       with_spinner do |cli|
         cli.print 'Connecting to FTP'
-        super
+        ftp_connection.open
         cli.tick
       end
     end
 
     def print_all_dumps
-      dumps.each.with_index(0) do |name, i|
+      dumps.each.with_index(1) do |name, i|
         print "(#{i}) "
         puts name.to_s.gray
       end
       self
     end
 
-    def download_selected_dump
+    def select_dump
       puts 'Which dump would you like to import?'
-      print "Type from 1 to #{dumps.count - 1} (0): "
-      name = dumps.fetch(gets.chomp.to_i)
+      number = loop do
+        print "Type from 1 to #{dumps.count} (1): "
+        number = gets.chomp.to_i
+        break number if (1..dumps.count).cover?(number)
+        puts 'Invalid number. Please try again.'.red
+      end
+
+      dumps.fetch(number - 1)
+    end
+
+    def download_dump(name)
+      dump = nil
+
       with_spinner do |cli|
-        cli.print 'Downloading dump'
+        cli.print "Downloading dump #{name}"
         encrypted_dump = dump_storage.download(name)
         cli.print " (#{encrypted_dump.size_human})"
         cli.tick
-        cli.print 'Decrypting dump'
-        self.dump = utils.decrypt(encrypted_dump)
+        cli.print "Decrypting dump #{name}"
+        dump = decryptor.call(encrypted_dump)
         cli.print " (#{dump.size_human})"
         cli.tick
       end
-      self
+
+      dump
     rescue OpenSSL::Cipher::CipherError => e
       puts "Problem decrypting dump file: #{e}. Try again.".red
       retry
     end
 
-    def restore_downloaded_dump
+    def restore_downloaded_dump(dump)
       puts 'To which database you would like to restore the downloaded dump?'
       if config.database == 'undefined'
         print 'Enter a local database name: '
@@ -67,7 +81,7 @@ class PgExport
       database = database.empty? ? config.database : database
       with_spinner do |cli|
         cli.print "Restoring dump to #{database} database"
-        utils.restore_dump(dump, database)
+        bash_utils.restore_dump(dump, database)
         cli.tick
       end
       self

data/lib/pg_export/includable_modules/logging.rb

@@ -0,0 +1,31 @@
+class PgExport
+  module Logging
+    FORMAT_PLAIN = ->(_, _, _, message) { "#{message}\n" }
+    FORMAT_TIMESTAMPED = ->(severity, datetime, progname, message) { "#{datetime} #{Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{progname} #{severity}: #{message}\n" }
+    FORMAT_MUTED = ->(_, _, _, _) {}
+
+    class << self
+      def logger
+        @logger ||= Logger.new(STDOUT).tap do |logger|
+          logger.formatter = FORMAT_PLAIN
+        end
+      end
+
+      def format_default
+        logger.formatter = FORMAT_PLAIN
+      end
+
+      def format_timestamped
+        logger.formatter = FORMAT_TIMESTAMPED
+      end
+
+      def mute
+        logger.formatter = FORMAT_MUTED
+      end
+    end
+
+    def logger
+      Logging.logger
+    end
+  end
+end

data/lib/pg_export/includable_modules/services_container.rb

@@ -0,0 +1,41 @@
+class PgExport
+  module ServicesContainer
+    class << self
+      def config
+        @config ||= Configuration.new
+      end
+
+      def aes
+        @aes ||= Aes.new(config.dump_encryption_key)
+      end
+
+      def encryptor
+        @encryptor ||= aes.build_encryptor
+      end
+
+      def decryptor
+        @decryptor ||= aes.build_decryptor
+      end
+
+      def bash_utils
+        @bash_utils ||= BashUtils.new(config.database)
+      end
+
+      def ftp_connection
+        @ftp_connection ||= FtpConnection.new(config.ftp_params)
+      end
+
+      def ftp_adapter
+        @ftp_adapter ||= FtpAdapter.new(ftp_connection)
+      end
+
+      def dump_storage
+        @dump_storage ||= DumpStorage.new(ftp_adapter, config.database, config.keep_dumps)
+      end
+    end
+
+    def services_container
+      @services_container ||= ServicesContainer
+    end
+  end
+end

data/lib/pg_export/services/aes.rb

@@ -1,21 +1,28 @@
 class PgExport
   class Aes
-    ALG = 'AES-128-CBC'.freeze
+    ALGORITHM = 'AES-128-CBC'.freeze
 
-    def self.encryptor(key)
-      initialize_aes(:encrypt, key)
+    def initialize(key)
+      @key = key
     end
 
-    def self.decryptor(key)
-      initialize_aes(:decrypt, key)
+    def build_encryptor
+      Aes::Encryptor.new(cipher(:encrypt))
     end
 
-    def self.initialize_aes(mode, key)
-      raise ArgumentError, 'Only :encrypt or :decrypt are allowed' unless %i(encrypt decrypt).include?(mode)
-      aes = OpenSSL::Cipher::Cipher.new(ALG)
-      aes.public_send(mode.to_sym)
-      aes.key = key
-      aes
+    def build_decryptor
+      Aes::Decryptor.new(cipher(:decrypt))
+    end
+
+    private
+
+    attr_reader :key
+
+    def cipher(mode)
+      OpenSSL::Cipher.new(ALGORITHM).tap do |cipher|
+        cipher.public_send(mode.to_sym)
+        cipher.key = key
+      end
     end
   end
 end

data/lib/pg_export/services/aes/base.rb

@@ -0,0 +1,26 @@
+class PgExport
+  class Aes
+    class Base
+      include Logging
+
+      def initialize(cipher)
+        @cipher = cipher
+      end
+
+      private
+
+      def copy_using(cipher, from:, to:)
+        cipher.reset
+        to.open(:write) do |f|
+          from.each_chunk do |chunk|
+            f << cipher.update(chunk)
+          end
+          f << cipher.final
+        end
+        self
+      end
+
+      attr_reader :cipher
+    end
+  end
+end

data/lib/pg_export/services/aes/decryptor.rb

@@ -0,0 +1,12 @@
+class PgExport
+  class Aes
+    class Decryptor < Base
+      def call(enc_dump)
+        dump = PlainDump.new
+        copy_using(cipher, from: enc_dump, to: dump)
+        logger.info "Create #{dump}"
+        dump
+      end
+    end
+  end
+end

data/lib/pg_export/services/aes/encryptor.rb

@@ -0,0 +1,12 @@
+class PgExport
+  class Aes
+    class Encryptor < Base
+      def call(dump)
+        enc_dump = EncryptedDump.new
+        copy_using(cipher, from: dump, to: enc_dump)
+        logger.info "Create #{enc_dump}"
+        enc_dump
+      end
+    end
+  end
+end

data/lib/pg_export/services/bash_utils.rb

@@ -0,0 +1,32 @@
+class PgExport
+  class BashUtils
+    include Logging
+
+    def initialize(database_name)
+      @database_name = database_name
+    end
+
+    def create_dump
+      dump = PlainDump.new
+      Open3.popen3("pg_dump -Fc --file #{dump.path} #{database_name}") do |_, _, err|
+        error = err.read
+        raise PgDumpError, error unless error.empty?
+      end
+      logger.info "Create #{dump}"
+      dump
+    end
+
+    def restore_dump(dump, restore_database_name)
+      Open3.popen3("pg_restore -c -d #{restore_database_name} #{dump.path}") do |_, _, err|
+        error = err.read
+        raise PgRestoreError, error if /FATAL/ =~ error
+      end
+      logger.info "Restore #{dump}"
+      self
+    end
+
+    private
+
+    attr_reader :database_name
+  end
+end

data/lib/pg_export/services/dump_storage.rb

@@ -5,41 +5,41 @@ class PgExport
     TIMESTAMP = '_%Y%m%d_%H%M%S'.freeze
     TIMESTAMP_REGEX = '[0-9]{8}_[0-9]{6}'.freeze
 
-    def initialize(ftp_service, name)
-      @ftp_service, @name = ftp_service, name
+    def initialize(ftp_adapter, name, keep)
+      @ftp_adapter, @name, @keep = ftp_adapter, name, keep
     end
 
     def upload(dump)
       dump_name = timestamped_name(dump)
-      ftp_service.upload_file(dump.path, dump_name)
-      logger.info "Upload #{dump} #{dump_name} to #{ftp_service}"
+      ftp_adapter.upload_file(dump.path, dump_name)
+      logger.info "Upload #{dump} #{dump_name} to #{ftp_adapter}"
     end
 
     def download(name)
       dump = EncryptedDump.new
-      ftp_service.download_file(dump.path, name)
-      logger.info "Download #{dump} #{name} from #{ftp_service}"
+      ftp_adapter.download_file(dump.path, name)
+      logger.info "Download #{dump} #{name} from #{ftp_adapter}"
       dump
     end
 
-    def remove_old(keep:)
+    def remove_old
       find_by_name(name).drop(keep.to_i).each do |filename|
-        ftp_service.delete(filename)
-        logger.info "Remove #{filename} from #{ftp_service}"
+        ftp_adapter.delete(filename)
+        logger.info "Remove #{filename} from #{ftp_adapter}"
       end
     end
 
     def find_by_name(s)
-      ftp_service.list(s + '_*')
+      ftp_adapter.list(s + '_*')
     end
 
     def all
-      ftp_service.list('*')
+      ftp_adapter.list('*')
     end
 
     private
 
-    attr_reader :ftp_service, :name
+    attr_reader :ftp_adapter, :name, :keep
 
     def timestamped_name(dump)
       name + Time.now.strftime(TIMESTAMP) + dump.ext

data/lib/pg_export/services/{ftp_service.rb → ftp_adapter.rb}

@@ -1,11 +1,13 @@
 class PgExport
-  class FtpService
+  class FtpAdapter
+    extend Forwardable
+
     CHUNK_SIZE = (2**16).freeze
 
-    def initialize(params)
-      @host = params.fetch(:host)
-      connection = Connection.new(params)
-      @ftp = connection.ftp
+    def_delegators :connection, :ftp, :host
+
+    def initialize(connection)
+      @connection = connection
       ObjectSpace.define_finalizer(self, proc { connection.close })
     end
 
@@ -31,6 +33,6 @@ class PgExport
 
     private
 
-    attr_reader :ftp, :host
+    attr_reader :connection
   end
 end

data/lib/pg_export/services/ftp_connection.rb

@@ -0,0 +1,28 @@
+class PgExport
+  class FtpConnection
+    include Logging
+
+    attr_reader :ftp, :host
+
+    def initialize(host:, user:, password:)
+      @host, @user, @password = host, user, password
+    end
+
+    def open
+      @ftp = Net::FTP.new(host, user, password)
+      @ftp.passive = true
+      logger.info "Connect to #{host}"
+      self
+    end
+
+    def close
+      @ftp.close
+      logger.info 'Close FTP'
+      self
+    end
+
+    private
+
+    attr_reader :user, :password
+  end
+end

data/lib/pg_export/version.rb

@@ -1,3 +1,3 @@
 class PgExport
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_export
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Krzysztof Maicher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli_spinnable
@@ -137,6 +137,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -146,21 +147,24 @@ files:
 - bin/pg_export
 - bin/setup
 - lib/pg_export.rb
-- lib/pg_export/concurrency.rb
 - lib/pg_export/configuration.rb
 - lib/pg_export/entities/dump/base.rb
-- lib/pg_export/entities/dump/size_human.rb
 - lib/pg_export/entities/encrypted_dump.rb
 - lib/pg_export/entities/plain_dump.rb
 - lib/pg_export/errors.rb
-- lib/pg_export/interactive.rb
-- lib/pg_export/interactive/refinements/colourable_string.rb
-- lib/pg_export/logging.rb
+- lib/pg_export/includable_modules/colourable_string.rb
+- lib/pg_export/includable_modules/dump/size_human.rb
+- lib/pg_export/includable_modules/interactive.rb
+- lib/pg_export/includable_modules/logging.rb
+- lib/pg_export/includable_modules/services_container.rb
 - lib/pg_export/services/aes.rb
+- lib/pg_export/services/aes/base.rb
+- lib/pg_export/services/aes/decryptor.rb
+- lib/pg_export/services/aes/encryptor.rb
+- lib/pg_export/services/bash_utils.rb
 - lib/pg_export/services/dump_storage.rb
-- lib/pg_export/services/ftp_service.rb
-- lib/pg_export/services/ftp_service/connection.rb
-- lib/pg_export/services/utils.rb
+- lib/pg_export/services/ftp_adapter.rb
+- lib/pg_export/services/ftp_connection.rb
 - lib/pg_export/version.rb
 - pg_export.gemspec
 homepage: https://github.com/maicher/pg_export
@@ -183,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CLI for creating and exporting PostgreSQL dumps to FTP.

data/lib/pg_export/concurrency.rb

@@ -1,21 +0,0 @@
-class PgExport
-  module Concurrency
-    class ThreadsArray < Array
-      def <<(job)
-        super Thread.new { job }
-      end
-
-      alias push <<
-    end
-
-    def self.included(*)
-      Thread.abort_on_exception = true
-    end
-
-    def concurrently
-      t = ThreadsArray.new
-      yield t
-      t.each(&:join)
-    end
-  end
-end

data/lib/pg_export/interactive/refinements/colourable_string.rb

@@ -1,19 +0,0 @@
-class PgExport
-  module Interactive
-    module ColourableString
-      refine String do
-        def red
-          "\e[31m#{self}\e[0m"
-        end
-
-        def green
-          "\e[0;32;49m#{self}\e[0m"
-        end
-
-        def gray
-          "\e[37m#{self}\e[0m"
-        end
-      end
-    end
-  end
-end

data/lib/pg_export/logging.rb

@@ -1,11 +0,0 @@
-class PgExport
-  module Logging
-    def logger
-      Logging.logger
-    end
-
-    def self.logger
-      @logger ||= Logger.new(STDOUT)
-    end
-  end
-end

data/lib/pg_export/services/ftp_service/connection.rb

@@ -1,31 +0,0 @@
-class PgExport
-  class FtpService
-    class Connection
-      include Logging
-
-      attr_reader :ftp
-
-      def initialize(host:, user:, password:)
-        @host, @user, @password = host, user, password
-        open
-      end
-
-      def open
-        @ftp = Net::FTP.new(host, user, password)
-        @ftp.passive = true
-        logger.info "Connect to #{host}"
-        self
-      end
-
-      def close
-        @ftp.close
-        logger.info 'Close FTP'
-        self
-      end
-
-      private
-
-      attr_reader :host, :user, :password
-    end
-  end
-end

data/lib/pg_export/services/utils.rb

@@ -1,57 +0,0 @@
-class PgExport
-  class Utils
-    include Logging
-
-    def initialize(encryptor, decryptor)
-      @encryptor, @decryptor = encryptor, decryptor
-    end
-
-    def create_dump(database_name)
-      dump = PlainDump.new
-      Open3.popen3("pg_dump -Fc --file #{dump.path} #{database_name}") do |_, _, err|
-        error = err.read
-        raise PgDumpError, error unless error.empty?
-      end
-      logger.info "Create #{dump}"
-      dump
-    end
-
-    def restore_dump(dump, database_name)
-      Open3.popen3("pg_restore -c -d #{database_name} #{dump.path}") do |_, _, err|
-        error = err.read
-        raise PgRestoreError, error if /FATAL/ =~ error
-      end
-      logger.info "Restore #{dump}"
-      self
-    end
-
-    def encrypt(dump)
-      enc_dump = EncryptedDump.new
-      copy_using(encryptor, from: dump, to: enc_dump)
-      logger.info "Create #{enc_dump}"
-      enc_dump
-    end
-
-    def decrypt(enc_dump)
-      dump = PlainDump.new
-      copy_using(decryptor, from: enc_dump, to: dump)
-      logger.info "Create #{dump}"
-      dump
-    end
-
-    private
-
-    attr_reader :encryptor, :decryptor
-
-    def copy_using(aes, from:, to:)
-      aes.reset
-      to.open(:write) do |f|
-        from.each_chunk do |chunk|
-          f << aes.update(chunk)
-        end
-        f << aes.final
-      end
-      self
-    end
-  end
-end