Merge branch 'update_gemfile' into rails-3-develop

3 files changed, 15 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index 517838b2b..e05b3e622 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,6 @@ gem 'pg'
 
 # New gem releases aren't being done. master is newer and supports Rails > 3.0
 gem 'acts_as_versioned', :git => 'git://github.com/technoweenie/acts_as_versioned.git'
-gem 'capistrano'
 gem 'charlock_holmes'
 gem 'dynamic_form'
 gem 'exception_notification'
@@ -27,11 +26,9 @@ gem 'mahoro'
 gem 'memcache-client'
 gem 'net-http-local', :platforms => [:ruby_18, :ruby_19]
 gem 'net-purge'
-gem 'newrelic_rpm'
 gem 'rack'
 gem 'rake', '0.9.2.2'
 gem 'rails-i18n'
-gem 'rdoc'
 gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
 # :require avoids "already initialized constant" warnings
 gem 'rmagick', :require => 'RMagick'
@@ -65,6 +62,10 @@ group :assets do
   gem 'therubyracer'
 end
 
+group :production do
+  gem 'newrelic_rpm'
+end
+
 group :test do
   gem 'fakeweb'
   gem 'coveralls', :require => false
@@ -72,18 +73,21 @@ group :test do
   gem 'nokogiri'
 end
 
+group :test, :development do
+  gem 'factory_girl_rails', '~> 1.7'
+  gem 'rspec-rails'
+  gem 'spork-rails'
+end
+
 group :development do
+  gem 'capistrano'
   gem 'mailcatcher'
+  gem 'rdoc'
 end
 
-group :develop do
+group :debug do
   gem 'ruby-debug', :platforms => :ruby_18
   gem 'debugger', :platforms => :ruby_19
   gem 'annotate'
 end
 
-group :test, :development do
-  gem 'factory_girl_rails', '~> 1.7'
-  gem 'rspec-rails'
-  gem 'spork-rails'
-end
diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down
index a5f0d7af0..42284b00d 100755
--- a/script/rails-deploy-before-down
+++ b/script/rails-deploy-before-down
@@ -129,7 +129,7 @@ bundle_install_options="--path $BUNDLE_PATH"
 
 if [ "$OPTION_STAGING_SITE" = "0" ]
 then
-    bundle_install_options="$bundle_install_options --without development:test --deployment"
+    bundle_install_options="$bundle_install_options --without development debug test --deployment"
 fi
 if [ "$OPTION_STAGING_SITE" = "1" ]
 then
diff --git a/script/wad b/script/wad
index e459ba2e2..658ce37ef 100755
--- a/script/wad
+++ b/script/wad
@@ -406,7 +406,7 @@ class Wad
 
   def install_bundle
     log "Installing bundle"
-    system("bundle install --path .bundle --without='development production'")
+    system("bundle install --path .bundle --without='debug development production'")
   end
 
   def setup