engineyard-eycap 0.3.7 → 0.3.8

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.8 / 2008-09-22
+  * add PostgreSQL support to the database.rb recipe.
+
 == 0.3.7 / 2008-08-23
   * fix from customer for filtered_remote_cache to just use plain grep.
 

data/lib/eycap/recipes/backgroundrb.rb

@@ -2,20 +2,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :bdrb do
     desc "After update_code you want to reindex"
-    task :reindex, :roles => :app, :only => {:backgroundrb => true} do
+    task :reindex, :roles => [:app, :backgroundrb], :only => {:backgroundrb => true} do
       run "/engineyard/bin/searchd #{application} reindex"
     end
   
     desc "Start Backgroundrb"
-    task :start, :roles => :app, :only => {:backgroundrb => true} do
+    task :start, :roles => [:app, :backgroundrb], :only => {:backgroundrb => true} do
       sudo "/usr/bin/monit start all -g backgroundrb_#{application}"
     end
     desc "Stop Backgroundrb"
-    task :stop, :roles => :app, :only => {:backgroundrb => true} do
+    task :stop, :roles => [:app, :backgroundrb], :only => {:backgroundrb => true} do
       sudo "/usr/bin/monit stop all -g backgroundrb_#{application}"
     end
     desc "Restart Backgroundrb"
-    task :restart, :roles => :app, :only => {:backgroundrb => true} do
+    task :restart, :roles => [:app, :backgroundrb], :only => {:backgroundrb => true} do
       sudo "/usr/bin/monit restart all -g backgroundrb_#{application}"
     end        
   end

data/lib/eycap/recipes/database.rb

@@ -12,15 +12,26 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :clone_prod_to_staging, :roles => :db, :only => { :primary => true } do
       backup_name
       on_rollback { run "rm -f #{backup_file}" }
-      run "mysqldump --add-drop-table -u #{dbuser} -h #{production_dbhost.gsub('-master', '-replica')} -p#{dbpass} #{production_database} > #{backup_file}"
-      run "mysql -u #{dbuser} -p#{dbpass} -h #{staging_dbhost} #{staging_database} < #{backup_file}"
+      prod_info = YAML.load_file("config/database.yml")["production"]
+      if prod_info['adapter'] == 'mysql'
+        run "mysqldump --add-drop-table -u #{dbuser} -h #{production_dbhost.gsub('-master', '-replica')} -p#{dbpass} #{production_database} > #{backup_file}"
+        run "mysql -u #{dbuser} -p#{dbpass} -h #{staging_dbhost} #{staging_database} < #{backup_file}"
+      else
+        run "PGPASSWORD=#{dbpass} pg_dump -c -U #{dbuser} -h #{production_dbhost} -f #{backup_file} #{production_database}"
+        run "PGPASSWORD=#{dbpass} psql -U #{dbuser} -h #{staging_dbhost} -f #{backup_file} #{staging_database}"
+      end
       run "rm -f #{backup_file}"
     end
   
-    desc "Backup your database to shared_path+/db_backups"
+    desc "Backup your MySQL or PostgreSQL database to shared_path+/db_backups"
     task :dump, :roles => :db, :only => {:primary => true} do
       backup_name
-      run "mysqldump --add-drop-table -u #{dbuser} -h #{environment_dbhost.gsub('-master', '-replica')} -p#{dbpass} #{environment_database} | bzip2 -c > #{backup_file}.bz2"
+      environment_info = YAML.load_file("config/database.yml")[rails_env]
+      if environment_info['adapter'] == 'mysql'
+        run "mysqldump --add-drop-table -u #{dbuser} -h #{environment_dbhost.gsub('-master', '-replica')} -p#{dbpass} #{environment_database} | bzip2 -c > #{backup_file}.bz2"
+      else
+        run "PGPASSWORD=#{dbpass} pg_dump -c -U #{dbuser} -h #{environment_dbhost} #{environment_database} | bzip2 -c > #{backup_file}.bz2"
+      end
     end
     
     desc "Sync your production database to your local workstation"
@@ -29,7 +40,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       dump
       get "#{backup_file}.bz2", "/tmp/#{application}.sql.gz"
       development_info = YAML.load_file("config/database.yml")['development']
-      run_str = "bzcat /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} -p#{development_info['password']} -h #{development_info['host']} #{development_info['database']}"
+      if development_info['adapter'] == 'mysql'
+        run_str = "bzcat /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} -p#{development_info['password']} -h #{development_info['host']} #{development_info['database']}"
+      else
+        run_str = "PGPASSWORD=#{development_info['password']} bzcat /tmp/#{application}.sql.gz | psql -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}"
+      end
       %x!#{run_str}!
     end
   end

data/lib/eycap/recipes/ferret.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :ferret do
     desc "After update_code you want to symlink the index and ferret_server.yml file into place"
-    task :symlink_configs, :roles => :app, :except => {:no_release => true} do
+    task :symlink_configs, :roles => [:app, :ferret], :except => {:no_release => true, :ferret => false} do
       run <<-CMD
         cd #{latest_release} &&
         ln -nfs #{shared_path}/config/ferret_server.yml #{latest_release}/config/ferret_server.yml &&
@@ -12,7 +12,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     [:start,:stop,:restart].each do |op|
       desc "#{op} ferret server"
-      task op, :roles => :app, :except => {:no_release => true} do
+      task op, :roles => [:app, :ferret], :except => {:no_release => true, :ferret => false} do
         sudo "/usr/bin/monit #{op} all -g ferret_#{application}"
       end
     end

data/lib/eycap/recipes/juggernaut.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :juggernaut do
     desc "After update_code you want to symlink the juggernaut.yml file into place"
-    task :symlink_configs, :roles => :app, :except => {:no_release => true} do
+    task :symlink_configs, :roles => [:app, :juggernaut], :except => {:no_release => true, :juggernaut => false} do
       run <<-CMD
         cd #{latest_release} &&
         ln -nfs #{shared_path}/config/juggernaut.yml #{latest_release}/config/juggernaut.yml &&
@@ -11,7 +11,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
     [:start,:stop,:restart].each do |op|
       desc "#{op} juggernaut server"
-      task op, :roles => :app, :except => {:no_release => true} do
+      task op, :roles => [:app, :juggernaut], :except => {:no_release => true, :juggernaut => false} do
         sudo "/usr/bin/monit #{op} all -g juggernaut_#{application}"
       end
     end

data/lib/eycap/recipes/memcached.rb

@@ -1,19 +1,19 @@
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :memcached do 
     desc "Start memcached"
-    task :start, :roles => :app, :only => {:memcached => true} do
+    task :start, :roles => [:app, :memcached], :only => {:memcached => true} do
       sudo "/etc/init.d/memcached start"
     end
     desc "Stop memcached"
-    task :stop, :roles => :app, :only => {:memcached => true} do
+    task :stop, :roles => [:app, :memcached], :only => {:memcached => true} do
       sudo "/etc/init.d/memcached stop"
     end
     desc "Restart memcached"
-    task :restart, :roles => :app, :only => {:memcached => true} do
+    task :restart, :roles => [:app, :memcached], :only => {:memcached => true} do
       sudo "/etc/init.d/memcached restart"
     end        
     desc "Symlink the memcached.yml file into place if it exists"
-    task :symlink_configs, :roles => :app, :only => {:memcached => true }, :except => { :no_release => true } do
+    task :symlink_configs, :roles => [:app, :memcached], :only => {:memcached => true }, :except => { :no_release => true } do
       run "if [ -f #{shared_path}/config/memcached.yml ]; then ln -nfs #{shared_path}/config/memcached.yml #{latest_release}/config/memcached.yml; fi"
     end
   end

data/lib/eycap/recipes/mongrel.rb

@@ -4,7 +4,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     Start Mongrel processes on the app server.  This uses the :use_sudo variable to determine whether to use sudo or not. By default, :use_sudo is
     set to true.
     DESC
-    task :start, :roles => :app do
+    task :start, :roles => [:app, :mongrel], :except => {:mongrel => false} do
       sudo "/usr/bin/monit start all -g #{monit_group}"
     end
 
@@ -12,7 +12,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     Restart the Mongrel processes on the app server by starting and stopping the cluster. This uses the :use_sudo
     variable to determine whether to use sudo or not. By default, :use_sudo is set to true.
     DESC
-    task :restart, :roles => :app do
+    task :restart, :roles => [:app, :mongrel], :except => {:mongrel => false} do
       sudo "/usr/bin/monit restart all -g #{monit_group}"
     end
 
@@ -21,7 +21,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     variable to determine whether to use sudo or not. By default, :use_sudo is
     set to true.
     DESC
-    task :stop, :roles => :app do
+    task :stop, :roles => [:app, :mongrel], :except => {:mongrel => false} do
       sudo "/usr/bin/monit stop all -g #{monit_group}"
     end
   end

data/lib/eycap/recipes/solr.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :solr do
     desc "After update_code you want to symlink the index and ferret_server.yml file into place"
-    task :symlink_configs, :roles => :app, :except => {:no_release => true} do
+    task :symlink_configs, :roles => [:app, :solr], :except => {:no_release => true} do
       run <<-CMD
         cd #{latest_release} && ln -nfs #{shared_path}/config/solr.yml #{latest_release}/config/solr.yml
       CMD
@@ -10,14 +10,14 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     [:start,:stop,:restart].each do |op|
       desc "#{op} ferret server"
-      task op, :roles => :app, :only => {:solr => true} do
+      task op, :roles => [:app, :solr], :only => {:solr => true} do
         sudo "/usr/bin/monit #{op} all -g solr_#{application}"
       end
     end
     
     namespace :tail do
       desc "Tail the Solr logs this environment"
-      task :logs, :roles => :app, :only => {:solr => true} do
+      task :logs, :roles => [:app, :solr], :only => {:solr => true} do
         run "tail -f /var/log/engineyard/solr/#{application}.log" do |channel, stream, data|
           puts  # for an extra line break before the host name
           puts "#{channel[:server]} -> #{data}" 
@@ -25,7 +25,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
       desc "Tail the Solr error logs this environment"
-      task :errors, :roles => :app, :only => {:solr => true} do
+      task :errors, :roles => [:app, :solr], :only => {:solr => true} do
         run "tail -f /var/log/engineyard/solr/#{application}.err.log" do |channel, stream, data|
           puts  # for an extra line break before the host name
           puts "#{channel[:server]} -> #{data}" 

data/lib/eycap/recipes/sphinx.rb

@@ -2,28 +2,28 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :sphinx do
     desc "After update_code you want to configure, then reindex"
-    task :configure, :roles => :app, :only => {:sphinx => true}, :except => {:no_release => true} do
+    task :configure, :roles => [:app, :sphinx], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "/engineyard/bin/searchd #{application} configure"
     end
 
     desc "After configure you want to reindex"
-    task :reindex, :roles => :app, :only => {:sphinx => true} do
+    task :reindex, :roles => [:app, :sphinx], :only => {:sphinx => true} do
       run "/engineyard/bin/searchd #{application} reindex"
     end
       
     desc "Start Sphinx Searchd"
-    task :start, :roles => :app, :only => {:sphinx => true} do
+    task :start, :roles => [:app, :sphinx], :only => {:sphinx => true} do
       sudo "/usr/bin/monit start all -g sphinx_#{application}"
     end
     desc "Stop Sphinx Searchd"
-    task :stop, :roles => :app, :only => {:sphinx => true} do
+    task :stop, :roles => [:app, :sphinx], :only => {:sphinx => true} do
       sudo "/usr/bin/monit stop all -g sphinx_#{application}"
     end
     desc "Restart Sphinx Searchd"
-    task :restart, :roles => :app, :only => {:sphinx => true} do
+    task :restart, :roles => [:app, :sphinx], :only => {:sphinx => true} do
       sudo "/usr/bin/monit restart all -g sphinx_#{application}"
     end        
-    task :symlink, :roles => :app, :only => {:sphinx => true}, :except => {:no_release => true} do
+    task :symlink, :roles => [:app, :sphinx], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/ultrasphinx ]; then mv #{latest_release}/config/ultrasphinx #{latest_release}/config/ultrasphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/ultrasphinx #{latest_release}/config/ultrasphinx"
     end
@@ -32,7 +32,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   namespace :thinking_sphinx do
     desc "Symlink the thinking sphinx config file and directory"
-    task :symlink, :roles => :app, :only => {:sphinx => true}, :except => {:no_release => true} do
+    task :symlink, :roles => [:app, :sphinx], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/thinkingsphinx ]; then mv #{latest_release}/config/thinkingsphinx #{latest_release}/config/thinkingsphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/thinkingsphinx #{latest_release}/config/thinkingsphinx"
       run "ln -nfs #{shared_path}/config/sphinx.yml #{latest_release}/config/sphinx.yml"

data/lib/eycap/recipes/tomcat.rb

@@ -1,15 +1,15 @@
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :tomcat do 
     desc "Start tomcat"
-    task :start, :roles => :app, :only => {:tomcat => true} do
+    task :start, :roles => [:app, :tomcat], :only => {:tomcat => true} do
       sudo "/etc/init.d/tomcat start"
     end
     desc "Stop tomcat"
-    task :stop, :roles => :app, :only => {:tomcat => true} do
+    task :stop, :roles => [:app, :tomcat], :only => {:tomcat => true} do
       sudo "/etc/init.d/tomcat stop"
     end
     desc "Restart tomcat"
-    task :restart, :roles => :app, :only => {:tomcat => true} do
+    task :restart, :roles => [:app, :tomcat], :only => {:tomcat => true} do
       sudo "/etc/init.d/tomcat restart"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-eycap
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Engine Yard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 -07:00
+date: 2008-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency