db_dumper 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa5f19bbf8e2ae8ff7df6413b88ad23eb1ab4aeb702af65150eed75aaa3394c
-  data.tar.gz: ae7a26c5be8a10c80af089b02f38af86e3fdaf6907a6060e4badf2cffbf9a50b
+  metadata.gz: ae74a3eb271dba85c9185c0e805fae78b68fd055bcbdd85d5a5d485d62fa9237
+  data.tar.gz: 18a0336e0b869ae4b08662a5e4cc07f16cf80596f45b04eceb6843d1961c1c50
 SHA512:
-  metadata.gz: 2335003bbacde8b9c6a9784d753863dee4ab7f800e10ac68cc4df7633af8b5cabca0cb1b3ef149735fabba8361a0bf507f9512e5d389d0d99658e61dcb86b5dc
-  data.tar.gz: eff420c0c74e6e665f24b2a886abe547095c04f3446cd7f3ea81d73d56b0dd46d9161c179c47268888444dddd715fa09ef2071e21d52ff2a4d8ef5e17ded6c65
+  metadata.gz: 543832e4c9e6d37a1b4384325afa7e655a8d01fa76d80cd9563af1b90faf10c236549ae7e4700a146b29079d6c0f5fe541c18fa69336dca5c37bbe946558e477
+  data.tar.gz: f5837c1c71534c1448ef19a572e7b655a56b4720afc77de90628189a746d69cbabe27588f6c587e8c4736b8098f0e68330e5753d174a82f6a47412506381fd08

data/lib/db_dumper/query_builder.rb

@@ -2,7 +2,6 @@ require_relative 'query_builder/table'
 require_relative 'query_builder/query'
 
 module DbDumper
-
   # Generates queries for copying data
   class QueryBuilder
     attr_reader :config
@@ -31,6 +30,14 @@ module DbDumper
 
     # DSL end
 
+    def self.establish_connection
+      return if ActiveRecord::Base.connected?
+
+      ActiveRecord::Migration.verbose = false
+      ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+    end
+    private_class_method :establish_connection
+
     private
 
     def to_sql
@@ -41,13 +48,6 @@ module DbDumper
       @config = config
     end
 
-    def self.establish_connection
-      return if ActiveRecord::Base.connected?
-
-      ActiveRecord::Migration.verbose = false
-      ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-    end
-
     def queries
       @queries ||= []
     end

data/lib/db_dumper/remote_machine.rb

@@ -15,80 +15,63 @@ module DbDumper
 
       with_ssh do |ssh|
         upload_commands_sql_to_remote_machine(ssh)
+
         dump_schema(ssh)
         dump_data(ssh)
+
         download_schema(ssh)
         download_data(ssh)
-        clean_remote_machine(ssh)
+
+        clean(ssh)
       end
     end
 
     private
 
     def with_ssh
-      ssh_agent = SshAgent.new(ssh_credentials, config)
+      ssh_agent = SshAgent.new(config)
       yield(ssh_agent)
     end
 
-    # Upload
     def save_commands_sql_to_tmp_file
-      File.open(local_commands_sql_file_path, 'w') { |f| f.write(copy_commands_sql) }
+      File.open(local_commands_sql_file_path, 'w') do |file|
+        file.write(copy_commands_sql)
+      end
     end
 
     def upload_commands_sql_to_remote_machine(ssh)
       ssh.upload!(local_commands_sql_file_path, remote_commands_sql_file_path)
     end
 
-    def commands_sql_fname
-      @commands_sql_fname ||= "#{Digest::MD5.hexdigest(copy_commands_sql)}.sql"
-    end
-
-    # Schema
-
     def dump_schema(ssh)
       ssh.exec!(db_utils.dump_schema_command(remote_machine_schema_file_path))
     end
 
-    def download_schema(ssh)
-      ssh.download!(remote_machine_schema_file_path, dest_path)
-    end
-
-    # Data
-
     def dump_data(ssh)
       ssh.exec!("mkdir -p #{remote_machine_data_path}")
       ssh.exec!(db_utils.dump_data_command(remote_commands_sql_file_path))
     end
 
+    def download_schema(ssh)
+      ssh.download!(remote_machine_schema_file_path, dest_path)
+    end
+
     def download_data(ssh)
       ssh.download!(remote_machine_data_path, dest_path, recursive: true)
     end
 
-    # Clean
-    def clean_remote_machine(ssh)
+    def clean(ssh)
       ssh.exec! "rm #{remote_commands_sql_file_path}"
       ssh.exec! "rm #{remote_machine_schema_file_path}"
       ssh.exec! "rm -rf #{remote_machine_data_path}"
-    end
 
-    def clean_local_machine
       File.delete(local_commands_sql_file_path)
     end
 
-    #
-
     def db_utils
       config.db_utils
     end
 
-    def remote_machine_dest_path
-      config.remote_machine.dest_path
-    end
-
-    def remote_machine_data_path
-      config.remote_machine.data_path
-    end
-
     def remote_machine_schema_file_path
       "#{remote_machine_dest_path}/#{dump_schema_fname}"
     end
@@ -101,25 +84,24 @@ module DbDumper
       "#{dest_path}/#{commands_sql_fname}"
     end
 
-    def dump_schema_fname
-      'schema_dump.sql'
-    end
-
-    def ssh_credentials
-      [
-        ssh_user.host,
-        ssh_user.name,
-        keys:       ssh_user.ssh_keys,
-        passphrase: ssh_user.passphrase
-      ]
+    def remote_machine_data_path
+      config.remote_machine.data_path
     end
 
-    def ssh_user
-      config.ssh_user
+    def remote_machine_dest_path
+      config.remote_machine.dest_path
     end
 
     def dest_path
       config.local_machine.dest_path
     end
+
+    def commands_sql_fname
+      @commands_sql_fname ||= "#{Digest::MD5.hexdigest(copy_commands_sql)}.sql"
+    end
+
+    def dump_schema_fname
+      'schema_dump.sql'
+    end
   end
 end

data/lib/db_dumper/remote_machine/ssh_agent.rb

@@ -3,18 +3,13 @@ module DbDumper
 
     # Wrapper around Net::SSH, Net:SCP
     class SshAgent
-      attr_reader :credentials, :config
+      attr_reader :config
       attr_reader :block, :ssh
-      attr_reader :ssh_user_name, :ssh_host_name
 
-      def initialize(credentials, config, &block)
-        @credentials  = credentials
+      def initialize(config, &block)
         @config       = config
         @block        = block
         @ssh          = Net::SSH.start(*credentials)
-
-        @ssh_host_name = credentials[0]
-        @ssh_user_name = credentials[1]
       end
 
       def exec!(command)
@@ -34,8 +29,21 @@ module DbDumper
 
       private
 
+      def credentials
+        [
+          ssh_user.host,
+          ssh_user.name,
+          keys:       ssh_user.ssh_keys,
+          passphrase: ssh_user.passphrase
+        ]
+      end
+
+      def ssh_user
+        @ssh_user ||= config.ssh_user
+      end
+
       def ssh_machine_name
-        "#{ssh_user_name}@#{ssh_host_name}"
+        "#{ssh_user.name}@#{ssh_user.host}"
       end
 
       def log(message)

data/lib/db_dumper/version.rb

@@ -1,3 +1,3 @@
 module DbDumper
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_dumper
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Alexey Lukyanov
@@ -96,7 +96,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/alukyanov/db_dumper/issues
   changelog_uri: https://github.com/alukyanov/db_dumper/CHANGELOG.md
-  documentation_uri: http://www.rubydoc.info/gems/db_dumper/0.5.1
+  documentation_uri: http://www.rubydoc.info/gems/db_dumper/0.5.2
   homepage_uri: https://github.com/alukyanov/db_dumper
   source_code_uri: https://github.com/alukyanov/db_dumper
   wiki_uri: https://github.com/alukyanov/db_dumper/wiki