Rails 3.1 Upgrade

.rvmrc

@@ -4,22 +4,35 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@roomies"
+environment_id="ruby-1.9.2-p290@roomies"
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
 
 #
 # First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficicent compared to running through the entire
+# file. This is very fast and efficient compared to running through the entire
 # CLI and selector. If you want feedback on which environment was used then
 # insert the word 'use' after --create as this triggers verbose mode.
 #
 if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
   \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
 
-  [[ -s ".rvm/hooks/after_use" ]] && . ".rvm/hooks/after_use"
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id"
+  if ! rvm --create use  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    exit 1
+  fi
 fi
 
 #
@@ -32,18 +45,3 @@ fi
 #   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
 # fi
 
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory, you can uncomment the following code.
-#
-#   # Ensure that Bundler is installed. Install it if it is not.
-#   if ! command -v bundle >/dev/null; then
-#      printf "The rubygem 'bundler' is not installed. Installing it now.\n"
-#      gem install bundler
-#   fi
-#
-#   # Bundle while reducing excess noise.
-#   printf "Bundling your gems. This may take a few minutes on a fresh clone.\n"
-#   bundle | grep -v '^Using ' | grep -v ' is complete' | sed '/^$/d'
-#
-

Gemfile

@@ -1,47 +1,67 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.7'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem "sass", "~>3.1.0"
-gem "haml", "~> 3.1.0"
-gem "compass", "~>0.11"
-gem 'html5-boilerplate'
-gem 'simple_form'
-gem 'devise', '>= 1.2.0'
-gem 'devise_invitable', '~> 0.4.0'
-gem 'omniauth'
-gem 'barista', '~> 1.0'
-gem 'mongoid', '>= 2.0.0'
-gem 'bson_ext', '>= 1.2.4'
-gem 'mongoid_rails_migrations', '>=0.0.2'
-gem 'jquery-rails'
-gem 'haml-rails'
-gem 'hoptoad_notifier'
-gem 'dalli'
-gem 'rake', '0.8.7'
+gem 'rails', "~> 3.1.0"
+
+# Web server
+gem 'thin'
+
+# Mongo
+gem 'mongoid', "~> 2.1"
+gem "bson_ext", "~> 1.3"
+gem 'mongoid_rails_migrations'
+
+# Authentication
+gem 'devise', "~> 1.4.5"
+gem 'devise_invitable', '~> 0.5.4'
+gem 'omniauth', "~> 0.2.6"
+
+# Markdown
+gem 'rdiscount', "~> 1.6.8"
+
+# Other
+gem 'simple_form', "~> 1.4.2"
 gem 'actionmailer-with-request'
 
-group :production do 
-  gem 'therubyracer-heroku'
-end
+# Exception tracking
+gem "airbrake"
 
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# Rails extensions
+gem 'jquery-rails', "~> 1.0.13"
+gem 'haml-rails', "~>0.3.4"
+gem "rspec-rails", "~> 2.6.1", :group => [:development, :test]
 
-# 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
-  gem 'rspec-rails'
-  gem 'database_cleaner'
-  gem 'mongoid-rspec'
-  gem 'factory_girl_rails'
-  gem 'barista_growl', :git => 'http://github.com/TrevorBurnham/barista_growl.git'
+group :assets do
+  gem 'sass-rails', "~> 3.1"
+  gem 'coffee-rails', "~> 3.1"
+  gem 'uglifier'
+  gem 'compass',  "0.12.alpha.0"
+end
+
+group :development do
+  gem "rails-footnotes", ">= 3.7"
   gem 'ruby-debug19'
-  gem 'jasmine'
   gem 'mailcatcher'
+  gem 'foreman'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'guard-spork'
+  if RUBY_PLATFORM.downcase.include?("darwin")
+    gem 'rb-fsevent'
+    gem 'growl'
+  end
+end
+
+
+group :test do
+  gem 'shoulda-matchers'
+  gem 'mongoid-rspec'
+  gem "turn"                  # pretty printed test output
+  gem "database_cleaner", ">= 0.6.7"
+  gem "factory_girl_rails", "~> 1.2.0"
+  gem "launchy", ">= 0.4.0"
+end
+
+group :production do 
+  gem 'therubyracer-heroku', '0.8.1.pre3'
 end