ey_cloud_server 1.4.51 → 1.4.54

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d033b573b265b7527713823edd15040a173062ab
-  data.tar.gz: 1a9fb374f6637aed866db0ef7e144ea6428b34d5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTdlYWY2NzRmNzI0YjA2ODVlNzBhYWM5ZTQyZTIzODJjMjEyMmJjYw==
+  data.tar.gz: !binary |-
+    ZDkxZjUxMjA5Njc3MTI3NmViNmEwYmJhMDZlZjgwNTMyNTBkNWIzOQ==
 SHA512:
-  metadata.gz: 6742eba6a8c2c2d616d327449976198d15b0c3af0ad331eab0013ab2e96dcc05e8545abca6c3aff855ea74b7ff2fdd8a6a32926e1dcddfba1d482d879e3424b1
-  data.tar.gz: 6c0ed455138c48e338f5f58f21e6798a39422da374385df8f04d9d9445b8c30ccb3760033aec5ff5fdfc5a9530e007f52912861384f157da3c9aa71b58868041
+  metadata.gz: !binary |-
+    YmQ1MDQwODBkMWNlYTFkMmI5NzM0YzdhM2UyYzVkNDQyZmNlODJjOTdkNDc0
+    YWM3ZjliNjFiZDhhMjc2MmFlZTRjMzU5MjUzY2FhNzQ0ZjkyYTUyZDQzMzM2
+    YTQwZjI3MzZmYTZhNTNlYTgzZDg2ZDFiNWNkMzg5ZDZlZDBjMzc=
+  data.tar.gz: !binary |-
+    MDQwZWY0MzgzMGI4NTI2MTgyMGQ0ZWQ5MzRlM2EzOTI5ZWFlY2EzMzAxMmRi
+    MTAwNDI3YzI0ODU4YmY3YzliZTcxNmFlNmNjMWM0Y2I3YzYzMDNkODdmODEx
+    ZWM4YTk3NTM3NTM1MGMwZjcxYTc1ODYyM2Q5ZWY5YTRkZTg0YTQ=

data/Rakefile

@@ -7,7 +7,7 @@ require 'rspec/core/rake_task'
 desc "Run unit specifications"
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = %w(-fs --color --backtrace)
+  t.rspec_opts = %w(-fp --color --backtrace)
 end
 
 require 'cucumber/rake/task'

data/features/downloading_a_mysql_backup.feature

@@ -4,9 +4,11 @@ Feature:
     And backups for mysql are run
     When backup "0" for the "first" database is downloaded
     Then there is a backup file for the "first" database
+    And the "first" mysql database is dropped
 
   Scenario: no database backup
     Given there is a mysql database (first)
     When backup "0" for the "first" database is downloaded
     Then there is no backup file for the "first" database
     And stderr contains "No backup found for database"
+    And the "first" mysql database is dropped

data/features/making_a_postgresql_backup.feature

@@ -3,6 +3,7 @@ Feature:
     Given there is a postgresql database (first)
     When listing the backups for the "first" postgresql database
     Then the output contains "0 backup(s) found"
+    And the "first" postgresql database is dropped
 
   Scenario: a single backup run
     Given there is a postgresql database (first)
@@ -10,3 +11,4 @@ Feature:
     When listing the backups for the "first" postgresql database
     Then the output contains "1 backup(s) found"
     And the output contains "0:%s" substituting the "first" postgresql database
+    And the "first" postgresql database is dropped

data/features/restoring_postgres_backup.feature

@@ -3,10 +3,12 @@ Feature:
     Given there is a postgresql database (first)
     When backup "0" for the "first" database is restored
     Then stderr contains "No backup found for database"
+    And the "first" postgresql database is dropped
 
   Scenario: with a backup
     Given there is a postgresql database (first)
     And backups for postgresql are run
-    And the "first" database is dropped
+    And the "first" postgresql database is dropped
     When backup "0" for the "first" database is restored
     Then the "first" postgresql database exists
+    And the "first" postgresql database is dropped

data/features/step_definitions/backups.rb

@@ -28,7 +28,7 @@ When \
   db_name = created_postgresql_dbs[db_key]
   capturing_stdio do
     EY::Backup.logger = EY::Backup::Logger.new
-    EY::Backup.run(["-e", "postgresql", "-r", "#{index}:#{db_name}", "-c", backup_config_file ])
+    EY::Backup.run(["-e", "postgresql", "-r", "#{index}:#{db_name}", "-c", backup_config_file, '--force' ])
   end
 end
 

data/features/step_definitions/mysql.rb

@@ -2,3 +2,9 @@ Given \
     /^there is a mysql database \(([^\)]*)\)$/ do |db_key|
   create_mysql_database(db_key)
 end
+
+Given \
+    /^the "([^\"]*)" mysql database is dropped$/ do |db_key|
+  db_name = created_mysql_dbs[db_key]
+  drop_mysql_database(db_name)
+end

data/features/step_definitions/postgresql.rb

@@ -10,6 +10,7 @@ Then \
 end
 
 Given \
-    /^the "([^\"]*)" database is dropped$/ do |db_key|
-  drop_postgresql_database(db_key)
+    /^the "([^\"]*)" postgresql database is dropped$/ do |db_key|
+  db_name = created_postgresql_dbs[db_key]
+  drop_postgresql_database(db_name)
 end

data/lib/ey_backup/backend.rb

@@ -15,7 +15,7 @@ module EY
       def start_upload(filenames, environment_name, database_name)
         filenames.each do |filename|
           begin
-            object_name = "#{environment_name}.#{database_name}/#{File.basename(filename)}"
+            object_name = File.join("#{environment_name}.#{database_name}", "#{File.basename(filename)}")
             info "Starting upload: #{filename}"
             @s3.put_object(@bucket_minder.bucket_name, object_name, File.open(filename,'r'))
             info "Successful upload: #{filename}"

data/lib/ey_backup/backup_set.rb

@@ -38,10 +38,10 @@ module EY
 
         backups = databases.map{ |db| db.backups }.flatten
 
-        info "#{backups.size} backup(s) found"
+        puts "#{backups.size} backup(s) found"
 
         backups.each_with_index do |backup_set, i|
-          info "#{i}:#{backup_set.database_name} #{backup_set.normalized_name}"
+          puts "#{i}:#{backup_set.database_name} #{backup_set.normalized_name}"
         end
 
         backups
@@ -80,6 +80,7 @@ module EY
         @keys.each do |key|
           info "Downloading #{key} to #{@database.base_path}"
           remote_filename = File.join(@database.base_path, normalize(key))
+          puts "Filename: #{remote_filename}"
           File.open(remote_filename, 'wb') do |f|
             @database.bucket_minder.stream(key) do |chunk, remaining_size, total_size|
               f.write(chunk)

data/lib/ey_backup/cli.rb

@@ -36,9 +36,8 @@ module EY
 
         opts = OptionParser.new do |opts|
           opts.version = EY::CloudServer::VERSION
-          puts '' # add a blank line
 
-          opts.banner = "Usage: eybackup [-flag] [argument]"
+          opts.banner = "\nUsage: eybackup [-flag] [argument]"
           opts.define_head "  eybackup: manage dump (mysqldump/pg_dump) style backups of your database."
           opts.separator '*'*80
 

data/lib/ey_backup/database.rb

@@ -39,7 +39,7 @@ module EY
       end
 
       def generate_basename
-        "#{@base_path}/#{@name}.#{timestamp}"
+        File.join(@base_path, "#{@name}.#{timestamp}")
       end
 
       def timestamp

data/lib/ey_backup/engines/mysql_engine.rb

@@ -73,27 +73,24 @@ module EY
       end
 
       def db_has_myisam?(database_name)
-        query, stdout = "SELECT 1 FROM information_schema.tables WHERE table_schema='#{database_name}' AND engine='MyISAM' LIMIT 1;", StringIO.new
-        spawn(%Q{mysql #{username_option} #{host_option} -N -e"#{query}"}, stdout)
-        stdout.string.strip == '1'
+        query = "SELECT 1 FROM information_schema.tables WHERE table_schema='#{database_name}' AND engine='MyISAM' LIMIT 1;"
+        stdout = %x{mysql #{username_option} #{host_option} -N -e"#{query}"}
+        stdout.strip == '1'
       end
       
       def db_replicating?
-        stdout = StringIO.new
-        spawn(%Q{mysql #{username_option} #{host_option} -BN -e"show slave status"|wc -l}, stdout)
-        stdout.string.to_i > 0
+        stdout = %x{mysql #{username_option} #{host_option} -BN -e"show slave status"|wc -l}
+        stdout.to_i > 0
       end
       
       def read_only_on?
-        stdout = StringIO.new
-        spawn(%Q{mysql #{username_option} #{host_option} -BN -e"select @@global.read_only"}, stdout)
-        stdout.string.to_i == 1
+        stdout = %x{mysql #{username_option} #{host_option} -BN -e"select @@global.read_only"}
+        stdout.to_i == 1
       end
       
       def log_bin_on?
-        stdout = StringIO.new
-        spawn(%Q{mysql #{username_option} #{host_option} -BN -e"select @@global.log_bin"}, stdout)
-        stdout.string.to_i == 1
+        stdout = %x{mysql #{username_option} #{host_option} -BN -e"select @@global.log_bin"}
+        stdout.to_i == 1
       end
       
       def cycle_database(database_name)

data/lib/ey_backup/engines/postgresql_engine.rb

@@ -35,10 +35,9 @@ module EY
       end
 
       def check_connections(database_name)
-        stdout = StringIO.new()
-        active_connections = spawn(%Q{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select count(*) from pg_stat_activity where datname='#{database_name}';"}, stdout)
+        active_connections = %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select count(*) from pg_stat_activity where datname='#{database_name}';"}
         
-        if stdout.string.to_i > 0
+        if active_connections.to_i > 0
           res = ''
           unless force
             puts "There are currently #{stdout.string.to_i} connections on database: '#{database_name}'; can I kill these to continue (Y/n):"
@@ -56,31 +55,32 @@ module EY
       end
       
       def cancel_connections(database_name)
-        spawn(%Q{psql -U postgres -h #{host} -c"SELECT pg_terminate_backend(pg_stat_activity.pid)
+        %x{psql -U postgres -h #{host} -c"SELECT pg_terminate_backend(pg_stat_activity.pid)
           FROM pg_stat_activity
-          WHERE pg_stat_activity.datname = '#{database_name}';"})
+          WHERE pg_stat_activity.datname = '#{database_name}';"}
       end
       
       def drop_database(database_name)
-        spawn("PGPASSWORD='#{password}' dropdb -h #{host} -Upostgres #{database_name}")
+        command = "PGPASSWORD='#{password}' dropdb -h #{host} -Upostgres #{database_name}"
+        verbose "Dropping Database with: #{command}"
+        %x{#{command}}
       end
 
       def create_database(database_name)
-        spawn("PGPASSWORD='#{password}' createdb -U#{username} -h #{host} #{database_name}")
+        command = "PGPASSWORD='#{password}' createdb -U#{username} -h #{host} #{database_name}"
+        verbose "Creating Database with: #{command}"
+        %x{#{command}}
       end
       
       def check_if_replica
-        stdout = StringIO.new()
-        spawn(%Q{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select pg_is_in_recovery()"| head -n 1}, stdout)
-        unless stdout.string.chomp =~ /^\W*f$/
+        stdout = %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select pg_is_in_recovery()"| head -n 1}
+        unless stdout.chomp =~ /^\W*f$/
           EY::Backup.logger.fatal(%Q{ERROR: Target host: '#{host}' is currently a replica in recovery mode; restore operations need to be processed against the master.})
         end
       end
       
       def create_command(database_name)
-        stdout = StringIO.new()
-        
-        spawn(%Q{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "SELECT 'CREATE DATABASE ' || datname ||
+        %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "SELECT 'CREATE DATABASE ' || datname ||
           ' WITH OWNER ' || pg_user.usename ||
           CASE (select pg_encoding_to_char(encoding) from pg_database where datname='template1') 
           WHEN pg_encoding_to_char(encoding) 
@@ -95,8 +95,7 @@ module EY
         INNER JOIN pg_user
           ON pg_user.usesysid = pg_database.datdba
         WHERE datname = '#{database_name}'"
-        }, stdout)
-        stdout.string
+        }
       end
       
       def cycle_database(database_name)
@@ -106,7 +105,7 @@ module EY
         else
           check_connections(database_name)
           drop_database(database_name)
-          spawn(%Q{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "#{create_cmd}"})
+          %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "#{create_cmd}"}
         end
       end
 

data/lib/ey_backup/processors/splitter.rb

@@ -34,6 +34,8 @@ module EY
 
       def join(input_files)
         filename = input_files.first.sub(/\.part\d+$/, '')
+        
+        verbose "Filename: #{filename}"
 
         File.open(filename, 'w') do |output|
           sort(input_files).each do |input|

data/lib/ey_backup/spawner.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module EY
   module Backup
     module Spawner
@@ -28,20 +30,27 @@ module EY
         # This is to detect failures anywhere in the pipeline.
         wrapper = <<-EOT
           status=0
-          set -o pipefail
           #{command}
           status=$?
 
           if [ $status -gt 0 ]; then exit 1; fi
         EOT
 
+        escaped_command = Shellwords.escape(wrapper)
+
         verbose "Running command: #{command}" 
-        pid, *_ = Open4.popen4(wrapper)
+        pid, stdin, stdout, stderr = Open4.popen4("bash -o pipefail -c #{escaped_command}")
         pid, status = Process::waitpid2(pid)
         
+        verbose "stdout: #{stdout.read}"
+        verbose "stderr: #{stderr.read}"
+        verbose "status: #{status}"
+        
         if ! status.success?
-          dumperr = File.read("/tmp/eybackup.#{pid}.dumperr")
-          error("DB dump failed. The error returned was: #{dumperr}", db)
+          dumperr = File.exists?("/tmp/eybackup.#{pid}.dumperr") ? File.read("/tmp/eybackup.#{pid}.dumperr") : status
+          err_msg = "DB dump failed. The error returned was: #{dumperr}"
+          verbose "#{db} backup failed: #{err_msg}"
+          error(err_msg, db)
         end
 
         # Clean up:

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.51'
+    VERSION = '1.4.54'
   end
 end

data/lib/ey_cloud_server.rb

@@ -6,3 +6,4 @@ module EY
 end
 
 require 'ey_cloud_server/version'
+require 'ey_cloud_server/mysql_start'

data/spec/config.yml

@@ -5,7 +5,7 @@ mysql_user: root
 mysql_password:
 mysql_host: localhost
 postgresql_user: postgres
-postgresql_password: ketchup
+postgresql_password: grew152
 postgresql_host: localhost
 aws_secret_id: 'AKIAIDNXVLT3THIWYMNQ'
 aws_secret_key: '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'

data/spec/ey_backup/backup_spec.rb

@@ -4,21 +4,25 @@ describe EY::Backup do
   before(:each) do
     @db_name = create_mysql_database('first')
   end
+  
+  after(:each) do
+    drop_mysql_database(@db_name)
+  end
 
   describe "#list" do
 
     it 'prints the database to be listed first' do
-      EY::Backup.run([ "-c", backup_config_file ])
+      EY::Backup.run([ "-c", backup_config_file])
 
       reset_logger
 
       EY::Backup.run(["-c", backup_config_file, "-l", @db_name])
 
-      stdout.should =~ /\AListing database backups for #{@db_name}$/
+      stdout.should =~ /Listing database backups for #{@db_name}$/
     end
 
     it 'conforms to the /^\d:#{db_name} #{db_name}\.#{timestamp}\.#{ext}$/ line output' do
-      EY::Backup.run([ "-c", backup_config_file ])
+      EY::Backup.run([ "-c", backup_config_file])
 
       reset_logger
 
@@ -32,7 +36,7 @@ describe EY::Backup do
     it 'prints all the database names' do
       @db_name2 = create_mysql_database('second')
 
-      EY::Backup.run([ "-c", backup_config_file ])
+      EY::Backup.run([ "-c", backup_config_file])
 
       reset_logger
 
@@ -40,6 +44,7 @@ describe EY::Backup do
 
       stdout.should =~ /^\d+:#{@db_name}/
       stdout.should =~ /^\d+:#{@db_name2}/
+      drop_mysql_database(@db_name2)
     end
   end
 

data/spec/ey_backup/cli_spec.rb

@@ -4,6 +4,10 @@ describe "MySQL Backups" do
   before(:each) do
     @db_name = create_mysql_database('first')
   end
+  
+  after(:each) do
+    drop_mysql_database(@db_name)
+  end
 
   describe "--quiet" do
     it "does not print anything to STDOUT" do
@@ -11,8 +15,11 @@ describe "MySQL Backups" do
         reset_logger
         EY::Backup.run(["-c", backup_config_file, '--quiet'])
       end
+      
+      possibly = last_stdout
+      puts "last_stdout == '#{possibly}'"
+      possibly.should be_empty
 
-      last_stdout.should be_empty
     end
 
     it 'does print to STDOUT without the flag' do

data/spec/ey_backup/mysql_backups_spec.rb

@@ -3,10 +3,18 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "MySQL Backups" do
   before(:each) do
     @db_name = create_mysql_database('first')
+    mk_tmp
+  end
+  
+  after(:each) do
+    drop_mysql_database(@db_name)
   end
 
   it "makes a backup" do
-    EY::Backup.run(["-c", backup_config_file ])
+    result = capturing_stdio do
+      EY::Backup.run(["-c", backup_config_file])
+    end
+    puts "MySQL Command: #{result}"
 
     reset_logger
 
@@ -35,7 +43,7 @@ describe "MySQL Backups" do
     run_sql("CREATE TABLE `foo` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_true
     run_sql("CREATE TABLE `bar` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_true
 
-    EY::Backup.run(["-c", backup_config_file ])
+    EY::Backup.run(["-c", backup_config_file, '-v' ])
 
     run_sql("DROP TABLE `bar`;", @db_name).should be_true
     run_sql("SELECT * FROM `bar`;", @db_name).should be_false
@@ -46,7 +54,7 @@ describe "MySQL Backups" do
 
     stdout.should include("1 backup(s) found")
 
-    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}"])
+    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", "--force"])
 
     run_sql("SELECT * FROM `foo`;", @db_name).should be_true
     run_sql("SELECT * FROM `bar`;", @db_name).should be_true
@@ -68,7 +76,7 @@ describe "MySQL Backups" do
 
     stdout.should include("1 backup(s) found")
 
-    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}"])
+    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '--force'])
 
     run_sql("SELECT * FROM `foo`;", @db_name).should be_true
     run_sql("SELECT * FROM `bar`;", @db_name).should be_true
@@ -123,6 +131,12 @@ describe "MySQL Backups" do
   before(:each) do
     @dbs = [create_mysql_database('first'), create_mysql_database('second')]
   end
+  
+  after(:each) do
+    @dbs.each do |db|
+      drop_mysql_database(db)
+    end
+  end
 
   it "makes a backup" do
     EY::Backup.run(["-c", backup_config_file ])
@@ -141,6 +155,10 @@ describe "a multi-region backup" do
     before(:each) do
       @db_name = create_mysql_database('speaking_japanese', 'ap-northeast-1')
     end
+    
+    after(:each) do
+      drop_mysql_database(@db_name)
+    end
 
     it "makes a split backup" do
       EY::Backup.run(["-c", backup_config_file, "-s", "100"])
@@ -165,7 +183,7 @@ describe "a multi-region backup" do
 
       stdout.should include("1 backup(s) found")
 
-      EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}"])
+      EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '--force'])
 
       run_sql("SELECT * FROM `foo`;", @db_name).should be_true
       run_sql("SELECT * FROM `bar`;", @db_name).should be_true
@@ -176,6 +194,10 @@ describe "a multi-region backup" do
     before(:each) do
       @db_name = create_mysql_database('speaking_esperanto', 'eu-west-1')
     end
+    
+    after(:each) do
+      drop_mysql_database(@db_name)
+    end
 
     it "makes a split backup" do
       EY::Backup.run(["-c", backup_config_file, "-s", "100"])
@@ -200,7 +222,7 @@ describe "a multi-region backup" do
 
       stdout.should include("1 backup(s) found")
 
-      EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}"])
+      EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '--force'])
 
       run_sql("SELECT * FROM `foo`;", @db_name).should be_true
       run_sql("SELECT * FROM `bar`;", @db_name).should be_true

data/spec/ey_backup/postgres_backups_spec.rb

@@ -4,6 +4,10 @@ describe "Postgres Backups" do
   before(:each) do
     @db_name = create_postgresql_database('first')
   end
+  
+  after(:each) do
+    drop_postgresql_database(@db_name)
+  end
 
   it "makes a custom format backup" do
     EY::Backup.run(["-c", backup_config_file, "-e", "postgresql"])
@@ -47,7 +51,7 @@ describe "Postgres Backups" do
 
     stdout.should include("1 backup(s) found")
 
-    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '-e', 'postgresql'])
+    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '-e', 'postgresql', '--force'])
 
     run_psql("SELECT * FROM foo;", @db_name).should be_true
     run_psql("SELECT * FROM bar;", @db_name).should be_true
@@ -66,9 +70,9 @@ describe "Postgres Backups" do
     EY::Backup.run(["-c", backup_config_file, "-l", @db_name, '-e', 'postgresql'])
   
     stdout.should include("1 backup(s) found")
-  
-    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '-e', 'postgresql'])
-  
+
+    EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '-e', 'postgresql', '--force'])
+
     run_psql("SELECT * FROM foo;", @db_name).should be_true
     run_psql("SELECT * FROM bar;", @db_name).should be_true
   end
@@ -92,6 +96,12 @@ describe "Postgresql Backups" do
   before(:each) do
     @dbs = [create_postgresql_database('first'), create_postgresql_database('second')]
   end
+  
+  after(:each) do
+    @dbs.each do |db|
+      drop_postgresql_database(db)
+    end
+  end
 
   it "makes multiple backup" do
     EY::Backup.run(["-c", backup_config_file, "-e", "postgresql"])

data/spec/helpers.rb

@@ -80,13 +80,17 @@ module Helpers
   def backup_config_file
     "#{tmp_dir}/spec_backups.yml"
   end
+  
+  def mk_tmp
+    FileUtils.mkdir_p("/tmp")
+  end
 
   def mysql_password_option
     mysql_password.nil? ? "" : "-p#{mysql_password}"
   end
 
   def generate_database_name(type)
-    "ey_flex_#{type}_db_#{/\w{5,7}/.gen}"
+    "ey_flex_#{type}_db_#{/\w{5,7}/.gen}".downcase
   end
 
   def create_mysql_database(db_key, region = 'us-east-1')
@@ -94,13 +98,20 @@ module Helpers
     system(%Q{mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -e "drop database if exists #{db_name};"})
     system(%Q{mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -e "create database #{db_name};"}) || raise("Could not create db: #{db_name}")
     created_mysql_dbs[db_key] = db_name
+    puts "*** MySQL DB Created: #{db_name}"
     write_database_config('mysql', mysql_user, mysql_password, mysql_host, created_mysql_dbs.values, region)
     db_name
   end
+  
+  def drop_mysql_database(db_name)
+    command = %Q{mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -e "drop database if exists #{db_name};"}
+    puts "*** MySQL Drop Command: #{command}"
+    system(command)
+  end
 
-  def drop_postgresql_database(db_key)
-    db_name = created_postgresql_dbs[db_key]
+  def drop_postgresql_database(db_name)
     command = %Q{ PGPASSWORD='#{postgresql_password}' dropdb -U #{postgresql_user} -h #{postgresql_host} #{db_name} }
+    puts "Postgres Drop Command: #{command}"
     system(command)
   end
 
@@ -113,7 +124,7 @@ module Helpers
   def create_postgresql_database(db_key, region = 'us-east-1')
     db_name = generate_database_name('postgresql')
     created_postgresql_dbs[db_key] = db_name
-    drop_postgresql_database(db_key)
+    drop_postgresql_database(db_name)
     command = %Q{ PGPASSWORD='#{postgresql_password}' createdb -U #{postgresql_user} -h #{postgresql_host} #{db_name} }
     system(command) || raise("Could not create db: #{db_name} with command:\n #{command}")
     write_database_config('postgresql', postgresql_user, postgresql_password, postgresql_host, created_postgresql_dbs.values, region)

metadata

@@ -1,127 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: ey_cloud_server
 version: !ruby/object:Gem::Version
-  version: 1.4.51
+  version: 1.4.54
 platform: ruby
 authors:
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.6.2
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.6.2
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: aws-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ey_enzyme
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: ey_instance_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: randexp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.6.ninjas
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.6.ninjas
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.ninjas
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.ninjas
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.7
 description: Miscellaneous EY server utilities
 email:
 - engineering@engineyard.com
@@ -192,17 +302,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Server side components for Engine Yard's cloud