cloner 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84c8fe363198647047f69099007af0a106d4820cdc7758b9cae1d26909b79c73
-  data.tar.gz: e96bc96b11c84cc67d2a06747e379cacdc633eb94e1f435d19227cb2b26c8550
+  metadata.gz: 7b194b889c54f1cdbd1a60853f80c463a0f7d15f959f81d42618fd96c67f18ab
+  data.tar.gz: 303e8b18314d5041240b08f228d27f93cd89195cbb28edd252bb49f490fe867e
 SHA512:
-  metadata.gz: bceec6cdef8aef9384a003ed93607e6d7bb27c22ddf61326b45dee79b17deb92fbbe1806f33405b4882201d9a330a820b44cb84722dab1a7bca4b7e6ffd23142
-  data.tar.gz: deaa7c11906fd6a184fba2abbe1fc05d510064665aefdf10f0d29e744ab6956687b62dcd37ac88811758412558af564f4fea6af0fb29eb5677ef2cd18237a488
+  metadata.gz: 9fcb580d17ae6bacfffd3b5f7209f4e97cee07bc29eca23e86c9220a020bb47e3b0c58fc8b23289b2fa3b560b375207928955b34287b8ae62097e986d7bff71c
+  data.tar.gz: 640449403fb0af65d73fa5fcd68c15fc9a414a38c759c89bfae750b8108c4333ead02fcf84fc5b24183ca7bb4d39c6f908c2a5243bfd6c301e0e0c18c563eacd

data/README.md

@@ -109,6 +109,29 @@ All functions from cloner/internal.rb can be overriden, for example:
 
 ## Changelog
 
+### 0.10.0
+
+- Support rails 6 multi database activerecord apps via option
+
+```
+def multi_db?
+  true
+end
+def clone_databases
+  ["primary", "gis"]
+  # nil - clone all databases
+end
+```
+
+- Backwards incompatible change:
+
+Changed default dump file name to cloner.bak in postgresql to make it same, and to allow to override it and multiple files.
+
+### 0.9.0
+
+- Add option to rsync to allow sync one file (thx @AnatolyShirykalov)
+- Add env_database to allow overriding database env (thx @Yarroo)
+
 ### 0.8.0
 
 - Change default rsync flags - -z to -zz to support newer versions of rsync

data/lib/cloner/ar.rb

@@ -1,21 +1,41 @@
 module Cloner::Ar
-  def ar_conf
+  def read_ar_conf
     @conf ||= begin
-      YAML.load_file(Rails.root.join('config', 'database.yml'))[Rails.env]
+      YAML.load(ERB.new(File.read(Rails.root.join('config', 'database.yml'))).result)[env_database]
+    end
+  end
+  def ar_conf
+    if multi_db?
+      read_ar_conf[@current_database]
+    else
+      read_ar_conf
     end
   end
 
+  def multi_db?
+    false
+  end
+
+  def clone_databases
+    # clone all databases by default
+    nil
+  end
+
+  def env_database
+    Rails.env
+  end
+
   def ar_to
     ar_conf['database']
   end
 
-  def ar_r_conf
+  def read_ar_r_conf
     @ar_r_conf ||= begin
       do_ssh do |ssh|
         ret = ssh_exec!(ssh, "cat #{e(remote_app_path + '/config/database.yml')}")
         check_ssh_err(ret)
         begin
-          res = YAML.load(ret[0])[env_from]
+          res = YAML.load(ERB.new(ret[0]).result)[env_from]
           raise 'no data' if res.blank?
           #res['host'] ||= '127.0.0.1'
         rescue Exception => e
@@ -28,7 +48,23 @@ module Cloner::Ar
     end
   end
 
-  def clone_ar
+  def db_file_name
+    if multi_db?
+      "cloner_" + @current_database
+    else
+      "cloner"
+    end
+  end
+
+  def ar_r_conf
+    if multi_db?
+      read_ar_r_conf[@current_database]
+    else
+      read_ar_r_conf
+    end
+  end
+
+  def run_clone_ar
     if ar_conf["adapter"] != ar_r_conf["adapter"]
       puts "Error: ActiveRecord adapter mismatch: local #{ar_conf["adapter"]}, remote #{ar_r_conf["adapter"]}"
       puts "it is not possible to convert from one database to another via this tool."
@@ -46,5 +82,22 @@ module Cloner::Ar
       exit
     end
   end
+
+  def clone_ar
+    if multi_db?
+      dblist = clone_databases
+      if dblist.nil?
+        dblist = read_ar_conf.keys
+      end
+      puts "cloning multiple databases: #{dblist.join(", ")}"
+      dblist.each do |dbn|
+        @current_database = dbn
+        run_clone_ar
+      end
+      @current_database = nil
+    else
+      run_clone_ar
+    end
+  end
 end
 

data/lib/cloner/mysql.rb

@@ -35,7 +35,7 @@ module Cloner::MySQL
       check_ssh_err(ret)
       host = ar_r_conf['host'].present? ? " --host #{e ar_r_conf['host']}" : ""
       port = ar_r_conf['port'].present? ? " --port #{e ar_r_conf['port']}" : ""
-      dump = "#{my_bin_path 'mysqldump'} #{my_dump_param} --user #{e ar_r_conf['username']} #{my_remote_auth}#{host}#{port} #{e ar_r_conf['database']} > #{e(remote_dump_path + '/cloner.sql')}"
+      dump = "#{my_bin_path 'mysqldump'} #{my_dump_param} --user #{e ar_r_conf['username']} #{my_remote_auth}#{host}#{port} #{e ar_r_conf['database']} > #{e(remote_dump_path + '/'+db_file_name+'.sql')}"
       puts dump if verbose?
       ret = ssh_exec!(ssh, dump)
       check_ssh_err(ret)
@@ -46,7 +46,7 @@ module Cloner::MySQL
     puts "restoring DB"
     host = ar_conf['host'].present? ? " --host #{e ar_conf['host']}" : ""
     port = ar_conf['port'].present? ? " --port #{e ar_conf['port']}" : ""
-    restore = "#{my_bin_path 'mysql'} #{my_restore_param} --user #{e ar_conf['username']} #{my_local_auth}#{host}#{port} #{e ar_to} < #{e(my_path + '/cloner.sql')}"
+    restore = "#{my_bin_path 'mysql'} #{my_restore_param} --user #{e ar_conf['username']} #{my_local_auth}#{host}#{port} #{e ar_to} < #{e(my_path + '/'+db_file_name+'.sql')}"
     puts restore if verbose?
     pipe = IO.popen(restore)
     while (line = pipe.gets)
@@ -65,7 +65,7 @@ module Cloner::MySQL
   def my_dump_copy
     FileUtils.mkdir_p(my_path)
     `mkdir -p #{e my_path}`
-    rsync(remote_dump_path + '/', my_path)
+    rsync(remote_dump_path, my_path)
   end
 
   def clone_my

data/lib/cloner/postgres.rb

@@ -52,7 +52,7 @@ module Cloner::Postgres
       check_ssh_err(ret)
       host = ar_r_conf['host'].present? ? " -h #{e ar_r_conf['host']}" : ""
       port = ar_r_conf['port'].present? ? " -p #{e ar_r_conf['port']}" : ""
-      dump = pg_remote_auth + "#{pg_remote_bin_path 'pg_dump'} #{pg_dump_param} -U #{e ar_r_conf['username']}#{host}#{port} #{e ar_r_conf['database']} > #{e(remote_dump_path + '/tmp.bak')}"
+      dump = pg_remote_auth + "#{pg_remote_bin_path 'pg_dump'} #{pg_dump_param} -U #{e ar_r_conf['username']}#{host}#{port} #{e ar_r_conf['database']} > #{e(remote_dump_path + '/'+db_file_name+'.bak')}"
       puts dump if verbose?
       ret = ssh_exec!(ssh, dump)
       check_ssh_err(ret)
@@ -63,7 +63,7 @@ module Cloner::Postgres
     puts "restoring DB"
     host = ar_conf['host'].present? ? " -h #{e ar_conf['host']}" : ""
     port = ar_conf['port'].present? ? " -p #{e ar_conf['port']}" : ""
-    restore = pg_local_auth + "#{pg_local_bin_path 'pg_restore'} #{pg_restore_param} -U #{e ar_conf['username']}#{host}#{port} -d #{e ar_to} #{e(pg_path + '/tmp.bak')}"
+    restore = pg_local_auth + "#{pg_local_bin_path 'pg_restore'} #{pg_restore_param} -U #{e ar_conf['username']}#{host}#{port} -d #{e ar_to} #{e(pg_path + '/'+db_file_name+'.bak')}"
     puts restore if verbose?
     pipe = IO.popen(restore)
     while (line = pipe.gets)
@@ -82,7 +82,7 @@ module Cloner::Postgres
   def pg_dump_copy
     FileUtils.mkdir_p(pg_path)
     `mkdir -p #{e pg_path}`
-    rsync(remote_dump_path + '/', pg_path)
+    rsync(remote_dump_path, pg_path)
   end
 
   def clone_pg

data/lib/cloner/rsync.rb

@@ -10,8 +10,12 @@ module Cloner::RSync
     "#{rsync_compression} -utvr --checksum -e \"ssh -p #{port}\""
   end
 
-  def rsync(from, to)
-    cmd = "rsync #{rsync_flags} #{e ssh_user}@#{e ssh_host}:#{e from}/ #{e to}/"
+  def rsync(from, to, directory: true, raise_on_error: false)
+    if directory
+      from = "#{from}/" unless from.to_s.end_with?('/')
+      to = "#{to}/" unless to.to_s.end_with?('/')
+    end
+    cmd = "rsync #{rsync_flags} #{e ssh_user}@#{e ssh_host}:#{e from} #{e to}"
     puts "Running RSync: #{cmd}"
     pipe = IO.popen(cmd)
     while (line = pipe.gets)
@@ -20,6 +24,9 @@ module Cloner::RSync
     pipe.close
     ret = $?.to_i
     if ret != 0
+      if raise_on_error
+        raise "Error: local command exited with #{ret}"
+      end
       puts "Error: local command exited with #{ret}"
     end
   end

data/lib/cloner/version.rb

@@ -1,4 +1,4 @@
 module Cloner
-  VERSION = "0.8.0"
+  VERSION = "0.11.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.11.0
 platform: ruby
 authors:
 - glebtv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -111,7 +111,7 @@ homepage: https://github.com/rs-pro/cloner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Easily clone your production Mongoid database and files for local development
 test_files: []