From bcf2756ad279d9dc5b6a0b50ef3114f3e851322c Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Tue, 8 Mar 2011 15:23:31 -0800
Subject: [PATCH] simplifying .rvmrc

---
 .rvmrc  | 24 +-----------------------
 Gemfile |  2 +-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/.rvmrc b/.rvmrc
index e0eeff9..4032eb6 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1,23 +1 @@
-#!/usr/bin/env bash
-
-# adapted from: http://rvm.beginrescueend.com/workflow/rvmrc/
-
-ruby_string="1.8.7"
-gemset_name="cancan"
-
-if rvm list strings | grep -q "${ruby_string}" ; then
-
-  # Load or create the specified environment
-  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
-    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
-  else
-    rvm --create  "${ruby_string}@${gemset_name}"
-  fi
-
-else
-
-  # Notify the user to install the desired interpreter before proceeding.
-  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
-
-fi
+rvm use 1.8.7@cancan --create
diff --git a/Gemfile b/Gemfile
index fe583fb..9ee10e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 case ENV["MODEL_ADAPTER"]
 when nil, "active_record"
-  gem "sqlite3-ruby", :require => "sqlite3"
+  gem "sqlite3"
   gem "activerecord", :require => "active_record"
   gem "with_model"
   gem "meta_where"