From 1764aa94a5a25337f794cadf73ceb4702186dcad Mon Sep 17 00:00:00 2001
From: Jeremy Bopp <jeremy@bopp.net>
Date: Mon, 16 Apr 2012 09:26:06 -0500
Subject: [PATCH] Load the correct Rails environment based on operation
 requested

---
 config/environments/add_project.rb | 4 ++--
 cruise                             | 4 ++--
 lib/cruise_control/init.rb         | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/environments/add_project.rb b/config/environments/add_project.rb
index 7d367130..fb1fdf9e 100644
--- a/config/environments/add_project.rb
+++ b/config/environments/add_project.rb
@@ -1,8 +1,8 @@
-CruiseControl::Application.configure do |config|
+CruiseControl::Application.configure do
   config.active_support.deprecation = :notify
   
   # No special settings required
   config.after_initialize do
     CruiseControl.require_site_config_if_needed
   end
-end
\ No newline at end of file
+end
diff --git a/cruise b/cruise
index d593f975..2a6bc273 100755
--- a/cruise
+++ b/cruise
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-ENV["RAILS_ENV"] = "production"
+#ENV["RAILS_ENV"] ||= "production"
 ENV_PATH = File.expand_path("../config/environment", __FILE__)
 
 require File.expand_path("../config/boot", __FILE__)
 require File.expand_path("../lib/cruise_control/init", __FILE__)
 require File.expand_path('../lib/cruise_control/version', __FILE__)
 
-CruiseControl::Init.new.run
\ No newline at end of file
+CruiseControl::Init.new.run
diff --git a/lib/cruise_control/init.rb b/lib/cruise_control/init.rb
index 82c07274..106c2fde 100644
--- a/lib/cruise_control/init.rb
+++ b/lib/cruise_control/init.rb
@@ -29,6 +29,7 @@ def method_for_command(command)
     end
   
     def start
+      ENV["RAILS_ENV"] ||= "production"
       require ENV_PATH
 
       unless ARGV.include?('-p') || ARGV.include?('--port')
@@ -62,6 +63,7 @@ def start
     end
 
     def stop
+      ENV["RAILS_ENV"] ||= "production"
       require ENV_PATH
 
       stop_builders
@@ -84,6 +86,7 @@ def stop_builders
     end
 
     def add
+      ENV["RAILS_ENV"] = "add_project"
       require ENV_PATH
       load File.join(File.dirname(__FILE__), '..', '..', 'script', 'add_project')
     end
@@ -130,4 +133,4 @@ def help
     end
   
   end
-end
\ No newline at end of file
+end