1 files changed, 37 insertions, 15 deletions
diff --git a/Gemfile b/Gemfile
index d594d20fac..879598c6db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,41 +1,55 @@
 source 'http://rubygems.org'
 
+gemspec
+
 if ENV['AREL']
   gem "arel", :path => ENV['AREL']
 else
   gem "arel", :git => "git://github.com/rails/arel.git"
 end
 
-gem "rails", :path => File.dirname(__FILE__)
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem "rack-test", :git => "git://github.com/brynary/rack-test.git"
 
 gem "rake",  ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
-gem "rdoc",  ">= 2.5.9"
-gem "horo",  ">= 1.0.1"
+
+group :doc do
+  gem "rdoc",  "~> 3.4"
+  gem "horo",  "= 1.0.3"
+  gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
+end
 
 # AS
 gem "memcache-client", ">= 1.8.5"
-
-# AM
-gem "text-format", "~> 1.0.0"
+gem "fssm", "~> 0.2.5"
 
 platforms :mri_18 do
   gem "system_timer"
   gem "ruby-debug", ">= 0.10.3"
+  gem 'ruby-prof'
+end
+
+platforms :mri_19 do
+  # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
+  gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
 end
 
 platforms :ruby do
+  if ENV["RB_FSEVENT"]
+    gem 'rb-fsevent'
+  end
   gem 'json'
   gem 'yajl-ruby'
-  gem "nokogiri", ">= 1.4.3.1"
+  gem "nokogiri", ">= 1.4.4"
 
   # AR
-  gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3'
+  gem "sqlite3", "~> 1.3.3"
 
   group :db do
     gem "pg", ">= 0.9.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", :git => 'git://github.com/brianmario/mysql2.git'
+    gem "mysql2", :git => "git://github.com/brianmario/mysql2.git"
   end
 end
 
@@ -44,17 +58,25 @@ platforms :jruby do
 
   gem "activerecord-jdbcsqlite3-adapter"
 
+  # This is needed by now to let tests work on JRuby
+  # TODO: When the JRuby guys merge jruby-openssl in
+  # jruby this will be removed
+  gem "jruby-openssl"
+
   group :db do
     gem "activerecord-jdbcmysql-adapter"
     gem "activerecord-jdbcpostgresql-adapter"
   end
 end
 
-env 'CI' do
-  gem "nokogiri", ">= 1.4.3.1"
-
-  platforms :ruby_18 do
-    # fcgi gem doesn't compile on 1.9
-    gem "fcgi", ">= 0.8.8"
+# gems that are necessary for ActiveRecord tests with Oracle database
+if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
+  platforms :ruby do
+    gem 'ruby-oci8', ">= 2.0.4"
+  end
+  if ENV['ORACLE_ENHANCED_PATH']
+    gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
+  else
+    gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
   end
 end