cloner 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad4ce3ece2b17ced4d179da7bfdc37494e5342e6
-  data.tar.gz: 02aac9260349ecb47b60a475100fa0fa72210a53
+  metadata.gz: cea32c10a5456a2af0d37b26384e651e1234f16d
+  data.tar.gz: ffcd5ad320f56b8ea5e627f751e677af51647edd
 SHA512:
-  metadata.gz: 7ee9e31b738b36af8c6aa0326019e1c4f55231b8f0d818431754fca63d4bebae3f39975147ac5040fc091c4094d8763eb6dc14825c4a99b88b8ad0bda81dfdef
-  data.tar.gz: 12f1d24e1e6b2471c12faaca671c5c66e5710fb3bfae56953d4b755979a571149e0bbbb23d2a3a12791f1960fe19a33029cbea835d970a22293053f1c3cf8c91
+  metadata.gz: 84ce1cfcd5e9875cbb06aee952fab09413fd99bbe128d86d5c0e9264f5a5af1784be4b3e49737e72c6a4acc2f421e33fcfb6e82b42aba59fb06c2c3f672eecc1
+  data.tar.gz: 1eb36edc996a3f00a1985af522f474644dc092a389d33f624b85d3212338210f4047ebaa221f3dcf92b5fb065756db547b087be320661ca81d9dd4674f756209

data/lib/cloner/internal.rb

@@ -5,6 +5,10 @@ module Cloner::Internal
   include Cloner::SSH
   include Cloner::RSync
 
+  def e(str)
+    Shellwords.escape(str)
+  end
+
   def load_env
     unless defined?(Rails)
       require rails_path

data/lib/cloner/mongodb.rb

@@ -14,7 +14,7 @@ module Cloner::MongoDB
   def mongodb_r_conf
     @r_conf ||= begin
       Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
-        ret = ssh_exec!(ssh, "cat #{remote_app_path}/config/mongoid.yml")
+        ret = ssh_exec!(ssh, "cat #{e(remote_app_path + '/config/mongoid.yml')}")
         check_ssh_err(ret)
         YAML.load(ret[0])[env_from]['sessions']['default']
       end
@@ -25,7 +25,7 @@ module Cloner::MongoDB
     if mongodb_conf['password'].nil?
       ""
     else
-      "-u #{mongodb_conf['username']} -p #{mongodb_conf['password']}"
+      "-u #{e mongodb_conf['username']} -p #{e mongodb_conf['password']}"
     end
   end
 
@@ -35,7 +35,7 @@ module Cloner::MongoDB
       ssh.exec!("rm -R #{remote_dump_path}")
       ret = ssh_exec!(ssh, "mkdir -p #{remote_dump_path}")
       check_ssh_err(ret)
-      dump = "mongodump -u #{mongodb_r_conf['username']} -p #{mongodb_r_conf['password']} -d #{mongodb_r_conf['database']} --authenticationDatabase #{mongodb_r_conf['database']} -o #{remote_dump_path}"
+      dump = "mongodump -u #{e mongodb_r_conf['username']} -p #{e mongodb_r_conf['password']} -d #{e mongodb_r_conf['database']} --authenticationDatabase #{e mongodb_r_conf['database']} -o #{e remote_dump_path}"
       puts dump if verbose?
       ret = ssh_exec!(ssh, dump)
       check_ssh_err(ret)
@@ -44,7 +44,7 @@ module Cloner::MongoDB
 
   def mongodb_dump_restore
     puts "restoring DB"
-    restore = "mongorestore --drop -d #{mongodb_to} #{mongodb_local_auth} #{mongodb_path}"
+    restore = "mongorestore --drop -d #{e mongodb_to} #{mongodb_local_auth} #{e mongodb_path}"
     puts restore if verbose?
     pipe = IO.popen(restore)
     while (line = pipe.gets)

data/lib/cloner/postgres.rb

@@ -8,16 +8,17 @@ module Cloner::Postgres
   end
 
   def ar_to
-    p ar_conf
     ar_conf['database']
   end
 
   def ar_r_conf
     @ar_r_conf ||= begin
       Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
-        ret = ssh_exec!(ssh, "cat #{remote_app_path}/config/database.yml")
+        ret = ssh_exec!(ssh, "cat #{e(remote_app_path + '/config/database.yml')}")
         check_ssh_err(ret)
-        YAML.load(ret[0])[env_from]
+        res = YAML.load(ret[0])[env_from]
+        res['host'] ||= '127.0.0.1'
+        res
       end
     end
   end
@@ -41,10 +42,10 @@ module Cloner::Postgres
   def pg_dump_remote
     puts "backup remote DB via ssh"
     Net::SSH.start(ssh_host, ssh_user, ssh_opts) do |ssh|
-      ssh.exec!("rm -R #{remote_dump_path}")
-      ret = ssh_exec!(ssh, "mkdir -p #{remote_dump_path}")
+      ssh.exec!("rm -R #{e remote_dump_path}")
+      ret = ssh_exec!(ssh, "mkdir -p #{e remote_dump_path}")
       check_ssh_err(ret)
-      dump = pg_remote_auth + "pg_dump -Fc -U #{ar_r_conf['username']} #{ar_r_conf['database']} > #{remote_dump_path}/tmp.bak"
+      dump = pg_remote_auth + "pg_dump -Fc -U #{e ar_r_conf['username']} -h #{e ar_r_conf['host']} #{e ar_r_conf['database']} > #{e(remote_dump_path + '/tmp.bak')}"
       puts dump if verbose?
       ret = ssh_exec!(ssh, dump)
       check_ssh_err(ret)
@@ -53,7 +54,7 @@ module Cloner::Postgres
 
   def pg_dump_restore
     puts "restoring DB"
-    restore = pg_local_auth + "pg_restore -Fc -c -U #{ar_conf['username']} -d #{ar_to} #{pg_path}/tmp.bak"
+    restore = pg_local_auth + "pg_restore -Fc -c -U #{e ar_conf['username']} -d #{e ar_to} #{e(pg_path + '/tmp.bak')}"
     puts restore
     puts restore if verbose?
     pipe = IO.popen(restore)
@@ -72,8 +73,8 @@ module Cloner::Postgres
 
   def pg_dump_copy
     FileUtils.mkdir_p(pg_path)
-    `mkdir -p #{pg_path}`
-    rsync("#{remote_dump_path}/", pg_path)
+    `mkdir -p #{e pg_path}`
+    rsync(remote_dump_path + '/', pg_path)
   end
 
   def clone_pg

data/lib/cloner/rsync.rb

@@ -1,7 +1,7 @@
 module Cloner::RSync
   extend ActiveSupport::Concern
   def rsync(from, to)
-    cmd = "rsync -e ssh -zutvr --checksum #{ssh_user}@#{ssh_host}:#{from}/ #{to}/"
+    cmd = "rsync -e ssh -zutvr --checksum #{e ssh_user}@#{e ssh_host}:#{e from}/ #{e to}/"
     puts "Running RSync: #{cmd}"
     pipe = IO.popen(cmd)
     while (line = pipe.gets)

data/lib/cloner/version.rb

@@ -1,3 +1,3 @@
 module Cloner
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily clone your production Mongoid database and files for local development