upgrade to new gems + remove hosting modules + change settings for Rails 3.1 + move assets to app/assets

Gemfile

@@ -1,55 +1,58 @@
-source :rubygems
+source 'http://rubygems.org'
 
 # add in all the runtime dependencies
 
-gem 'rake', '0.9.2'
+gem 'rake',                 '0.9.2'
 
-gem 'rails', '3.0.10'
+gem 'rails',                '~> 3.1.1'
 
-gem 'warden'
-gem 'devise', '1.3.4'
-gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable'
+gem 'devise',               '~> 1.4.9'
+gem 'cancan',               '~> 1.6.7'
 
-gem 'mongoid', '~> 2.0.2'
-gem 'bson_ext', '~> 1.4.0'
+gem 'mongoid',              '~> 2.3.2'
+gem 'bson_ext',             '~> 1.3.1'
 gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
-gem 'will_paginate', '~> 3.0.0'
+gem 'custom_fields',        '~> 1.1.0.rc1'
+gem 'will_paginate',        '~> 3.0.2'
 
-gem 'haml', '3.1.2'
-gem 'sass', '3.1.2'
-gem 'locomotive_liquid', '2.2.2', :require => 'liquid'
-gem 'formtastic', '~> 1.2.3'
-gem 'inherited_resources', '~> 1.1.2'
+gem 'haml',                 '~> 3.1.3'
+gem 'sass-rails',           '~> 3.1.4'
+gem "compass",              :git => 'git://github.com/chriseppstein/compass.git', :branch => 'rails31'
+gem 'coffee-script',        '~> 2.2.0'
+gem 'uglifier',             '~> 1.0.4'
+gem 'jquery-rails',         '~> 1.0.16'
+gem 'rails-backbone',       '0.5.4'
+gem 'handlebars-rails',     :git => 'git://github.com/yabawock/handlebars-rails.git'
 
-gem 'rmagick', '2.12.2', :require => 'RMagick'
-gem 'carrierwave', '0.5.6'
-gem 'dragonfly',  '~> 0.9.1'
-gem 'rack-cache', :require => 'rack/cache'
+gem 'locomotive_liquid',    '2.2.2', :require => 'liquid'
+gem 'formtastic',           '~> 1.2.3' # TODO: UPGRADE IT
+gem 'inherited_resources',  '~> 1.3.0'
+gem 'cells',                '~> 3.7.0'
+gem 'RedCloth',             '~> 4.2.8'
+gem 'sanitize',             '~> 2.0.3'
+gem 'highline',             '~> 1.6.2'
 
-gem 'custom_fields', '1.0.0.beta.25'
-gem 'cancan'
-gem 'fog', '0.8.2'
-gem 'mimetype-fu'
-gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
-gem 'heroku', '1.19.1'
-gem 'httparty', '0.7.8'
-gem 'RedCloth', '4.2.8'
-gem 'delayed_job', '2.1.4'
-gem 'delayed_job_mongoid', '1.0.2'
+gem 'rmagick',              '2.12.2', :require => 'RMagick'
+gem 'carrierwave-mongoid',  '~> 0.1.3'
+gem 'fog',                  '~> 1.0.0'
+gem 'dragonfly',            '~> 0.9.8'
+gem 'rack-cache',           '~> 1.1', :require => 'rack/cache'
+gem 'mimetype-fu',          '~> 0.1.2'
 gem 'rubyzip'
-gem 'locomotive_jammit-s3', :require => 'jammit-s3'
-gem 'SystemTimer', :platforms => :ruby_18
-gem 'cells'
-gem 'sanitize'
-gem 'highline'
+
+gem 'actionmailer-with-request', '~> 0.3.0', :require => 'actionmailer_with_request'
+gem 'httparty',             '~> 0.8.1'
+gem 'delayed_job',          '~> 3.0.0.pre2'
+gem 'delayed_job_mongoid',  '~> 1.0.4'
+gem 'SystemTimer',          :platforms => :ruby_18
+
+
 
 # The rest of the dependencies are for use when in the locomotive dev environment
 
 group :development do
   gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
-
   gem 'rspec-rails', '2.6.1' # in order to have rspec tasks and generators
-
   gem 'rspec-cells'
 end
 
@@ -57,9 +60,6 @@ group :test, :development do
   gem 'linecache', '0.43', :platforms => :mri_18
   gem 'ruby-debug', :platforms => :mri_18
   gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug'
-
-  gem 'bushido_stub', '0.0.3'
-
   gem 'cucumber-rails'
 end