aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2010-08-10 18:15:12 +0100
committerGonçalo Silva <goncalossilva@gmail.com>2010-08-10 18:15:12 +0100
commit62658500049fbb7a5e7d75537dd6f6a374204207 (patch)
tree8892d8305ced43866068a6c1c66548e465e45b38 /Gemfile
parentcd2bbed9846d84a1230a1b9e52843eedca17b28d (diff)
parente86cced311539932420f9cda49d736606d106c28 (diff)
downloadrails-62658500049fbb7a5e7d75537dd6f6a374204207.tar.gz
rails-62658500049fbb7a5e7d75537dd6f6a374204207.tar.bz2
rails-62658500049fbb7a5e7d75537dd6f6a374204207.zip
Merge branch 'master' of http://github.com/rails/rails
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile56
1 files changed, 31 insertions, 25 deletions
diff --git a/Gemfile b/Gemfile
index 827c67e522..d594d20fac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,43 +1,47 @@
source 'http://rubygems.org'
-gem "arel", :git => "git://github.com/rails/arel.git"
-#gem "rack-mount", :git => "git://github.com/rails/rack-mount.git"
+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 "rake", ">= 0.8.7"
gem "mocha", ">= 0.9.8"
-gem "rdoc", "2.2"
+gem "rdoc", ">= 2.5.9"
+gem "horo", ">= 1.0.1"
-mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
-if mri && RUBY_VERSION < '1.9'
+# AS
+gem "memcache-client", ">= 1.8.5"
+
+# AM
+gem "text-format", "~> 1.0.0"
+
+platforms :mri_18 do
gem "system_timer"
gem "ruby-debug", ">= 0.10.3"
end
-if mri || RUBY_ENGINE == "rbx"
+platforms :ruby do
gem 'json'
gem 'yajl-ruby'
- gem "nokogiri", ">= 1.4.0"
-elsif RUBY_ENGINE == "jruby"
- gem "ruby-debug"
- gem "jruby-openssl"
-end
-
-# AS
-gem "memcache-client", ">= 1.7.5"
+ gem "nokogiri", ">= 1.4.3.1"
-# AM
-gem "text-format", "~> 1.0.0"
-
-# AR
-if mri || RUBY_ENGINE == "rbx"
- gem "sqlite3-ruby", "~> 1.3.0", :require => 'sqlite3'
+ # AR
+ gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3'
group :db do
gem "pg", ">= 0.9.0"
gem "mysql", ">= 2.8.1"
+ gem "mysql2", :git => 'git://github.com/brianmario/mysql2.git'
end
-elsif RUBY_ENGINE == "jruby"
+end
+
+platforms :jruby do
+ gem "ruby-debug", ">= 0.10.3"
+
gem "activerecord-jdbcsqlite3-adapter"
group :db do
@@ -46,9 +50,11 @@ elsif RUBY_ENGINE == "jruby"
end
end
-if ENV['CI']
- gem "nokogiri", ">= 1.4.0"
+env 'CI' do
+ gem "nokogiri", ">= 1.4.3.1"
- # fcgi gem doesn't compile on 1.9
- gem "fcgi", ">= 0.8.7" if RUBY_VERSION < '1.9.0'
+ platforms :ruby_18 do
+ # fcgi gem doesn't compile on 1.9
+ gem "fcgi", ">= 0.8.8"
+ end
end