eycap 0.5.15 → 0.5.16

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.16 / 2011-04-08
+  * Added improvement for postgres db:clone_to_local recipe.
+  * Added correct requirement and symlink changes for resque recipe.
+
 == 0.5.15 / 2011-04-08
   * Added mysql2 support for database clone recipes.
 

data/lib/eycap/recipes.rb

@@ -18,6 +18,7 @@ require 'eycap/recipes/apache'
 require 'eycap/recipes/bundler'
 require 'eycap/recipes/ssl'
 require 'eycap/recipes/delayed_job'
+require 'eycap/recipes/resque'
 
 Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty] = true if respond_to?(:default_run_options)

data/lib/eycap/recipes/database.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :db do
@@ -7,7 +9,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       backup_time = [now.year,now.month,now.day,now.hour,now.min,now.sec].join('-')
       set :backup_file, "#{shared_path}/db_backups/#{environment_database}-snapshot-#{backup_time}.sql"
     end
-  
+
     desc "Clone Production Database to Staging Database."
     task :clone_prod_to_staging, :roles => :db, :only => { :primary => true } do
 
@@ -30,7 +32,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       run "rm -f #{backup_file}.gz"
     end
-  
+
     desc "Backup your MySQL or PostgreSQL database to shared_path+/db_backups"
     task :dump, :roles => :db, :only => {:primary => true} do
       backup_name unless exists?(:backup_file)
@@ -40,7 +42,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       if ['mysql', 'mysql2'].include? @environment_info['adapter']
         dbhost = @environment_info['host']
         if rails_env == "production"
-          dbhost = environment_dbhost.sub('-master', '') + '-replica' if dbhost != 'localhost' # added for Solo offering, which uses localhost   
+          dbhost = environment_dbhost.sub('-master', '') + '-replica' if dbhost != 'localhost' # added for Solo offering, which uses localhost
         end
         run "mysqldump --add-drop-table -u #{dbuser} -h #{dbhost} -p #{environment_database} | gzip -c > #{backup_file}.gz" do |ch, stream, out |
            ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
@@ -51,21 +53,26 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
     end
-    
+
     desc "Sync your production database to your local workstation"
     task :clone_to_local, :roles => :db, :only => {:primary => true} do
       backup_name unless exists?(:backup_file)
       dump
       get "#{backup_file}.gz", "/tmp/#{application}.sql.gz"
-      development_info = YAML.load_file("config/database.yml")['development']
+      development_info = YAML.load(ERB.new(File.read('config/database.yml')).result)['development']
+
       if ['mysql', 'mysql2'].include? development_info['adapter']
         run_str = "gunzip < /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} --password='#{development_info['password']}' -h #{development_info['host']} #{development_info['database']}"
       else
-        run_str = "PGPASSWORD=#{development_info['password']} gunzip < /tmp/#{application}.sql.gz | psql -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}"
+        run_str  = ""
+        run_str += "PGPASSWORD=#{development_info['password']} " if development_info['password']
+        run_str += "gunzip < /tmp/#{application}.sql.gz | psql -U #{development_info['username']} "
+        run_str += "-h #{development_info['host']} "             if development_info['host']
+        run_str += development_info['database']
       end
       %x!#{run_str}!
       run "rm -f #{backup_file}.gz"
     end
   end
 
-end
+end

data/lib/eycap/recipes/resque.rb

@@ -11,7 +11,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :symlink, :roles => [:app], :only => {:resque => true} do
       run "if [ -f #{shared_path}/config/resque.yml ]; then ln -nfs #{shared_path}/config/resque.yml #{latest_release}/config/resque.yml; fi"
     end
-    after "deploy:update_code", "resque:symlink"
+    after "deploy:symlink_configs", "resque:symlink"
   end 
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eycap
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 5
-  - 15
-  version: 0.5.15
+  - 16
+  version: 0.5.16
 platform: ruby
 authors: 
 - Engine Yard