Refactor memcache connection handling

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index bcdbc75c90a61ff08e6d2d6683b22506973794cf..c6654cce2f55e5ea77ce3a7ca482cd6a9269ae16 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,26 +1,54 @@
+# Gem source to use

 source 'http://rubygems.org'
 
 source 'http://rubygems.org'
 

-gem 'rails', '3.0.3'
+# Require rails
+gem 'rails', '3.2.1'

 
 

+# Require the postgres database driver

 gem 'pg'
 gem 'pg'

+
+# Load jquery support
+gem 'jquery-rails'
+
+# Load rails plugins
+gem 'rails-i18n-updater'
+gem 'dynamic_form'
+gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
+gem 'oauth-plugin', '>= 0.4.0.pre7'
+gem 'open_id_authentication', '>= 1.1.0'
+gem 'validates_email_format_of', '>= 1.5.1'
+gem 'composite_primary_keys', '>= 5.0.0'
+gem 'http_accept_language', '>= 1.0.2'
+gem 'paperclip', '~> 2.0'
+gem 'deadlock_retry', '>= 1.2.0'
+
+# Character conversion support for ruby 1.8
+gem 'iconv', :platforms => :ruby_18
+
+# Load libxml support for XML parsing and generation

 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'

-gem 'rmagick', :require => 'RMagick'
-gem 'oauth', '>= 0.4.3'
-gem 'oauth-plugin', '> 0.3.14'
-gem 'httpclient'
-gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
+
+# Load HTML sanitizer

 gem 'sanitize'
 gem 'sanitize'

-gem 'rails-i18n-updater'

 
 

-# Should only load if memcache is in use
-gem 'memcached'
+# Load SystemTimer for implementing request timeouts
+gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
+
+# Load httpclient for SOAP support for Quova GeoIP queries
+gem 'httpclient'

 
 

-# Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '>= 3.0.0.b3'
+# Load memcache in case we are using it
+gem 'memcached', '>= 1.4.1'

 
 

-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-group :development, :test do
+# Gems needed for running tests
+group :test do

   gem 'timecop'
 end
   gem 'timecop'
 end

+
+# Gems needed for compiling assets
+group :assets do
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
+  gem 'therubyracer'
+end