warn if non-vendored Thor has already been required

rubygems · Jun 10, 2011 · 3439848 · 3439848
1 parent 766102a
commit 3439848
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
@@ -1,6 +1,4 @@
-$:.unshift File.expand_path('../vendor', __FILE__)
-require 'thor'
-require 'thor/actions'
+require 'bundler/vendored_thor'
 require 'rubygems/user_interaction'
 require 'rubygems/config_file'
 

diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb
@@ -0,0 +1,7 @@
+if defined?(Thor)
+  Bundler.ui.warn "Thor has already been required. " +
+    "This may cause Bundler to malfunction in unexpected ways."
+end
+$:.unshift File.expand_path('../vendor', __FILE__)
+require 'thor'
+require 'thor/actions'