cloner 0.9.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48065947b30b56516063f5d9e83b20f365ff9c706471629db00263926a22f398
-  data.tar.gz: 3baca4e368a95a2dbe0b29d2197169f512e3d0fe7d9ecf2d6576f10590530847
+  metadata.gz: 89477dd1dc337b03aeefdff3fad3f9ecbb82f6153d912cff72fde337b19001b8
+  data.tar.gz: 0d6b00fa2cd2c4b2f6effc6a75f66bbf64c21e02e77ac5616c8884a3ad67025c
 SHA512:
-  metadata.gz: 21c0b290b324a34524427ce8bd2f0b1f2ddd1034a925384c3e2a7aae36c951dbce630ba2a8335ef55b8524f197e2eff8c4097a236186907a328b91e914318ccc
-  data.tar.gz: 34aa3d7f03dd927193e734e7eb79a99ed4dc5577dd018c873b503f22048b20045c61bdea3361e74042241af8ab3983b11964c12f21bd28a3d4a8f3bf2f13be34
+  metadata.gz: 92129b9d34693f0a2e3308f6da7aeadfcbf5b0e4ed6bb39e673fe2a5827e0c337851a6cb507276f8a84466a974373bc9b25e0a134bc62b0401573020386a1121
+  data.tar.gz: a3792e1e4430935db00cc4588a21fa20d45065fc720abeccbffd58904a2def9b1155109b15c6d2c76e5a220e1c970852278db4ef47c99532ddc2dcf319c50e44

data/README.md

@@ -109,6 +109,24 @@ 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)

data/cloner.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "activesupport"
   spec.add_dependency 'net-ssh'
+  spec.add_dependency 'fileutils'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/cloner.rb

@@ -1,6 +1,8 @@
-require "cloner/version"
+require 'cloner/version'
 require 'thor'
 require 'active_support/concern'
+require 'fileutils'
+
 module Cloner
   autoload :Base, "cloner/base"
   autoload :Internal, "cloner/internal"

data/lib/cloner/ar.rb

@@ -1,9 +1,25 @@
 module Cloner::Ar
-  def ar_conf
+  def read_ar_conf
     @conf ||= begin
-      YAML.load_file(Rails.root.join('config', 'database.yml'))[env_database]
+      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
@@ -13,13 +29,13 @@ module Cloner::Ar
     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
@@ -32,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."
@@ -50,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)

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)

data/lib/cloner/rsync.rb

@@ -12,8 +12,8 @@ module Cloner::RSync
 
   def rsync(from, to, directory: true, raise_on_error: false)
     if directory
-      from = "#{from}/" unless from.end_with?('/')
-      to = "#{to}/" unless to.end_with?('/')
+      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}"

data/lib/cloner/version.rb

@@ -1,4 +1,4 @@
 module Cloner
-  VERSION = "0.9.1"
+  VERSION = "0.12.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.12.0
 platform: ruby
 authors:
 - glebtv
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Easily clone your production Mongoid database and files for local development