engineyard-eycap 0.4.3 → 0.4.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.4 / 2009-03-03
+  * happy square root day!
+  * fixed the *correct* database.rb file for the db:clone_prod_to_staging
+
 == 0.4.3 / 2009-02-11
   * updated db:dump command for Engine Yard Solo offering, fixing a bug where 
   the dbname wasn't included.

data/lib/eycap/recipes/database.rb

@@ -13,32 +13,18 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       # This task currently runs only on traditional EY offerings.
       # You need to have both a production and staging environment defined in 
-      # your deploy.rb file.
+      # your deploy.rb file.  
 
       backup_name
       on_rollback { run "rm -f #{backup_file}" }
-      run("cat #{shared_path}/config/database.yml") { |channel, stream, data| @environment_info = YAML.load(data)[rails_env] }
-
-      # If the production db hostname has a trailing -master string, substitute
-      # it with -replica.
-      # Elsif the production db hostname doesn't have a trailing -master, just
-      # append -replica.
-      # Else you're using PostgreSQL and we'll dump it that way.      
+      run("cat #{shared_path}/config/database.yml") { |channel, stream, data| @environment_info = YAML.load(data)[rails_env] }  
 
-      if @environment_info['adapter'] == 'mysql' && production_dbhost.scan('-master') == true
-        run "mysqldump --add-drop-table -u #{dbuser} -h #{production_dbhost.gsub('-master', '-replica')} #{production_database} -p > #{backup_file}" do |ch, stream, out|
-           ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
-        end
-        run "mysql -u #{dbuser} -p -h #{staging_dbhost} #{staging_database} < #{backup_file}" do |ch, stream, out|
-           ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
-        end
-      elsif @environment_info['adapter'] == 'mysql' && production_dbhost.scan('-master') != true
-        run "mysqldump --add-drop-table -u #{dbuser} -h #{production_dbhost + '-replica'} #{production_database} -p > #{backup_file}" do |ch, stream, out|
+      if @environment_info['adapter'] == 'mysql'
+        dbhost = @environment_info['host']
+        dbhost = environment_dbhost.sub('-master', '') + '-replica' if dbhost != 'localhost' # added for Solo offering, which uses localhost
+        run "mysqldump --add-drop-table -u #{dbuser} -h #{dbhost} -p #{environment_database} | bzip2 -c > #{backup_file}.bz2" do |ch, stream, out |
            ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
         end
-        run "mysql -u #{dbuser} -p -h #{staging_dbhost} #{staging_database} < #{backup_file}" do |ch, stream, out|
-           ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
-        end   
       else
         run "pg_dump -W -c -U #{dbuser} -h #{production_dbhost} -f #{backup_file} #{production_database}" do |ch, stream, out|
            ch.send_data "#{dbpass}\n" if out=~ /^Password:/

data/lib/eycap.rb

@@ -1,3 +1,3 @@
 module Eycap
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-eycap
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Engine Yard