1 files changed, 6 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 6c2f8a35fe..7fbf57ba0b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
-path File.expand_path('..', __FILE__)
-source :gemcutter
+path File.dirname(__FILE__)
+source 'http://gemcutter.org'
 
-gem "rails", "3.0.0.beta"
+gem "rails", "3.0.0.beta1"
 
 gem "rake",  ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
@@ -11,7 +11,7 @@ if RUBY_VERSION < '1.9'
 end
 
 # AR
-gem "sqlite3-ruby", ">= 1.2.5"
+gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3'
 
 group :test do
   gem "pg", ">= 0.8.0"
@@ -19,18 +19,12 @@ group :test do
 end
 
 # AP
-gem "rack-test", "0.5.3"
+gem "rack-test", "0.5.3", :require => 'rack/test'
 gem "RedCloth", ">= 4.2.2"
 
 if ENV['CI']
   gem "nokogiri", ">= 1.4.0"
-  gem "memcache-client", ">= 1.7.6"
 
   # fcgi gem doesn't compile on 1.9
-  # avoid minitest strangeness on 1.9
-  if RUBY_VERSION < '1.9.0'
-    gem "fcgi", ">= 0.8.7"
-  else
-    gem "test-unit", ">= 2.0.5"
-  end
+  gem "fcgi", ">= 0.8.7" if RUBY_VERSION < '1.9.0'
 end