mondupe 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537a81e5200338fa09374211defb7e408374e0af
-  data.tar.gz: 2527234dca42a179549f2313c411b9d9fd02ff51
+  metadata.gz: 14039c9391a91da785e7e8b837a23fd7d6eab971
+  data.tar.gz: 585a0cea931df1fc3e5d580e8344c88369c38754
 SHA512:
-  metadata.gz: d5c0c4b6a3fc33e4458d639d67e52cff60f4d71f21e3695b8b03a813fcc88077bdd511665cef7f9f1edca0adc5be8cb3bec97b77b826e5fd15a82e040823291c
-  data.tar.gz: 7fb401302c1826fbab4f916ff97abc0e00a54894e07d684f264e6d9bb1276bc577891b1bd6cb67d63fe737fc9ce179f5fde94e3955f9f043bdabce165b3dffba
+  metadata.gz: 4bb20d98cc526259c70aa8dfd8d218ced240a66be6e3c3d6a062d7990306c61bc14a44b6603340c12ff2f5783daa1e2c24b0be8f55314da6f4eea5e6102a5c22
+  data.tar.gz: e0e33aec7535e6400b8f5524b50a6ee54a7381d788583930c831729f7b971447531c5f19168f5e7d4b4a49c95179695eeb8b85d3f2fb022fa505dace4f65ee86

data/bin/mondupe

@@ -5,7 +5,7 @@ require 'optparse'
 
 $options = {}
 
-ValidHostnameRegex=/(?!-)[A-Z\d-]{1,63}(?<!-)$/
+ValidHostnameRegex=/(?![0-9]+$)(?!-)[a-zA-Z0-9-]{,63}(?<!-)/
 
 opt_parser = OptionParser.new do |opt|
   opt.banner = "Usage: mondupe COMMAND [OPTIONS]"

data/lib/mondupe.rb

@@ -121,22 +121,22 @@ class Mondupe
     # TODO - Fail the process if any step fails
     puts "#{Time.now.to_s} - Dropping existing database"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "echo 'db.dropDatabase()' | mongo cde_production"`
-    if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else die("Error dropping database") end
+    if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else abort("Error dropping database") end
     puts "Extracting database dump archive file..."
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "cd #{dump_tmp_path}; tar xf #{dump_file_name}"`
-    if $?.success? then puts "#{Time.now.to_s} - Extraction complete!" else die("Error extracting archive") end
+    if $?.success? then puts "#{Time.now.to_s} - Extraction complete!" else abort("Error extracting archive") end
     puts "Restoring Mongo Database from extracted dump: #{File.join(dump_tmp_path, "cde_production")}"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "time mongorestore #{File.join(dump_tmp_path, "cde_production")}"`
-    if $?.success? then puts "#{Time.now.to_s} - Database restore complete!" else die("Error restoring databse") end
+    if $?.success? then puts "#{Time.now.to_s} - Database restore complete!" else abort("Error restoring databse") end
     puts "Removing database archive file"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, dump_file_name)}"`
-    if $?.success? then puts "#{Time.now.to_s} - Archive removed!" else die("Error removing archive") end
+    if $?.success? then puts "#{Time.now.to_s} - Archive removed!" else abort("Error removing archive") end
     puts "#{Time.now.to_s} - Removing saved searches"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "mongo cde_production --eval \\"db.users.update({save_searches: {$ne: null}}, {$unset: {save_searches: ''}}, {multi: true})\\""`
-    if $?.success? then puts "#{Time.now.to_s} - Saved searches removed" else die("Error removing saved searches") end
+    if $?.success? then puts "#{Time.now.to_s} - Saved searches removed" else abort("Error removing saved searches") end
     puts "#{Time.now.to_s} - Cleaning up our mess..."
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, 'cde_production')}"`
-    if $?.success? then puts "#{Time.now.to_s} - Mess cleaned up!" else die("Error cleaning up after myself...") end
+    if $?.success? then puts "#{Time.now.to_s} - Mess cleaned up!" else abort("Error cleaning up after myself...") end
   end
 
   def terminate(instance_id)

metadata

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