mondupe 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc78120740c79e0004d0229600494145ced3a460
-  data.tar.gz: 411facd28bd4a82f4ab275a0de75daf42cba72a8
+  metadata.gz: 541673b823f1b0fbfe7c35113d87822502b7df58
+  data.tar.gz: 58fa32ccbd50784c32a3b1cfffbaf840181d2ddc
 SHA512:
-  metadata.gz: 9c23948d38c775187131f6f203d715f23c47fb762fc03c59b0f6e26efe67870de6b13953a76b600fc654f81edbb21d2dde1048b33f47a135d7ccb5b903f14b06
-  data.tar.gz: cf5806525cec2fed74d65e99192e9aeafa054e93d2c55a9465395bdb1fd6911c7a56dcb2914d2db4759696624cde7d8a14574436261c5750bf3ffb650ed8b655
+  metadata.gz: 0d273f64b8841f6b25693b7f4927c10924303597dcc58664bb3120b90b9df534f8e3ba01624dca885de8b6e7a907021987e0cfdfa7b6ddd08b7b66b6d40c92fc
+  data.tar.gz: 839c3fa589c98cde2029c793bf4465878515f14ffcb534b5000eb1a42c2f55d9dc31eaffd7a42188e2a6182e4d78df0c04f25a85187eb651dfdc55326e101424

data/bin/mondupe

@@ -73,23 +73,23 @@ opt_parser = OptionParser.new do |opt|
     $options[:size] = size
   end
 
-  opt.on("-r","--mongodbname","Database name to restore to") do |mongo_db_name|
+  opt.on("-r","--mongodbname DATABASE","Database name to restore to") do |mongo_db_name|
     $options[:mongo_db_name] = mongo_db_name
   end
 
-  opt.on("-u","--mongouser","Username to authenticate to mongodb with") do |mongo_user|
+  opt.on("-u","--mongouser USERNAME","Username to authenticate to mongodb with") do |mongo_user|
     $options[:mongo_user] = mongo_user
   end
 
-  opt.on("-p","--mongopass","Password to authenticate to mongodb with") do |mongo_pass|
+  opt.on("-p","--mongopass PASSWORD","Password to authenticate to mongodb with") do |mongo_pass|
     $options[:mongo_pass] = mongo_pass
   end
 
-  opt.on("-c","--mongoauthdb","Database to authenticate against for mongo") do |mongo_auth_db|
+  opt.on("-c","--mongoauthdb DATABASE","Database to authenticate against for mongo") do |mongo_auth_db|
     $options[:mongo_auth_db] = mongo_auth_db
   end
 
-  opt.on("-x","--execute","Java Script to execute against DB") do |java_string|
+  opt.on("-x","--execute SCRIPT","Java Script to execute against DB. Must be in quotes.") do |java_string|
     $options[:java_string] = java_string
   end
 
@@ -175,7 +175,7 @@ when "dumps3"
 when "restore"
   puts "Restoring mongo database from dump"
   Mondupe.new.restore_db(instance_host_address, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
-when 'execute'
+when "execute"
   puts "Executing JS against database"
   Mondupe.new.execute_js(instance_host_address, ssh_key, ssh_user, java_string, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
 when "terminate"

data/lib/mondupe.rb

@@ -155,11 +155,11 @@ class Mondupe
   end
 
   def execute_js(instance_dns, ssh_key, ssh_user, java_command, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
-    abort "You must specify a database name to execute java script against. Use -n [name] or ENV['MONGO_DB_NAME'] to set this value." if mongo_db_name.nil?
+    abort "You must specify a database name to execute java script against. Use -r [mongo_db_name] or ENV['MONGO_DB_NAME'] to set this value." if mongo_db_name.nil?
     db_connect_string = "mongo #{mongo_db_name}"
     db_connect_string << " -u \"#{mongo_user}\" -p \"#{mongo_pass}\"" if !mongo_user.nil? && !mongo_pass.nil?
     db_connect_string << " --authenticationDatabase \"#{mongo_auth_db}\"" if !mongo_auth_db.nil?
-    puts "Connect String: #{db_connect_string}"
+    #puts "Connect String: #{db_connect_string}"
     puts "#{Time.now.to_s} - Running command on #{instance_dns} against #{mongo_db_name}"
     db_output = `ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} "echo '#{java_command}' | #{db_connect_string}"`
     puts db_output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondupe
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Philip Hutchins