From 83f329f5f30567a10bc96410da230bf986db8ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 9 Nov 2009 16:19:47 -0200 Subject: Bundle I18n 0.2.0. --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a60c1010d9..85a1ee0fef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ clear_sources source 'http://gemcutter.org' -gem "rails", "3.0.pre", :vendored_at => "railties" +gem "rails", "3.0.pre", :path => "railties" %w( activesupport activemodel @@ -10,8 +10,9 @@ gem "rails", "3.0.pre", :vendored_at => "railties" activerecord activeresource ).each do |lib| - gem lib, '3.0.pre', :vendored_at => lib + gem lib, '3.0.pre', :path => lib end +gem "i18n", "0.2.0" gem "rack", "1.0.1" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rack-test", "~> 0.5.0" -- cgit v1.2.3 From 0f1da1cb5cfac1343958daef4c5e7c37a9ce0da3 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 9 Nov 2009 11:33:47 -0800 Subject: Revert "Bundle I18n 0.2.0." This reverts commit 83f329f5f30567a10bc96410da230bf986db8ad4. --- Gemfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 85a1ee0fef..a60c1010d9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ clear_sources source 'http://gemcutter.org' -gem "rails", "3.0.pre", :path => "railties" +gem "rails", "3.0.pre", :vendored_at => "railties" %w( activesupport activemodel @@ -10,9 +10,8 @@ gem "rails", "3.0.pre", :path => "railties" activerecord activeresource ).each do |lib| - gem lib, '3.0.pre', :path => lib + gem lib, '3.0.pre', :vendored_at => lib end -gem "i18n", "0.2.0" gem "rack", "1.0.1" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rack-test", "~> 0.5.0" -- cgit v1.2.3 From 3bdfda073098e37d852e58b6376fd3dcb5e00622 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 13:52:25 -0800 Subject: Bump arel dep to 0.2.pre --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a60c1010d9..6263587146 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem "rack", "1.0.1" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rack-test", "~> 0.5.0" gem "erubis", "~> 2.6.0" -gem "arel", "0.1.3", :git => "git://github.com/rails/arel.git" +gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "mocha" gem "sqlite3-ruby" gem "RedCloth" -- cgit v1.2.3 From a584b4c13dc12ba102182e914e428ea6730cfef2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 14:59:22 -0800 Subject: Get rack from rails/rack.git. Introduce ci-only deps. --- Gemfile | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6263587146..592fd30b2e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,22 +1,28 @@ clear_sources source 'http://gemcutter.org' +gem "rake", ">= 0.8.7" +gem "mocha", ">= 0.9.8" + gem "rails", "3.0.pre", :vendored_at => "railties" -%w( - activesupport - activemodel - actionpack - actionmailer - activerecord - activeresource -).each do |lib| +%w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib| gem lib, '3.0.pre', :vendored_at => lib end -gem "rack", "1.0.1" -gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" -gem "rack-test", "~> 0.5.0" -gem "erubis", "~> 2.6.0" + +# AR gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" -gem "mocha" -gem "sqlite3-ruby" -gem "RedCloth" +gem "sqlite3-ruby", ">= 1.2.5" + +# AP +gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" +gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" +gem "rack-test", ">= 0.5.0" +gem "erubis", ">= 2.6.5" +gem "RedCloth", ">= 4.2.2" + +only :ci do + gem "fcgi", ">= 0.8.7" + gem "nokogiri", ">= 1.4.0" + gem "memcache-client", ">= 1.7.6" + gem "pg", ">= 0.8.0" +end -- cgit v1.2.3 From a7dc7cd0c4ceccf0e89056d4429a1cfc84418a74 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 15:24:37 -0800 Subject: Ruby 1.9: don't bundle fcgi at all for CI --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 592fd30b2e..e279eb00aa 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" only :ci do - gem "fcgi", ">= 0.8.7" + gem "fcgi", ">= 0.8.7" if RUBY_VERSION <= '1.9.0' gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" gem "pg", ">= 0.8.0" -- cgit v1.2.3 From aef7e214bd2484cd879d67bb92dda6314e0d6435 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 15:28:25 -0800 Subject: Use an env var to expand the CI bundle. Using bundler's 'only' includes this stuff for everybody, oops. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e279eb00aa..1a4bba32c1 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem "rack-test", ">= 0.5.0" gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" -only :ci do +if ENV['CI'] gem "fcgi", ">= 0.8.7" if RUBY_VERSION <= '1.9.0' gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" -- cgit v1.2.3 From f14eb686ef36babfbfc0eb9ef9de962f365c7277 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 15:46:32 -0800 Subject: CI: bundle test-unit on 1.9 --- Gemfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1a4bba32c1..d44c689582 100644 --- a/Gemfile +++ b/Gemfile @@ -21,8 +21,15 @@ gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" if ENV['CI'] - gem "fcgi", ">= 0.8.7" if RUBY_VERSION <= '1.9.0' gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" gem "pg", ">= 0.8.0" + + # 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 end -- cgit v1.2.3 From 819bdd0f4a0e2f96cd43917f5c87e17cb3aec1e1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 15:51:01 -0800 Subject: Bundle rack-1.0 branch --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d44c689582..ca7fa759bf 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "sqlite3-ruby", ">= 1.2.5" # AP -gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" +gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git", :branch => "rack-1.0" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rack-test", ">= 0.5.0" gem "erubis", ">= 2.6.5" -- cgit v1.2.3 From 60558cc753f171d675783fafc6aa4855344a27cd Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 15:59:25 -0800 Subject: CI: no system gems required --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index ca7fa759bf..4a5881cf49 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,8 @@ gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" if ENV['CI'] + disable_system_gems + gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" gem "pg", ">= 0.8.0" -- cgit v1.2.3 From 13280a049e6aaee51e1c011c0c155dc4d1085c76 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 16:34:04 -0800 Subject: Back to rack master, rack-1.0 reverts the kind_of? String fix --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 4a5881cf49..55cf4e1104 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "sqlite3-ruby", ">= 1.2.5" # AP -gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git", :branch => "rack-1.0" +gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" gem "rack-test", ">= 0.5.0" gem "erubis", ">= 2.6.5" -- cgit v1.2.3 From e02bff2634d94c07780884cae83b258d3f3a9a0e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 10 Nov 2009 16:50:12 -0800 Subject: CI: missed mysql gem in bundle --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 55cf4e1104..20d5263c07 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ if ENV['CI'] gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" gem "pg", ">= 0.8.0" + gem "mysql", ">= 2.8.1" # fcgi gem doesn't compile on 1.9 # avoid minitest strangeness on 1.9 -- cgit v1.2.3 From 2da432dde33404b3149210725f4828e957b345bf Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 12 Nov 2009 11:26:55 -0800 Subject: Always bundle pg and mysql for AR tests --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 20d5263c07..f4a37a5e8b 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,8 @@ end # AR gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "sqlite3-ruby", ">= 1.2.5" +gem "pg", ">= 0.8.0" +gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" @@ -25,8 +27,6 @@ if ENV['CI'] gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" - gem "pg", ">= 0.8.0" - gem "mysql", ">= 2.8.1" # fcgi gem doesn't compile on 1.9 # avoid minitest strangeness on 1.9 -- cgit v1.2.3 From 3ee9b8f2b28ecbff08617fba9a224b49ad7ad57e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 14 Nov 2009 02:39:38 -0800 Subject: Remove Gemfile deps duplicated from AP gemspec --- Gemfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f4a37a5e8b..8f4fed2cdd 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,6 @@ gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" -gem "rack-test", ">= 0.5.0" -gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3 From 4236473e31d9d31be8c8bc75927d0d0d2739ec4c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Thu, 19 Nov 2009 17:59:26 -0800 Subject: Depend on rack-mount 0.0.2 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 8f4fed2cdd..4589af9b28 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" -gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" +gem "rack-mount", "0.0.2" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3 From 74a0fb97223bd8b39f43cceb5de916f6930c8278 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Thu, 19 Nov 2009 18:08:38 -0800 Subject: Should be rackmount 0.2 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 4589af9b28..313b400d9f 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" -gem "rack-mount", "0.0.2" +gem "rack-mount", "0.2.0" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3 From 0ce920654149f1a4c231cfa71ac87fca4663b322 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 19 Nov 2009 18:30:29 -0800 Subject: Update gemspec also --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 313b400d9f..6d1472f2c3 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" -gem "rack-mount", "0.2.0" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3