From 3952268929d72b691c1db925c5e9bf7dff8962ce Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 15 Jul 2010 16:18:25 -0300 Subject: Bump up to rack-mount 0.6.9 and rack-mount-0.6.6.pre removed from action_dispatch vendor --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 827c67e522..fe6ef9aa8a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source 'http://rubygems.org' gem "arel", :git => "git://github.com/rails/arel.git" -#gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" -- cgit v1.2.3 From fcb230144b041a95c8e743921e22f8df56949993 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 15 Jul 2010 16:37:12 -0300 Subject: Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfo --- Gemfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index fe6ef9aa8a..e915135996 100644 --- a/Gemfile +++ b/Gemfile @@ -16,21 +16,21 @@ end if mri || RUBY_ENGINE == "rbx" gem 'json' gem 'yajl-ruby' - gem "nokogiri", ">= 1.4.0" + gem "nokogiri", ">= 1.4.2" elsif RUBY_ENGINE == "jruby" gem "ruby-debug" gem "jruby-openssl" end # AS -gem "memcache-client", ">= 1.7.5" +gem "memcache-client", ">= 1.8.5" # AM gem "text-format", "~> 1.0.0" # AR if mri || RUBY_ENGINE == "rbx" - gem "sqlite3-ruby", "~> 1.3.0", :require => 'sqlite3' + gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3' group :db do gem "pg", ">= 0.9.0" @@ -46,8 +46,8 @@ elsif RUBY_ENGINE == "jruby" end if ENV['CI'] - gem "nokogiri", ">= 1.4.0" + gem "nokogiri", ">= 1.4.2" # fcgi gem doesn't compile on 1.9 - gem "fcgi", ">= 0.8.7" if RUBY_VERSION < '1.9.0' + gem "fcgi", ">= 0.8.8" if RUBY_VERSION < '1.9.0' end -- cgit v1.2.3 From 2944a79452c871857dd154aeadd6ef8634709ec0 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 22 Jul 2010 23:17:28 +0200 Subject: bump required RDoc to >= 2.5.9, and replace the 2.2 horo.rb with Aaron's gem --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e915135996..d2377c2d08 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,8 @@ 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" mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" if mri && RUBY_VERSION < '1.9' -- cgit v1.2.3 From 2c4fcec44d20f70d44a0c8a153c7e94d4ca606ca Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 26 Jul 2010 06:31:45 +0800 Subject: Gemfile now makes use of platforms calls with blocks instead of elsif logic to define dependencies over specific platforms --- Gemfile | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d2377c2d08..28b3b450ca 100644 --- a/Gemfile +++ b/Gemfile @@ -8,36 +8,35 @@ gem "mocha", ">= 0.9.8" gem "rdoc", ">= 2.5.9" gem "horo" -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.2" -elsif RUBY_ENGINE == "jruby" - gem "ruby-debug" - gem "jruby-openssl" -end - -# AS -gem "memcache-client", ">= 1.8.5" -# AM -gem "text-format", "~> 1.0.0" - -# AR -if mri || RUBY_ENGINE == "rbx" + # AR gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3' group :db do gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" end -elsif RUBY_ENGINE == "jruby" +end + +platforms :jruby do + gem "system_timer" + gem "ruby-debug", ">= 0.10.3" + gem "activerecord-jdbcsqlite3-adapter" group :db do @@ -46,9 +45,11 @@ elsif RUBY_ENGINE == "jruby" end end -if ENV['CI'] +env 'CI' do gem "nokogiri", ">= 1.4.2" - # fcgi gem doesn't compile on 1.9 - gem "fcgi", ">= 0.8.8" 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 -- cgit v1.2.3 From 13df581ec77cc7e5351570c5035a563b946532d5 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sun, 25 Jul 2010 16:44:14 -0700 Subject: using AREL from the environment if it exists --- Gemfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 28b3b450ca..b92a6ab7a0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,11 @@ source 'http://rubygems.org' -gem "arel", :git => "git://github.com/rails/arel.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" -- cgit v1.2.3 From f427fdd13a3cccf6e8059cad6e1f5592b2446120 Mon Sep 17 00:00:00 2001 From: Nick Sieger Date: Mon, 26 Jul 2010 14:02:39 -0700 Subject: JRuby should not need system_timer, and cannot install it either Signed-off-by: Santiago Pastorino --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index b92a6ab7a0..3a6064db96 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,6 @@ platforms :ruby do end platforms :jruby do - gem "system_timer" gem "ruby-debug", ">= 0.10.3" gem "activerecord-jdbcsqlite3-adapter" -- cgit v1.2.3 From 55028a7326b833d51d0ab060828cf5f6983c93d8 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 29 Jul 2010 23:44:31 -0300 Subject: Bump up nokogiri to 1.4.3.1 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3a6064db96..c8dbcc0507 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ end platforms :ruby do gem 'json' gem 'yajl-ruby' - gem "nokogiri", ">= 1.4.2" + gem "nokogiri", ">= 1.4.3.1" # AR gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3' @@ -50,7 +50,7 @@ platforms :jruby do end env 'CI' do - gem "nokogiri", ">= 1.4.2" + gem "nokogiri", ">= 1.4.3.1" platforms :ruby_18 do # fcgi gem doesn't compile on 1.9 -- cgit v1.2.3 From 21e81da33570ba9453831cfc59c4f42ff9cdc1b2 Mon Sep 17 00:00:00 2001 From: Brian Lopez Date: Mon, 2 Aug 2010 01:37:57 -0700 Subject: update tests for mysql2 support --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c8dbcc0507..eb6d377af8 100644 --- a/Gemfile +++ b/Gemfile @@ -35,6 +35,7 @@ platforms :ruby do group :db do gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" + gem "mysql2", :path => 'git://github.com/brianmario/mysql2.git' end end -- cgit v1.2.3 From 2353e826b0446917eb655b60c47533f5a9c2a07f Mon Sep 17 00:00:00 2001 From: Brian Lopez Date: Mon, 2 Aug 2010 01:58:23 -0700 Subject: typo --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index eb6d377af8..b42723aaae 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ platforms :ruby do group :db do gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" - gem "mysql2", :path => 'git://github.com/brianmario/mysql2.git' + gem "mysql2", :git => 'git://github.com/brianmario/mysql2.git' end end -- cgit v1.2.3 From 5598d3ac2ee8d1d5da79a73c91bcf93c9270a124 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 8 Aug 2010 11:28:50 +0200 Subject: updates horo dependency to 1.0.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index c8dbcc0507..71dc1f3e99 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" gem "rdoc", ">= 2.5.9" -gem "horo" +gem "horo", ">= 1.0.1" # AS gem "memcache-client", ">= 1.8.5" -- cgit v1.2.3