Rearrange vendor bundles so gem overrides work correctly.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

32 files changed, 17 insertions, 11 deletions

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 28fe5b3cf7..ec803f5a8e 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -31,23 +31,15 @@ unless defined?(ActionController)
   end
 end
 
-# attempt to load the TMail gem
-begin
-  require 'rubygems'
-  gem 'TMail', '> 1.1.0'
-  require 'tmail'
-rescue Gem::LoadError
-  # no gem, fall back to vendor copy
-end
-
-$:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")
-
+require 'action_mailer/vendor'
 require 'tmail'
+
 require 'action_mailer/base'
 require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
 require 'action_mailer/test_helper'
+
 require 'net/smtp'
 
 ActionMailer::Base.class_eval do
diff --git a/actionmailer/lib/action_mailer/vendor.rb b/actionmailer/lib/action_mailer/vendor.rb
new file mode 100644
index 0000000000..0ad7386fd8
--- /dev/null
+++ b/actionmailer/lib/action_mailer/vendor.rb
@@ -0,0 +1,14 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'tmail', '~> 1.1.0'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tmail-1.1.0"
+end
+
+begin
+  gem 'text-format', '>= 0.6.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/text-format-0.6.3"
+end
diff --git a/actionmailer/lib/action_mailer/vendor/text/format.rb b/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
index de054db83e..de054db83e 100755
--- a/actionmailer/lib/action_mailer/vendor/text/format.rb
+++ b/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
index 7de185019b..7de185019b 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/Makefile b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
index 346353b83f..346353b83f 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/Makefile
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/address.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
index 224ed7090e..224ed7090e 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/address.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
index a8b8017cf9..a8b8017cf9 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/base64.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
index 41189f8c34..41189f8c34 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/base64.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/compat.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
index 9d2aa83798..9d2aa83798 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/compat.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/config.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
index 4b253d2b2a..4b253d2b2a 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/config.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/core_extensions.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
index cc24e97778..cc24e97778 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/core_extensions.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/encode.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
index 0721a25490..0721a25490 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/encode.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/facade.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
index 1ecd64bff8..1ecd64bff8 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/facade.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/header.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
index 41c371f37f..41c371f37f 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/header.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/info.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
index 5c115d5876..5c115d5876 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/info.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/interface.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
index 957e899734..957e899734 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/interface.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/loader.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
index 7907315401..7907315401 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/loader.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
index d10275b734..d10275b734 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/mail.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mailbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
index bb7a460e1a..bb7a460e1a 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/mailbox.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
index 7907315401..7907315401 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/mbox.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/net.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
index 50b1dd95be..50b1dd95be 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/net.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/obsolete.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
index b871510b82..b871510b82 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/obsolete.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/parser.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
index 5deb0ff655..5deb0ff655 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/parser.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/parser.y b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
index 77a1457794..77a1457794 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/parser.y
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/port.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
index 445f0e632b..445f0e632b 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/port.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
index 0b2d11c3f0..0b2d11c3f0 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/scanner.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
index 9216b430fa..9216b430fa 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/scanner.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
index ccf576c295..ccf576c295 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/stringio.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
index 3817850f63..3817850f63 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/stringio.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
index 57ed3cc581..57ed3cc581 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/tmail.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
index 016330ffd5..016330ffd5 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/version.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
index 175ea92538..175ea92538 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/version.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb