ey_cloud_server 1.4.54 → 1.5.0

data/lib/ey_backup/engines/mysql_engine.rb

@@ -6,7 +6,7 @@ module EY
       def dump(database_name, basename)
         file = basename + '.sql'
 
-        command = "mysqldump #{username_option} #{host_option} #{single_transaction_option(database_name)} #{routines_option} #{master_data_option} #{databases_option(database_name)} 2> /tmp/eybackup.$$.dumperr"
+        command = "( #{server_id} mysqldump #{username_option} #{host_option} #{single_transaction_option(database_name)} #{routines_option} #{master_data_option} #{databases_option(database_name)} ) "
 
         if gpg?
           command << " | " << GPGEncryptor.command_for(key_id)
@@ -17,6 +17,8 @@ module EY
         end
 
         command << " > #{file}"
+        
+        block_concurrent(database_name) unless allow_concurrent
 
         run(command, database_name)
 
@@ -27,14 +29,16 @@ module EY
         command = "cat #{file}"
 
         if file =~ /.gpz$/ # GPG?
-          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load using the mysql client."
+          abort "\nCannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load using the mysql client.
+  To decrypt a backup: https://support.cloud.engineyard.com/hc/en-us/articles/205413948-Use-PGP-Encrypted-Database-Backups-with-Engine-Yard-Cloud#restore
+  Once decrypted, restore with: `gunzip -f < <filename> | mysql #{username_option} #{host_option} #{database_name}`\n\n"
         else
           command << " | " << GZipper.gunzip
         end
         
         cycle_database(database_name)
 
-        command << " | mysql #{username_option} #{host_option} #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command << " | mysql #{username_option} #{host_option} #{database_name} "
 
         run(command, database_name)
       end
@@ -52,12 +56,19 @@ module EY
         "--routines"
       end
       
+      def server_id
+        if log_bin_on? and log_coordinates
+          stdout = %x{mysql #{username_option} #{host_option} -BN -e"select @@global.server_id"}
+          "echo '-- Server_id: #{stdout.strip}' && "
+        end 
+      end
+      
       def master_data_option
-        "--master-data=2" if log_bin_on?
+        "--master-data=2" if log_bin_on? and log_coordinates
       end
       
       def databases_option(db)
-        "--add-drop-database --databases #{db}"
+        "#{db}"
       end
 
       def host_option

data/lib/ey_backup/engines/postgresql_engine.rb

@@ -6,7 +6,7 @@ module EY
       def dump(database_name, basename)
         file = basename + '.dump'
 
-        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --create --format=c -Upostgres #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --create --format=c -U#{username} #{database_name} "
 
         if gpg?
           command << " | " << GPGEncryptor.command_for(key_id)
@@ -15,6 +15,7 @@ module EY
 
         command << " > #{file}"
 
+        block_concurrent(database_name) unless allow_concurrent
         run(command, database_name)
 
         file
@@ -22,25 +23,39 @@ module EY
 
       def load(database_name, file)
         if file =~ /.gpz$/ # GPG?
-          abort "Cannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load with pg_restore."
+          abort "\nCannot restore a GPG backup directly; decrypt the file (#{file}) using your key and then load with pg_restore.
+  To decrypt a backup: https://support.cloud.engineyard.com/hc/en-us/articles/205413948-Use-PGP-Encrypted-Database-Backups-with-Engine-Yard-Cloud#restore
+  Once decrypted, restore with: `pg_restore -h #{host} --format=c --clean -U#{username} -d #{database_name} <filename>`\n\n"
         end
 
         cycle_database(database_name)
+        
+        # Exclude Extension Comments
+        toc_file = "#{file}.toc"
+        table_of_contents(file, toc_file)
 
         command = "cat #{file}"
 
-        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --format=c -Upostgres -d #{database_name} 2> /tmp/eybackup.$$.dumperr"
+        command << " | PGPASSWORD='#{password}' pg_restore -L #{toc_file} -h #{host} --format=c -U#{username} -d #{database_name}"
 
         run(command, database_name)
+        
+        system("rm #{toc_file}") if File.exists?(toc_file)
+        
+        # Analyze database unless disabled
+        unless skip_analyze
+          verbose "Analyzing database '#{database_name}', use --skip-analyze to skip this step."
+          %x{PGPASSWORD='#{password}' vacuumdb -h #{host} -U#{username} -d #{database_name} --analyze-only}
+        end
       end
 
       def check_connections(database_name)
-        active_connections = %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select count(*) from pg_stat_activity where datname='#{database_name}';"}
+        active_connections = %x{PGPASSWORD='#{password}' psql -U#{username} -h #{host} -t postgres -c "select count(*) from pg_stat_activity where datname='#{database_name}';"}
         
         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):"
+            puts "There are currently #{active_connections} connections on database: '#{database_name}'; can I kill these to continue (Y/n):"
             Timeout::timeout(30){
               res = gets.strip
             }
@@ -55,13 +70,13 @@ module EY
       end
       
       def cancel_connections(database_name)
-        %x{psql -U postgres -h #{host} -c"SELECT pg_terminate_backend(pg_stat_activity.pid)
+        %x{psql -U#{username} -h #{host} postgres -c"SELECT pg_terminate_backend(pg_stat_activity.pid)
           FROM pg_stat_activity
           WHERE pg_stat_activity.datname = '#{database_name}';"}
       end
       
       def drop_database(database_name)
-        command = "PGPASSWORD='#{password}' dropdb -h #{host} -Upostgres #{database_name}"
+        command = "PGPASSWORD='#{password}' dropdb -h #{host} -U#{username} #{database_name}"
         verbose "Dropping Database with: #{command}"
         %x{#{command}}
       end
@@ -73,14 +88,23 @@ module EY
       end
       
       def check_if_replica
-        stdout = %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "select pg_is_in_recovery()"| head -n 1}
+        command = "PGPASSWORD='#{password}' psql -U#{username} -h #{host} -t -c 'select pg_is_in_recovery()' postgres| head -n 1"
+        verbose "Checking for replica state with: #{command}"
+        stdout = %x{#{command}}
         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 table_of_contents(file, toc_file)
+        command = %Q{pg_restore -l #{file} | sed -e 's/^\\\(.* COMMENT - EXTENSION .*\\\)/;\\1/g' \
+          -e 's/^\\\(.* rdsadmin$\\\)/;\\1/g' > #{toc_file}}
+        verbose "Creating table of contents: #{command}"
+        %x{#{command}}
+      end
+      
       def create_command(database_name)
-        %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "SELECT 'CREATE DATABASE ' || datname ||
+        command="PGPASSWORD='#{password}' psql -U#{username} -h #{host} -t postgres -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) 
@@ -94,8 +118,9 @@ module EY
         FROM pg_database
         INNER JOIN pg_user
           ON pg_user.usesysid = pg_database.datdba
-        WHERE datname = '#{database_name}'"
-        }
+        WHERE datname = '#{database_name}'\""
+        verbose "Getting create info: #{command}"
+        %x{#{command}}
       end
       
       def cycle_database(database_name)
@@ -105,7 +130,7 @@ module EY
         else
           check_connections(database_name)
           drop_database(database_name)
-          %x{PGPASSWORD='#{password}' psql -U postgres -h #{host} -t -c "#{create_cmd}"}
+          %x{PGPASSWORD='#{password}' psql -U#{username} -h #{host} -t postgres -c "#{create_cmd}"}
         end
       end
 

data/lib/ey_backup/loader.rb

@@ -16,8 +16,10 @@ module EY
       end
 
       def run
-        info "Restoring #{@database.name}"
+        
         backup = download
+        mode = backup.basename =~ /.gpz$/ ? "Downloading" : "Restoring"
+        info "#{mode} #{@database.name}"
         backup.load!
         backup.remove_joined_file!
       end

data/lib/ey_backup/logger.rb

@@ -1,8 +1,15 @@
+class String
+   def truncate(limit = 1)
+     self.match(%r{^(.{0,#{limit}})})[1]
+   end
+end
+
 module EY
   module Backup
     class Logger
       extend Forwardable
       require 'shellwords'
+      require 'fileutils'
 
       attr_accessor :stdout, :stderr
 
@@ -22,21 +29,22 @@ module EY
 
       def push_dashboard_alert(message, alert_level, db = nil)
         message.gsub!("\n", '\n')
+        message = Shellwords.escape(message).truncate(255)
         type="process-dbbackup"
         type = type + " #{db}" unless db.nil?
         full_txt= "Severity: #{alert_level}\n" \
                 + "Time: #{Time.now.to_i}\n" \
                 + "Type: #{type}\n" \
-                + "Plugin: exec\n" \
-                + "raw_message: '#{message}'"
+                + "Plugin: exec\n"
         full_txt = Shellwords.escape(full_txt)
+        full_txt += "raw_message:\\ \\'#{message}\\'"
         alert_command = %Q(echo #{full_txt} | /engineyard/bin/ey-alert.rb 2>&1)
         verbose "Sending dashboard alert"
         system(alert_command)
       end
 
       def info(msg)
-        puts "#{Time.now} #{msg}" 
+        stdout.puts "#{Time.now} #{msg}" 
       end
 
       def verbose(msg)
@@ -46,24 +54,48 @@ module EY
       def set_verbose()
         @verbose = true
       end
+      
+      def set_log_path=(path)
+        @status_path = path
+        FileUtils.mkdir_p(@status_path)
+      end
 
       def say(msg, newline = true)
         newline ? info(msg) : stdout.print(msg)
       end
 
-      def okay(msg, db = nil)
-        stderr.puts("#{Time.now} OKAY: #{msg}")
-        # push_dashboard_alert(msg, "OKAY", db), we don't push OKAY alerts, we push a summary alert instead.
+      def okay(db, size)
+        filepath = File.join(@status_path, "#{db}.sizes")
+        %x{LOG=$(tail -n 100 #{filepath}); echo "$LOG" > #{filepath}} if File.exists?(filepath)
+        %x{echo "#{Time.now()} #{size}" >> #{filepath}}
+        msg = "Backup successful for '#{db}' after previous failure."
+        push_dashboard_alert(msg, 'OKAY', db) if clear_alert?(db)
       end
 
       def warn(msg, db = nil)
-        stderr.puts("#{Time.now} WARNING: #{msg}")
+        stdout.puts("#{Time.now} WARNING: #{msg}")
+        set_alert(msg, db) unless db.nil?
         push_dashboard_alert(msg, "WARNING", db)
       end
 
       def error(msg, db = nil)
-        stderr.puts("#{Time.now} ERROR: #{msg}")
-        push_dashboard_alert("#{msg}. Details at /var/log/eybackup.log.", "FAILURE", db)
+        stdout.puts("#{Time.now} ERROR: #{msg}")
+        set_alert(msg, db) unless db.nil?
+        push_dashboard_alert("#{msg} Details at /var/log/eybackup.log.", "FAILURE", db)
+      end
+      
+      def set_alert(msg, db)
+        fullPath = File.join(@status_path, "#{db}.alert")
+        File.open(fullPath, 'a') { |file| file.puts "#{Time.now}: #{msg}"}
+      end
+      
+      def clear_alert?(db)
+        begin
+          File.delete(File.join(@status_path, "#{db}.alert"))
+          true
+        rescue Errno::ENOENT
+          false
+        end
       end
             
       def exception(type, msg)
@@ -71,7 +103,7 @@ module EY
       end
       
       def debug(msg)
-        stderr.puts("#{Time.now} DEBUG: #{msg}")
+        stdout.puts("#{Time.now} DEBUG: #{msg}")
       end
 
     end

data/lib/ey_backup/processors/splitter.rb

@@ -5,7 +5,7 @@ module EY
       include Logging
 
       CHUNK_SIZE = 1024 * 64
-      MAX_FILE_SIZE = (4.5*1024*1024*1024).to_i #4.5GB
+      MAX_FILE_SIZE = (4.9*1024*1024*1024*1024).to_i #4.9TB
 
       def self.dump(file, split_size)
         split_size ||= MAX_FILE_SIZE

data/lib/ey_backup/spawner.rb

@@ -42,14 +42,11 @@ module EY
         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.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}"
+          dumperr = File.exists?("/tmp/eybackup.#{pid}.dumperr") ? File.read("/tmp/eybackup.#{pid}.dumperr") : "#{status}: #{stderr.read.chomp}: #{stdout.read.chomp}"
+          err_msg = "#{db} backup failed! The error returned was: #{dumperr}"
           error(err_msg, db)
         end
 

data/lib/ey_backup.rb

@@ -44,6 +44,7 @@ module EY
     class << self
       attr_accessor :logger
       attr_accessor :tmp_dir
+      attr_accessor :log_dir
     end
 
     def self.run(argv = ARGV)
@@ -96,11 +97,12 @@ module EY
         if @options[:db].nil? || @options[:db].empty?
           @options[:databases]
         else
-          [@options[:db]]
+          [@options[:db]].flatten
         end
       end
 
       def setup
+        setup_log_dir
         setup_logger
         setup_tmp_dir
         setup_backend
@@ -117,6 +119,7 @@ module EY
             EY::Backup.logger.set_verbose
           end
         end
+        EY::Backup.logger.set_log_path=EY::Backup.log_dir
       end
 
       def setup_tmp_dir
@@ -126,6 +129,14 @@ module EY
           EY::Backup.tmp_dir = "/mnt/tmp"
         end
       end
+      
+      def setup_log_dir
+        if @options[:log_dir]
+          EY::Backup.log_dir = @options[:log_dir]
+        else
+          EY::Backup.log_dir = "/var/log/engineyard/eybackup"
+        end
+      end
 
       def setup_backend
         @backend = Backend.new(@options[:aws_secret_id], @options[:aws_secret_key], @options[:region], @options[:backup_bucket])
@@ -136,7 +147,7 @@ module EY
         if ! @options.key?(:dbhost) or @options[:dbhost] == nil or @options[:dbhost] == ""
           @options[:dbhost] = 'localhost'
         end
-        @engine = engine_class.new(@options[:dbuser], @options[:dbpass], @options[:dbhost], @options[:key_id], @options[:force])
+        @engine = engine_class.new(@options[:dbuser], @options[:dbpass], @options[:dbhost], @options[:key_id], @options[:force], @options[:allow_concurrent], @options[:skip_analyze], @options[:log_coordinates])
       end
 
       def dispatch

data/lib/ey_cloud_server/version.rb

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

data/spec/config.yml.ci

@@ -0,0 +1,11 @@
+---
+tmp_dir:
+data_json:
+mysql_user: jenkins
+mysql_password: jenkins
+mysql_host: localhost
+postgresql_user: postgres
+postgresql_password: postgres
+postgresql_host: localhost
+aws_secret_id: 'abcd123.id'
+aws_secret_key: 'abcd123.key'

data/spec/ey_backup/backup_spec.rb

@@ -3,10 +3,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe EY::Backup do
   before(:each) do
     @db_name = create_mysql_database('first')
+    setup_dna({:db_stack_name => "mysql5_5"})
   end
   
   after(:each) do
     drop_mysql_database(@db_name)
+    teardown_dna
   end
 
   describe "#list" do

data/spec/ey_backup/cli_spec.rb

@@ -3,10 +3,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "MySQL Backups" do
   before(:each) do
     @db_name = create_mysql_database('first')
+    setup_dna({:db_stack_name => "mysql5_5"})
   end
   
   after(:each) do
     drop_mysql_database(@db_name)
+    teardown_dna
   end
 
   describe "--quiet" do

data/spec/ey_backup/mysql_backups_spec.rb

@@ -3,11 +3,13 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "MySQL Backups" do
   before(:each) do
     @db_name = create_mysql_database('first')
+    setup_dna({:db_stack_name => "mysql5_5"})
     mk_tmp
   end
   
   after(:each) do
     drop_mysql_database(@db_name)
+    teardown_dna
   end
 
   it "makes a backup" do
@@ -125,17 +127,37 @@ describe "MySQL Backups" do
     run_sql("SELECT * FROM `bar`;", @db_name).should be_true
     FileUtils.rm(file)
   end
+
+  it 'detects a backup failure due to an invalid view definition and reports it to stdout' do
+    
+    run_sql("CREATE TABLE `foo` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_truthy
+    run_sql("CREATE TABLE `bar` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_truthy
+    run_sql("CREATE view `vw_foobar` as select `foo`.`id` as `foo_id`, `bar`.`id` as `bar_id` from `foo` inner join `bar` on `foo`.`id` = `bar`.`id`;", @db_name).should be_truthy
+    run_sql("DROP TABLE `bar`;", @db_name).should be_truthy
+    
+    reset_logger
+    
+    EY::Backup.run(["-c", backup_config_file])
+    stdout.should match(/mysqldump: Couldn't execute 'SHOW FIELDS FROM `vw_foobar`'/)
+    
+    files = Dir["#{EY::Backup.tmp_dir}/*#{@db_name}*"]
+
+    files.size.should == 1
+    FileUtils.rm(files.first)  
+  end
 end
 
 describe "MySQL Backups" do
   before(:each) do
     @dbs = [create_mysql_database('first'), create_mysql_database('second')]
+    setup_dna({:db_stack_name => "mysql5_5"})
   end
   
   after(:each) do
     @dbs.each do |db|
       drop_mysql_database(db)
     end
+    teardown_dna
   end
 
   it "makes a backup" do
@@ -154,10 +176,12 @@ describe "a multi-region backup" do
   describe "in japan!" do
     before(:each) do
       @db_name = create_mysql_database('speaking_japanese', 'ap-northeast-1')
+      setup_dna({:db_stack_name => "mysql5_5"})
     end
     
     after(:each) do
       drop_mysql_database(@db_name)
+      teardown_dna
     end
 
     it "makes a split backup" do
@@ -193,10 +217,12 @@ describe "a multi-region backup" do
   describe "in europe!" do
     before(:each) do
       @db_name = create_mysql_database('speaking_esperanto', 'eu-west-1')
+      setup_dna({:db_stack_name => "mysql5_5"})
     end
     
     after(:each) do
       drop_mysql_database(@db_name)
+      teardown_dna
     end
 
     it "makes a split backup" do

data/spec/ey_backup/postgres_backups_spec.rb

@@ -3,10 +3,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Postgres Backups" do
   before(:each) do
     @db_name = create_postgresql_database('first')
+        setup_dna({:db_stack_name => "postgres9_5"})
   end
   
   after(:each) do
     drop_postgresql_database(@db_name)
+    teardown_dna
   end
 
   it "makes a custom format backup" do
@@ -18,6 +20,16 @@ describe "Postgres Backups" do
 
     stdout.should match(/0:#{@db_name}.*\.dump$/)
   end
+  
+  it "makes a custom backup and detects that the db is Postgres" do
+    EY::Backup.run(["-c", backup_config_file])
+
+    reset_logger
+
+    EY::Backup.run(["-c", backup_config_file, "-l", @db_name, "-e", "postgresql"])
+
+    stdout.should match(/0:#{@db_name}.*\.dump$/)
+  end
 
   it "makes a split backup" do
     EY::Backup.run(["-c", backup_config_file, "-e", "postgresql", "-s", "100"])

data/spec/helpers.rb

@@ -19,18 +19,28 @@ module Helpers
       @mock_environment_name => {:id => 1}
     }))
 
-    FileUtils.mkdir_p(tmp_dir)
-    Dir.glob("#{tmp_dir}/*").each do |f|
+    create_or_clean_dir(tmp_dir)
+    create_or_clean_dir(log_dir)
+
+    # FileUtils.mkdir_p(tmp_dir)
+    # FileUtils.mkdir_p(log_dir)
+    # Dir.glob("#{tmp_dir}/*").each do |f|
+    #   FileUtils.rm(f)
+    # end
+    stub_configs
+  end
+
+  def create_or_clean_dir(dir)
+    FileUtils.mkdir_p(dir)
+    Dir.glob("#{dir}/*").each do |f|
       FileUtils.rm(f)
     end
-
-    stub_configs
   end
 
   def stub_configs
     #print "in stub_configs: #{YAML::dump(@database_config)}, #{YAML::dump(spec_config)}\n"
     config = @database_config || spec_config
-    config = config.merge({ :tmp_dir => tmp_dir })
+    config = config.merge({ :tmp_dir => tmp_dir, :log_dir => log_dir })
     # print "in stub_configs2: #{YAML::dump(config)}\n"
     File.open(backup_config_file, "w") do |f|
       f.puts YAML.dump(config )
@@ -38,6 +48,9 @@ module Helpers
   end
 
   def import_gpg
+    # GPG v2.1+ dropped support for the --secret-keyring option (https://lists.gnupg.org/pipermail/gnupg-devel/2014-December/029296.html)
+    # This means that we need to import private keys too
+    system("gpg --import #{PRIVATE_KEY_PATH}") || raise("Could not import public key")
     system("gpg --import #{PUBLIC_KEY_PATH}") || raise("Could not import public key")
   end
 
@@ -55,7 +68,7 @@ module Helpers
     return File.read(PUBLIC_KEY_PATH), File.read(PRIVATE_KEY_PATH)
   end
 
-  def run_after
+  def run_after(skip_file_remove = false)
     FileUtils.rm_f(backup_config_file)
     filenames = Dir.glob("#{tmp_dir}/*")
     if filenames.any?
@@ -63,16 +76,17 @@ module Helpers
     end
   end
 
-  def teardown_dna(data)
-    FileUtils.rm_f("#{tmp_dir}/dna.json")
+  def teardown_dna()
+    FileUtils.rm_f("#{tmp_dir}/chef/dna.json")
+    FileUtils.rm_r("#{tmp_dir}/chef")
   end
 
   def setup_dna(data)
-    FileUtils.mkdir_p("#{tmp_dir}")
-    if File.exist?("#{tmp_dir}/dna.json")
-      FileUtils.rm("#{tmp_dir}/dna.json")
+    FileUtils.mkdir_p("#{tmp_dir}/chef")
+    if File.exist?("#{tmp_dir}/chef/dna.json")
+      FileUtils.rm("#{tmp_dir}/chef/dna.json")
     end
-    File.open("#{tmp_dir}/dna.json", "w") do |f|
+    File.open("#{tmp_dir}/chef/dna.json", "w") do |f|
       f.puts data.to_json
     end
   end
@@ -80,7 +94,7 @@ module Helpers
   def backup_config_file
     "#{tmp_dir}/spec_backups.yml"
   end
-  
+
   def mk_tmp
     FileUtils.mkdir_p("/tmp")
   end
@@ -102,7 +116,7 @@ module Helpers
     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}"
@@ -184,6 +198,14 @@ module Helpers
     end
   end
 
+  def log_dir
+    if spec_config['log_dir'].nil?
+      File.dirname(__FILE__) + "/log/"
+    else
+      spec_config['log_dir'] || File.dirname("./log/")
+    end
+  end
+
   def mysql_user
     spec_config['mysql_user'] || "root"
   end
@@ -281,5 +303,9 @@ module Helpers
     EY::Backup.logger.stdout.string
   end
 
+  def stderr
+    EY::Backup.logger.stderr.string
+  end
+
   load_spec_config
 end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require File.dirname(__FILE__) + "/../lib/ey-flex"
 
+require 'simplecov'
+SimpleCov.start
+
 require 'fakeweb'
 require 'fakefs/safe'
 require 'randexp'