lib/bundler/vendored_thor.rb in bundler-1.8.9 vs lib/bundler/vendored_thor.rb in bundler-1.9.0.pre

- old
+ new

@@ -1,8 +1,5 @@ -if defined?(Thor) - Bundler.ui.warn "Thor has already been required. " + - "This may cause Bundler to malfunction in unexpected ways." -end -vendor = File.expand_path('../vendor', __FILE__) -$:.unshift(vendor) unless $:.include?(vendor) +vendor = File.expand_path('../vendor/thor-0.19.1/lib', __FILE__) +loaded = $:.include?(vendor) +$:.unshift(vendor) unless loaded require 'thor' require 'thor/actions'