remote_database_importer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f84dda973912024d022d895763155d64da66822f5d6f7e771cfcf54562dd71
-  data.tar.gz: 9a2fb0fe981aef23c4778765cbf9f5e70e033c16d43c8d1a2a145b2abaf4f8ce
+  metadata.gz: 78760d816e20de850e798b2246f3dd22d43fe2e4223ed305776e2bc0ff8e7ba9
+  data.tar.gz: 6aa3a9165a3fad0b3659a80bc389f907561c09c08477eb11460e9c3b05297712
 SHA512:
-  metadata.gz: 07be1da942f02d49869a62c64f3a1f4b5f81c23d624a604c42b1b0b844da94dcba18b86e824fd64cd147c7d4132f14832e0f23741e4470988c8f7fede720fcf0
-  data.tar.gz: 87a22ec48fcf6efb7c85bad1f183a6e1b0e3a0f9226fdf0dd3289b12bd1bfbad197ab0fbed2cdc3aebfafc56a421b62edc61db5a2c4407a885098fb842437400
+  metadata.gz: ac6d8f895e5ba3ad931b1767ae5e01082b280931917290df70eb2d5f4fbe49861ee62195f3e216d42b25b635b8a7a5da827f8991775ad7724cbdcaf7c1aa0c19
+  data.tar.gz: 4c6498283f68c0dbc26d5c1b3b6eae4c7af12c01e4d13cc4b876d05ba07dc0d6ac6641d310955510eed1805787bcac9a3e1a201f011a22e8e5ab0b8ef74cd3f6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.1.2] - 2022-10-29
+
+- Terminate current DB sessions after dump remote database. So the chance of an open session is smaller
+- Print out where the config was saved
+- Print how long the import went
+
 ## [0.1.0] - 2022-10-24
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remote_database_importer (0.1.0)
+    remote_database_importer (0.1.2)
       colorize (~> 0.8)
       thor (~> 1.2)
       tty-config (~> 0.6)

data/README.md

@@ -33,14 +33,14 @@ Whenever you want current live data, you can run the command:
 rake remote_database:import
 ```
 
-![Import Job Demo](readme_images/import-job.gif)
+![Import-Job sample](readme_assets/import-job.gif)
 
 ### Config
 The settings for the different environments is stored in the `remote_database_importer.yml` file.  
 When you first run the rake task, it will dynamically create this file for you.
 
 
-![asdf](readme_images/config_sample.png)
+![Config sample](readme_assets/config_sample.png)
 
 ### DB Access
 The easiest and fastest way is to exchange your ssh-key with the server beforehand, so you don't have to enter a password.  

data/lib/remote_database_importer/config.rb

@@ -15,6 +15,8 @@ module RemoteDatabaseImporter
         puts "===========================================================".colorize(:green)
         puts "Hi there! There is no config file yet, lets create one! 😄"
         create_default_config
+        config_location = [@config.filename, @config.extname].join
+        puts "Created config file: #{config_location}"
         puts "===========================================================".colorize(:green)
       end
       @config.read
@@ -49,10 +51,10 @@ module RemoteDatabaseImporter
 
         puts "Connection settings:".colorize(:green)
         host = ask("Enter the IP or hostname of the DB server:", default: "myawesomeapp.com")
-        dump_type = ask("Should the dump happen over a ssh connection or can pg_dump access the DB port directly? (if the DB lives on a seperat server pg_dump the way to go)", default: "pg_dump", options: ["ssh", "pg_dump"])
+        dump_type = ask("Should the DB dump happen over a ssh tunnel or can pg_dump connect to the DB port directly?", default: "pg_dump", options: ["ssh_tunnel", "pg_dump"])
 
         ssh_user, ssh_port, postgres_port = nil
-        if dump_type == "ssh"
+        if dump_type == "ssh_tunnel"
           ssh_user = ask("Enter the username for the SSH connection:", default: "deployer")
           ssh_port = ask("Enter the port for the SSH connection:", default: "22")
         else
@@ -87,13 +89,5 @@ module RemoteDatabaseImporter
 
       @config.write
     end
-
-    # TODO: validate user input
-    # private
-    # def validate_config(config)
-    #   config.each do |key, value|
-    #
-    #   end
-    # end
   end
 end

data/lib/remote_database_importer/operation.rb

@@ -32,6 +32,7 @@ module RemoteDatabaseImporter
 
     def import
       select_environment
+      time_start = Time.now
       multi_spinner = TTY::Spinner::Multi.new("[:spinner] Import remote DB", format: :dots_3)
       tasks = create_tasks_and_spinners(multi_spinner)
 
@@ -42,14 +43,15 @@ module RemoteDatabaseImporter
         return "Can't continue, following task failed: #{task[:command]} - checkout the logfile: #{LOG_FILE}" unless task_execution_was_successful
         task[:spinner].stop("... Done!")
       end
+      puts seconds_to_human_readable_time(Time.now - time_start)
     end
 
     private
 
     def create_tasks_and_spinners(multi_spinner)
       tasks = [
-        {name: "Terminate current DB sessions", command: terminate_current_db_sessions},
         {name: "Dump remote DB", command: dump_remote_db},
+        {name: "Terminate current DB sessions", command: terminate_current_db_sessions},
         {name: "Drop and create local DB", command: drop_and_create_local_db},
         {name: "Restore remote DB", command: restore_db},
         {name: "Run migrations", command: run_migrations},
@@ -77,7 +79,7 @@ module RemoteDatabaseImporter
       ssh_port = env["connection"]["ssh_port"]
       postgres_port = env["connection"]["postgres_port"]
 
-      if dump_type == "ssh"
+      if dump_type == "ssh_tunnel"
         "ssh #{ssh_user}@#{host} -p #{ssh_port} 'pg_dump -Fc -U #{db_user} -d #{db_name} -h localhost -C' > #{db_dump_location}"
       else
         "pg_dump -Fc 'host=#{host} dbname=#{db_name} user=#{db_user} port=#{postgres_port}' > #{db_dump_location}"
@@ -107,5 +109,15 @@ module RemoteDatabaseImporter
     def db_dump_location
       "tmp/#{@current_environment["database"]["name"]}.dump"
     end
+
+    def seconds_to_human_readable_time(secs)
+      [[60, :seconds], [60, :minutes], [24, :hours], [Float::INFINITY, :days]].map { |count, name|
+        if secs > 0
+          secs, n = secs.divmod(count)
+
+          "#{n.to_i} #{name}" unless n.to_i == 0
+        end
+      }.compact.reverse.join(" ")
+    end
   end
 end

data/lib/remote_database_importer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemoteDatabaseImporter
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_database_importer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Leon Vogt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -90,9 +90,9 @@ files:
 - lib/remote_database_importer/operation.rb
 - lib/remote_database_importer/version.rb
 - lib/tasks/remote_database_importer.rake
+- readme_assets/config_sample.png
+- readme_assets/import-job.gif
 - readme_images/.DS_Store
-- readme_images/config_sample.png
-- readme_images/import-job.gif
 - sig/remote_database_importer.rbs
 homepage: https://github.com/leon-vogt/remote_database_importer
 licenses: