engineyard-eycap 0.3.11 → 0.4.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.0 / 2009-01-09
+  * add passenger:restart task
+  * add apache stop, start, restart and reload tasks
+  * Don't display database passwords in the logs, output, etc. use stdin instead
+
 == 0.3.11 / 2008-11-09
   * filtered_remote_cache uses svn switch
 

data/Manifest.txt

@@ -21,5 +21,7 @@ lib/eycap/recipes/solr.rb
 lib/eycap/recipes/sphinx.rb
 lib/eycap/recipes/templates/maintenance.rhtml
 lib/eycap/recipes/tomcat.rb
+lib/eycap/recipes/passenger.rb
+lib/eycap/recipes/apache.rb
 test/test_eycap.rb
 test/test_helper.rb

data/README.txt

@@ -17,7 +17,7 @@ Also included is a deployment strategy, :filtered_remote_cache, which speeds up
 
 == SOURCE:
  
-eycaps git repo is available on GitHub, which can be browsed at:
+eycap's git repo is available on GitHub, which can be browsed at:
  
   http://github.com/engineyard/eycap
    

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.new('eycap', Eycap::VERSION) do |p|
   p.email = 'tech@engineyard.com'
   p.summary = 'Capistrano tasks for Engine Yard slices'
   p.description = 'A bunch of useful recipes to help deployment to Engine Yard slices'
-  p.url = 'http://eycap.rubyforge.org'
+  p.url = 'http://github.com/engineyard/eycap/tree/master'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.extra_deps << ['capistrano', '>= 2.2.0']
 end

data/lib/eycap.rb

@@ -1,3 +1,3 @@
 module Eycap
-  VERSION = '0.3.11'
+  VERSION = '0.4.0'
 end

data/lib/eycap/recipes.rb

@@ -13,6 +13,8 @@ require 'eycap/recipes/solr'
 require 'eycap/recipes/monit'
 require 'eycap/recipes/tomcat'
 require 'eycap/recipes/juggernaut'
+require 'eycap/recipes/passenger'
+require 'eycap/recipes/apache'
 
 Capistrano::Configuration.instance(:must_exist).load do
   

data/lib/eycap/recipes/apache.rb

@@ -0,0 +1,10 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :apache do
+    [:stop, :start, :restart, :reload].each do |action|
+      desc "#{action.to_s.capitalize} Apache"
+      task action, :roles => :web do
+        sudo "/etc/init.d/apache2 #{action.to_s}"
+      end
+    end
+  end
+end

data/lib/eycap/recipes/database.rb

@@ -14,11 +14,19 @@ Capistrano::Configuration.instance(:must_exist).load do
       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 @environment_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}"
+        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
       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}"
+        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:/
+        end
+        run "psql -W -U #{dbuser} -h #{staging_dbhost} -f #{backup_file} #{staging_database}" do |ch, stream, out|
+           ch.send_data "#{dbpass}\n" if out=~ /^Password:/
+        end
       end
       run "rm -f #{backup_file}"
     end
@@ -28,9 +36,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       backup_name
       run("cat #{shared_path}/config/database.yml") { |channel, stream, data| @environment_info = YAML.load(data)[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"
+        run "mysqldump --add-drop-table -u #{dbuser} -h #{environment_dbhost.gsub('-master', '-replica')} -p #{environment_database} | bzip2 -c > #{backup_file}.bz2" do |ch, stream, out |
+           ch.send_data "#{dbpass}\n" if out=~ /^Enter password:/
+        end
       else
-        run "PGPASSWORD=#{dbpass} pg_dump -c -U #{dbuser} -h #{environment_dbhost} #{environment_database} | bzip2 -c > #{backup_file}.bz2"
+        run "pg_dump -W -c -U #{dbuser} -h #{environment_dbhost} #{environment_database} | bzip2 -c > #{backup_file}.bz2" do |ch, stream, out |
+           ch.send_data "#{dbpass}\n" if out=~ /^Password:/
+        end
       end
     end
     
@@ -41,11 +53,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       get "#{backup_file}.bz2", "/tmp/#{application}.sql.gz"
       development_info = YAML.load_file("config/database.yml")['development']
       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']}"
+        run "bzcat /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} -p -h #{development_info['host']} #{development_info['database']}" do |ch, stream, out |
+          ch.send_data "#{development_info['password']}\n" if out=~ /Enter password:/
+        end
       else
-        run_str = "PGPASSWORD=#{development_info['password']} bzcat /tmp/#{application}.sql.gz | psql -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}"
+        run "bzcat /tmp/#{application}.sql.gz | psql -W -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}" do |ch, stream, out |
+           ch.send_data "#{development_info['password']}\n" if out=~ /^Password:/
+        end
       end
-      %x!#{run_str}!
     end
   end
 

data/lib/eycap/recipes/passenger.rb

@@ -0,0 +1,10 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :passenger do
+    desc <<-DESC
+    Restart the passenger module to reload the application after deploying.
+    DESC
+    task :restart, :roles => [:app], :except => {:no_release => true} do
+      sudo "touch #{current_path}/tmp/restart.txt"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-eycap
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors: 
 - Engine Yard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 -07:00
+date: 2009-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,15 +59,17 @@ files:
 - lib/eycap/recipes/mongrel.rb
 - lib/eycap/recipes/monit.rb
 - lib/eycap/recipes/nginx.rb
+- lib/eycap/recipes/passenger.rb
 - lib/eycap/recipes/slice.rb
 - lib/eycap/recipes/solr.rb
 - lib/eycap/recipes/sphinx.rb
 - lib/eycap/recipes/templates/maintenance.rhtml
 - lib/eycap/recipes/tomcat.rb
+- lib/eycap/recipes/apache.rb
 - test/test_eycap.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://eycap.rubyforge.org
+homepage: http://github.com/engineyard/eycap/tree/master
 post_install_message: 
 rdoc_options: 
 - --main