cloner 0.7.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8ad225c2837f9ea7b93560944d9ff6ad641e7d18df60c8cd4ac5524e939d79b
-  data.tar.gz: 4c69cf30e30e30802c8b8ad623717a2be50edba203504dfdae3fddac56ec64c0
+  metadata.gz: 61ad9f101c4e5a38fe4d2f15afadcd915e2bf8cff332e9b0d6f2e95a54f325ce
+  data.tar.gz: '08e3824a1bb16fb0f5d65451ed98d928c94f14192fc11ee9b01e3797fe6c727b'
 SHA512:
-  metadata.gz: dde12ab0ebe23b74b0bcd341fd67fbf938167860fd09ed8b55a6948045fb35d25f863f6b6835ee72a18147a3127c127b4a9d1b2f2d6c7f40e31af68e6dc20ab6
-  data.tar.gz: 1d420ba6e269a1a6aa08339370ab4242181bd5f5db4b0185c9a641148c5fd25cc82a8964f820d582ac12294acd395b7a807ddc84f9f5937ec66a235dc290aa95
+  metadata.gz: '07080d76a94e16d7139648bc1d696ae311dc559927f9987614075def3f42e787300eb3609ad350a3dafcfa1f318915e1a630c61904b572eb7cbae7bc817b0bfa'
+  data.tar.gz: e51e3aa735fe16734ed22b1c03973f3c06f1797d0ef796f57e00d33c1299757e9182ea5f30f263f3a4c0c71acb8a6c00df9dcc8edaa36ce39a5fe4b86b1a3e17

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+ruby-2.6.6

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 glebtv
+Copyright (c) 2014-2020 glebtv
 
 MIT License
 

data/README.md

@@ -2,6 +2,9 @@
 
 Easily clone your production Mongoid or PostgreSQL / MySQL database and files for local development or staging area.
 
+Uses rsync and database-specific default dump/restore tools (pg_dump/pg_restore, mysqldump/mysql, mongodump/mongorestore)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -104,6 +107,44 @@ All functions from cloner/internal.rb can be overriden, for example:
       {}
     end
 
+## 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
+- Allow overriding rsync flags via ```rsync_flags``` and ```rsync_compression```
+
+### 0.7.0
+
+- Add thor file generators
+
+### 0.6.0
+
+- Support MySQL
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/cloner/fork )

data/lib/cloner/ar.rb

@@ -1,15 +1,35 @@
 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_file(Rails.root.join('config', 'database.yml'))[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')}")
@@ -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

@@ -1,8 +1,21 @@
 module Cloner::RSync
   extend ActiveSupport::Concern
-  def rsync(from, to)
+
+  def rsync_compression
+    "-zz"
+  end
+
+  def rsync_flags
     port = ssh_opts[:port] || 22
-    cmd = "rsync -e ssh -zutvr --checksum -e \"ssh -p #{port}\" #{e ssh_user}@#{e ssh_host}:#{e from}/ #{e to}/"
+    "#{rsync_compression} -utvr --checksum -e \"ssh -p #{port}\""
+  end
+
+  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)
@@ -11,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.7.0"
+  VERSION = "0.10.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.10.0
 platform: ruby
 authors:
 - glebtv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,10 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
-- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -113,7 +111,7 @@ homepage: https://github.com/rs-pro/cloner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,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: []

data/.ruby-gemset

@@ -1 +0,0 @@
-cloner

data/HISTORY.md

@@ -1,3 +0,0 @@
-### 0.6.0
-
-Support MySQL