Move AS vendor support into bundler.

Run `rake bundle` before running tests.

activesupport/Gemfile

@@ -0,0 +1,19 @@
+lib_dir = Pathname.new(File.dirname(__FILE__)).join('lib')
+vendor_dir = lib_dir.join('active_support', 'vendor')
+
+# gem 'builder', '~> 2.1.2'
+# gem 'memcache-client', '>= 1.6.5'
+# gem 'tzinfo', '~> 0.3.13'
+# gem 'i18n', '~> 0.1.3'
+
+gem 'builder', '2.1.2', :vendored_at => vendor_dir.join('builder-2.1.2')
+gem 'memcache-client', '1.6.5', :vendored_at => vendor_dir.join('memcache-client-1.6.5')
+gem 'tzinfo', '0.3.13', :vendored_at => vendor_dir.join('tzinfo-0.3.13')
+gem 'i18n', '0.1.3', :vendored_at => vendor_dir.join('i18n-0.1.3')
+
+only :test do
+  gem 'mocha', '>= 0.9.7'
+  gem 'ruby-prof', '>= 0.6.1'
+end
+
+disable_rubygems

activesupport/Rakefile

@@ -28,6 +28,16 @@ task :isolated_test do
   end or raise "Failures"
 end
 
+task :bundle do
+  puts "Checking if the bundled testing requirements are up to date..."
+  result = system "gem bundle"
+  unless result
+    puts "The gem bundler is not installed. Installing."
+    system "gem install bundler"
+    system "gem bundle"
+  end
+end
+
 # Create compressed packages
 dist_dirs = [ "lib", "test"]
 

activesupport/lib/active_support.rb

@@ -35,6 +35,6 @@ module ActiveSupport
 end
 
 require 'active_support/autoload'
-require 'active_support/vendor'
 
+require 'i18n'
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"

activesupport/lib/active_support/test_case.rb

@@ -7,7 +7,6 @@ require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
 
 begin
-  gem 'mocha', ">= 0.9.7"
   require 'mocha'
 rescue LoadError
   # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.

activesupport/lib/active_support/testing/performance.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'ruby-prof', '>= 0.6.1'
 require 'ruby-prof'
 
 require 'fileutils'

activesupport/lib/active_support/vendor.rb

@@ -1,27 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
-  gem 'builder', '~> 2.1.2'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
-end
-
-begin
-  gem 'memcache-client', '>= 1.6.5'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.6.5"
-end
-
-begin
-  gem 'tzinfo', '~> 0.3.13'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.13"
-end
-
-begin
-  gem 'i18n', '~> 0.1.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib"
-  require 'i18n'
-end