engineyard-eycap 0.4.10 → 0.4.11

data/History.txt

@@ -1,4 +1,8 @@
-== 0.4.9 / 2009-06-24
+== 0.4.11 / 2009-06-25
+  * changed nginx start and restart to give output to cap
+  * fixed db:clone_to_local task
+
+== 0.4.10 / 2009-06-24
   * using nohup on nginx start and restart
 
 == 0.4.9 / 2009-06-22

data/lib/eycap/recipes/database.rb

@@ -63,14 +63,11 @@ 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 "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
+        run_str = "bzcat /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} --password='#{development_info['password']}' -h #{development_info['host']} #{development_info['database']}"
       else
-        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
+        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/nginx.rb

@@ -3,12 +3,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :nginx do 
     desc "Start Nginx on the app slices."
     task :start, :roles => :app do
-      sudo "nohup /etc/init.d/nginx start > /dev/null"
+      sudo "nohup /etc/init.d/nginx start 2>&1 | cat"
     end
 
     desc "Restart the Nginx processes on the app slices."
     task :restart , :roles => :app do
-      sudo "nohup /etc/init.d/nginx restart > /dev/null"
+      sudo "nohup /etc/init.d/nginx restart 2>&1 | cat"
     end
 
     desc "Stop the Nginx processes on the app slices."

data/lib/eycap.rb

@@ -1,3 +1,3 @@
 module Eycap
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

metadata

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