brightbox 2.0.1 → 2.0.2

data/lib/brightbox/recipes/deploy.rb

@@ -31,12 +31,35 @@ namespace :deploy do
   end
   depend :remote, :command, monit_command
 
-  #Override start, stop and restart so that they use Monit to restart the
+  def mongrel_cluster_command(event)
+    "#{mongrel_command} cluster::#{event} -C #{mongrel_config_file}" <<
+    if event == "status"
+      ""
+    else
+      " --clean"
+    end
+  end
+
+  def monitor_cluster_command(event)
+    case event
+    when "start","restart"
+      "#{monit_command} -g #{application} monitor all"
+    when "stop"
+      "#{monit_command} -g #{application} unmonitor all"
+    else
+      nil 
+    end
+  end
+
+  #Override start, stop and restart so that they use mongrel to restart the
   #application servers
-  %W(start stop restart status).each do |event|
+  %w(start stop restart status).each do |event|
     desc "Ask mongrel to #{event} your application."
     task event, :roles => :app, :except => {:no_release => true } do
-      try_sudo "#{mongrel_command} cluster::#{event} -C #{mongrel_config_file} --clean"
+      try_sudo mongrel_cluster_command(event)
+      if cmd = monitor_cluster_command(event)
+        sudo cmd
+      end
     end
   end
 

data/lib/brightbox/recipes/helpers.rb

@@ -23,7 +23,7 @@ def rake_task(taskname)
   rake_env = fetch(:rake_env, "")
   directory = current_release 
 
-  "cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{rake_env} #{taskname}"
+  %Q{sh -c 'cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{rake_env} #{taskname}'}
 end
 
 def on_one_line(cmd_list)

data/lib/brightbox/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - John Leach
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 +01:00
+date: 2008-06-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency