cloner 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f458cd38cf985729bae72765cff1a62b1e20b95
-  data.tar.gz: 49f0ec43973df92b49f320485fa492149e12310b
+  metadata.gz: ff039ecf77aa04b16d10b76f3ec8ec8dc494085d
+  data.tar.gz: 03534218c250e015f8f4ecc8d8f33d4cc6a7b610
 SHA512:
-  metadata.gz: 3d8adf2b9f7ad47e2b311ee6417f6b6d49eca5e2b5afbec134b4a856dc29fc22c62952a6d0b39ac4b98b76e8101ca23b2b882221ea5a73529b969da0afca4bb7
-  data.tar.gz: 319bf7a34e025e9d5b651195e58b922d905cb4bcd4046549bd4869eeb4fc273ec928636721069dfbf7feb5bcfa00e14b01aec33fdf2236202224bab5d6491227
+  metadata.gz: b9b5605a4be19035cc327d101f8a35cb654d1bee6f859af0ece4eeacc694277b6bb761d4940e21c7f1af9630c453d4b26a7215bc82210b3bf7e2474e860f63c2
+  data.tar.gz: 76a975a0aa4083a9e78ee1a38aa8718f20979354bc9c99b4adb55e5eacee5a2e8e178f691eabaf2ddd975aaa77a78319289ebf967b7841780527b90c8f125b9a

data/lib/cloner/mongodb.rb

@@ -32,10 +32,12 @@ module Cloner::MongoDB
   end
 
   def mongodb_local_auth
-    if mongodb_conf['password'].nil?
-      ""
-    else
+    if mongodb_conf['options'].present? && mongodb_conf['password'].present?
+      "-u #{e mongodb_conf['options']['user']} -p #{e mongodb_conf['options']['password']}"
+    elsif mongodb_conf['password'].present?
       "-u #{e mongodb_conf['username']} -p #{e mongodb_conf['password']}"
+    else
+      ""
     end
   end
 
@@ -45,7 +47,12 @@ 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 #{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}"
+      if mongodb_r_conf['options'].present? && mongodb_r_conf['options']['password'].present?
+        username, password = mongodb_r_conf['options']['user'], mongodb_r_conf['options']['password']
+      else
+        username, password = mongodb_r_conf['username'], mongodb_r_conf['password']
+      end
+      dump = "mongodump -u #{e username} -p #{e 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)

data/lib/cloner/version.rb

@@ -1,3 +1,3 @@
 module Cloner
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloner
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor