From ddb4600ce608b14f9fa07bf1196b78e1d43ad999 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Sat, 12 Sep 2009 15:22:11 -0500 Subject: Get ActionPack's test running on bundled gems. This should make running tests on new machines, as well as CI, work well. --- actionpack/Gemfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 actionpack/Gemfile (limited to 'actionpack/Gemfile') diff --git a/actionpack/Gemfile b/actionpack/Gemfile new file mode 100644 index 0000000000..ed1ae2e9c0 --- /dev/null +++ b/actionpack/Gemfile @@ -0,0 +1,14 @@ +rails_root = Pathname.new(File.dirname(__FILE__)).join("..") + +gem "rack", "~> 1.0.0" +gem "rack-test", "~> 0.4.2" +gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport") +gem "activemodel", "3.0.pre", :vendored_at => rails_root.join("activemodel") + +only :test do + gem "mocha" + gem "sqlite3-ruby" + gem "RedCloth" +end + +disable_system_gems \ No newline at end of file -- cgit v1.2.3 From 25f4129151070f8c237ea3092a5da59253a1a2fc Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 12:58:49 -0500 Subject: Need to declare optional dependencies from AS --- actionpack/Gemfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'actionpack/Gemfile') diff --git a/actionpack/Gemfile b/actionpack/Gemfile index ed1ae2e9c0..8abf63bd35 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -9,6 +9,12 @@ only :test do gem "mocha" gem "sqlite3-ruby" gem "RedCloth" + + activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor') + + gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2') + gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5') + gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13') end -disable_system_gems \ No newline at end of file +disable_system_gems -- cgit v1.2.3 From b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 22:55:46 -0500 Subject: Rollback AS bundler work and improve activation of vendored dependencies --- actionpack/Gemfile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'actionpack/Gemfile') diff --git a/actionpack/Gemfile b/actionpack/Gemfile index 8abf63bd35..b1579b427b 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -9,12 +9,6 @@ only :test do gem "mocha" gem "sqlite3-ruby" gem "RedCloth" - - activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor') - - gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2') - gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5') - gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13') end disable_system_gems -- cgit v1.2.3