[Vendor] Dont change the load path to require vendored gemsseg-fix-thor-vendoring

Properly fixes us uses of autoload in thor

Closes #3492

46 files changed, 78 insertions, 72 deletions

diff --git a/Rakefile b/Rakefile
index 79bcce1a7d..b69bec89b7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -27,23 +27,32 @@ module Rake
   end
 end
 
+def clean_files(files, regex, replacement = '')
+  files.each do |file|
+    contents = File.read(file)
+    contents.gsub!(regex, replacement)
+    File.open(file, 'w') { |f| f << contents }
+  end
+end
+
 namespace :molinillo do
   task :namespace do
-    files = Dir.glob('lib/bundler/vendor/Molinillo*/**/*.rb')
-    sh "sed -i.bak 's/Molinillo/Bundler::Molinillo/g' #{files.join(' ')}"
-    sh "rm #{files.join('.bak ')}.bak"
+    files = Dir.glob('lib/bundler/vendor/molinillo*/**/*.rb')
+    clean_files(files, 'Molinillo', 'Bundler::Molinillo')
+    clean_files(files, /require (["'])molinillo/, 'require \1bundler/vendor/molinillo/lib/molinillo')
   end
 
   task :clean do
-    files = Dir.glob('lib/bundler/vendor/Molinillo*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    puts files
-    sh "rm -r #{files.join(' ')}"
+    files = Dir.glob('lib/bundler/vendor/molinillo*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
+    rm_r files
   end
 
   task :update, [:tag] => [] do |t, args|
     tag = args[:tag]
     Dir.chdir 'lib/bundler/vendor' do
-      `curl -L https://github.com/CocoaPods/molinillo/archive/#{tag}.tar.gz | tar -xz`
+      rm_rf 'molinillo'
+      sh "curl -L https://github.com/CocoaPods/molinillo/archive/#{tag}.tar.gz | tar -xz"
+      sh "mv Molinillo-* molinillo"
     end
     Rake::Task['molinillo:namespace'].invoke
     Rake::Task['molinillo:clean'].invoke
@@ -53,20 +62,22 @@ end
 namespace :thor do
   task :namespace do
     files = Dir.glob('lib/bundler/vendor/thor*/**/*.rb')
-    sh "sed -i.bak 's/Thor/Bundler::Thor/g' #{files.join(' ')}"
-    sh "rm #{files.join('.bak ')}.bak"
+    clean_files(files, 'Thor', 'Bundler::Thor')
+    clean_files(files, /require (["'])thor/, 'require \1bundler/vendor/thor/lib/thor')
+    clean_files(files, /(autoload\s+[:\w]+,\s+["'])(thor[\w\/]+["'])/, '\1bundler/vendor/thor/lib/\2')
   end
 
   task :clean do
     files = Dir.glob('lib/bundler/vendor/thor*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    puts files
-    sh "rm -r #{files.join(' ')}"
+    rm_r files
   end
 
   task :update, [:tag] => [] do |t, args|
     tag = args[:tag]
     Dir.chdir 'lib/bundler/vendor' do
-      `curl -L https://github.com/erikhuda/thor/archive/#{tag}.tar.gz | tar -xz`
+      rm_rf 'thor'
+      sh "curl -L https://github.com/erikhuda/thor/archive/#{tag}.tar.gz | tar -xz"
+      sh "mv thor-* thor"
     end
     Rake::Task['thor:namespace'].invoke
     Rake::Task['thor:clean'].invoke
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb b/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb
deleted file mode 100644
index bf740e4848..0000000000
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'molinillo/gem_metadata'
-require 'molinillo/errors'
-require 'molinillo/resolver'
-require 'molinillo/modules/ui'
-require 'molinillo/modules/specification_provider'
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo.rb b/lib/bundler/vendor/molinillo/lib/molinillo.rb
new file mode 100644
index 0000000000..50af4a912c
--- /dev/null
+++ b/lib/bundler/vendor/molinillo/lib/molinillo.rb
@@ -0,0 +1,5 @@
+require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'
+require 'bundler/vendor/molinillo/lib/molinillo/errors'
+require 'bundler/vendor/molinillo/lib/molinillo/resolver'
+require 'bundler/vendor/molinillo/lib/molinillo/modules/ui'
+require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/dependency_graph.rb b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
index 4ee5708a56..4ee5708a56 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/dependency_graph.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/errors.rb b/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
index b828d0c20d..b828d0c20d 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/errors.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
index 0736b89c3c..0736b89c3c 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/gem_metadata.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/specification_provider.rb b/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
index 79a85e778f..79a85e778f 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/specification_provider.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/ui.rb b/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
index 097c0264ac..097c0264ac 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/ui.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
index 376e4d4ed2..cd5191eb7e 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolution.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
@@ -98,8 +98,8 @@ module Bundler::Molinillo
         debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
       end
 
-      require 'molinillo/state'
-      require 'molinillo/modules/specification_provider'
+      require 'bundler/vendor/molinillo/lib/molinillo/state'
+      require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'
 
       # @return [Integer] the number of resolver iterations in between calls to
       #   {#resolver_ui}'s {UI#indicate_progress} method
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolver.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
index 7cfe914d34..9a9d8fd1f8 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolver.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
@@ -1,4 +1,4 @@
-require 'molinillo/dependency_graph'
+require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph'
 
 module Bundler::Molinillo
   # This class encapsulates a dependency resolver.
@@ -7,7 +7,7 @@ module Bundler::Molinillo
   #
   #
   class Resolver
-    require 'molinillo/resolution'
+    require 'bundler/vendor/molinillo/lib/molinillo/resolution'
 
     # @return [SpecificationProvider] the specification provider used
     #   in the resolution process
diff --git a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/state.rb b/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
index 8e394f8672..8e394f8672 100644
--- a/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/state.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/state.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb b/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb
deleted file mode 100644
index 74c789b763..0000000000
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "thor/parser/argument"
-require "thor/parser/arguments"
-require "thor/parser/option"
-require "thor/parser/options"
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor.rb b/lib/bundler/vendor/thor/lib/thor.rb
index 8775d6a3e0..9ed67a44e2 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor.rb
+++ b/lib/bundler/vendor/thor/lib/thor.rb
@@ -1,5 +1,5 @@
 require "set"
-require "thor/base"
+require "bundler/vendor/thor/lib/thor/base"
 
 class Bundler::Thor # rubocop:disable ClassLength
   class << self
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions.rb b/lib/bundler/vendor/thor/lib/thor/actions.rb
index 7edc70f472..5a82dfd45f 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -1,12 +1,12 @@
 require "fileutils"
 require "uri"
-require "thor/core_ext/io_binary_read"
-require "thor/actions/create_file"
-require "thor/actions/create_link"
-require "thor/actions/directory"
-require "thor/actions/empty_directory"
-require "thor/actions/file_manipulation"
-require "thor/actions/inject_into_file"
+require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
+require "bundler/vendor/thor/lib/thor/actions/create_file"
+require "bundler/vendor/thor/lib/thor/actions/create_link"
+require "bundler/vendor/thor/lib/thor/actions/directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/file_manipulation"
+require "bundler/vendor/thor/lib/thor/actions/inject_into_file"
 
 class Bundler::Thor
   module Actions
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
index 711ccb7d7b..a0f5640333 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_file.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_link.rb b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
index f633f25c18..be437922b6 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_link.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
@@ -1,4 +1,4 @@
-require "thor/actions/create_file"
+require "bundler/vendor/thor/lib/thor/actions/create_file"
 
 class Bundler::Thor
   module Actions
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
index 3ed0649c27..1a2e25da2f 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/directory.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/directory.rb
@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/empty_directory.rb b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
index cdc3768b4c..cdc3768b4c 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/empty_directory.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/file_manipulation.rb b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
index 2bdc78f578..2bdc78f578 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/file_manipulation.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/inject_into_file.rb b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
index 45a70701b1..91ab245ae1 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/actions/inject_into_file.rb
+++ b/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/base.rb b/lib/bundler/vendor/thor/lib/thor/base.rb
index 56b78ebad6..c3667521a5 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/base.rb
+++ b/lib/bundler/vendor/thor/lib/thor/base.rb
@@ -1,17 +1,17 @@
-require "thor/command"
-require "thor/core_ext/hash_with_indifferent_access"
-require "thor/core_ext/ordered_hash"
-require "thor/error"
-require "thor/invocation"
-require "thor/parser"
-require "thor/shell"
-require "thor/line_editor"
-require "thor/util"
+require "bundler/vendor/thor/lib/thor/command"
+require "bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access"
+require "bundler/vendor/thor/lib/thor/core_ext/ordered_hash"
+require "bundler/vendor/thor/lib/thor/error"
+require "bundler/vendor/thor/lib/thor/invocation"
+require "bundler/vendor/thor/lib/thor/parser"
+require "bundler/vendor/thor/lib/thor/shell"
+require "bundler/vendor/thor/lib/thor/line_editor"
+require "bundler/vendor/thor/lib/thor/util"
 
 class Bundler::Thor
-  autoload :Actions,    "thor/actions"
-  autoload :RakeCompat, "thor/rake_compat"
-  autoload :Group,      "thor/group"
+  autoload :Actions,    "bundler/vendor/thor/lib/thor/actions"
+  autoload :RakeCompat, "bundler/vendor/thor/lib/thor/rake_compat"
+  autoload :Group,      "bundler/vendor/thor/lib/thor/group"
 
   # Shortcuts for help.
   HELP_MAPPINGS       = %w[-h -? --help -D]
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/command.rb b/lib/bundler/vendor/thor/lib/thor/command.rb
index 72c8348cb6..72c8348cb6 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/command.rb
+++ b/lib/bundler/vendor/thor/lib/thor/command.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/hash_with_indifferent_access.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
index 6cf61db812..6cf61db812 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/hash_with_indifferent_access.rb
+++ b/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/io_binary_read.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
index 19f3c3d43e..19f3c3d43e 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/io_binary_read.rb
+++ b/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/ordered_hash.rb b/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb
index 7e80672a07..7e80672a07 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/ordered_hash.rb
+++ b/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/error.rb b/lib/bundler/vendor/thor/lib/thor/error.rb
index fc34c11268..fc34c11268 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/error.rb
+++ b/lib/bundler/vendor/thor/lib/thor/error.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/group.rb b/lib/bundler/vendor/thor/lib/thor/group.rb
index 71e7f1c3b8..13d168ad62 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/group.rb
+++ b/lib/bundler/vendor/thor/lib/thor/group.rb
@@ -1,4 +1,4 @@
-require "thor/base"
+require "bundler/vendor/thor/lib/thor/base"
 
 # Bundler::Thor has a special class called Bundler::Thor::Group. The main difference to Bundler::Thor class
 # is that it invokes all commands at once. It also include some methods that allows
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/invocation.rb b/lib/bundler/vendor/thor/lib/thor/invocation.rb
index 684df2c616..684df2c616 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/invocation.rb
+++ b/lib/bundler/vendor/thor/lib/thor/invocation.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb b/lib/bundler/vendor/thor/lib/thor/line_editor.rb
index 95c848e0e3..ce81a17484 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor.rb
@@ -1,5 +1,5 @@
-require "thor/line_editor/basic"
-require "thor/line_editor/readline"
+require "bundler/vendor/thor/lib/thor/line_editor/basic"
+require "bundler/vendor/thor/lib/thor/line_editor/readline"
 
 class Bundler::Thor
   module LineEditor
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/basic.rb b/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
index b121e95575..b121e95575 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/basic.rb
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/readline.rb b/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
index dd39cff35d..dd39cff35d 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/readline.rb
+++ b/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
diff --git a/lib/bundler/vendor/thor/lib/thor/parser.rb b/lib/bundler/vendor/thor/lib/thor/parser.rb
new file mode 100644
index 0000000000..08f80e565d
--- /dev/null
+++ b/lib/bundler/vendor/thor/lib/thor/parser.rb
@@ -0,0 +1,4 @@
+require "bundler/vendor/thor/lib/thor/parser/argument"
+require "bundler/vendor/thor/lib/thor/parser/arguments"
+require "bundler/vendor/thor/lib/thor/parser/option"
+require "bundler/vendor/thor/lib/thor/parser/options"
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/argument.rb b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
index 84957903cd..84957903cd 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/argument.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/arguments.rb b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
index c7bb648e31..c7bb648e31 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/arguments.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/option.rb b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
index eb893617f4..eb893617f4 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/option.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/option.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/options.rb b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
index deac6a0c16..deac6a0c16 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/parser/options.rb
+++ b/lib/bundler/vendor/thor/lib/thor/parser/options.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/rake_compat.rb b/lib/bundler/vendor/thor/lib/thor/rake_compat.rb
index fcf6719df6..60282e2991 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/rake_compat.rb
+++ b/lib/bundler/vendor/thor/lib/thor/rake_compat.rb
@@ -5,7 +5,7 @@ class Bundler::Thor
   # Adds a compatibility layer to your Bundler::Thor classes which allows you to use
   # rake package tasks. For example, to use rspec rake tasks, one can do:
   #
-  #   require 'thor/rake_compat'
+  #   require 'bundler/vendor/thor/lib/thor/rake_compat'
   #   require 'rspec/core/rake_task'
   #
   #   class Default < Bundler::Thor
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/runner.rb b/lib/bundler/vendor/thor/lib/thor/runner.rb
index 5552fe44bd..f0d7bfe2e0 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/runner.rb
+++ b/lib/bundler/vendor/thor/lib/thor/runner.rb
@@ -1,6 +1,6 @@
-require "thor"
-require "thor/group"
-require "thor/core_ext/io_binary_read"
+require "bundler/vendor/thor/lib/thor"
+require "bundler/vendor/thor/lib/thor/group"
+require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
 
 require "fileutils"
 require "open-uri"
@@ -102,7 +102,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
 
   desc "version", "Show Bundler::Thor version"
   def version
-    require "thor/version"
+    require "bundler/vendor/thor/lib/thor/version"
     say "Bundler::Thor #{Bundler::Thor::VERSION}"
   end
 
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell.rb b/lib/bundler/vendor/thor/lib/thor/shell.rb
index 6a6ec5e0a4..91afdce2aa 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell.rb
@@ -24,9 +24,9 @@ class Bundler::Thor
     SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
     attr_writer :shell
 
-    autoload :Basic, "thor/shell/basic"
-    autoload :Color, "thor/shell/color"
-    autoload :HTML,  "thor/shell/html"
+    autoload :Basic, "bundler/vendor/thor/lib/thor/shell/basic"
+    autoload :Color, "bundler/vendor/thor/lib/thor/shell/color"
+    autoload :HTML,  "bundler/vendor/thor/lib/thor/shell/html"
 
     # Add shell to initialize config values.
     #
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/basic.rb b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
index 278ffa3df0..278ffa3df0 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/basic.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/basic.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/color.rb b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
index 3c2feba4e5..1e2d26cfc5 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/color.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/color.rb
@@ -1,4 +1,4 @@
-require "thor/shell/basic"
+require "bundler/vendor/thor/lib/thor/shell/basic"
 
 class Bundler::Thor
   module Shell
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/html.rb b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
index 9e28690ad0..e1ea0de599 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/shell/html.rb
+++ b/lib/bundler/vendor/thor/lib/thor/shell/html.rb
@@ -1,4 +1,4 @@
-require "thor/shell/basic"
+require "bundler/vendor/thor/lib/thor/shell/basic"
 
 class Bundler::Thor
   module Shell
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/util.rb b/lib/bundler/vendor/thor/lib/thor/util.rb
index f4e98fc19f..f4e98fc19f 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/util.rb
+++ b/lib/bundler/vendor/thor/lib/thor/util.rb
diff --git a/lib/bundler/vendor/thor-0.19.1/lib/thor/version.rb b/lib/bundler/vendor/thor/lib/thor/version.rb
index 74b020a5ab..74b020a5ab 100644
--- a/lib/bundler/vendor/thor-0.19.1/lib/thor/version.rb
+++ b/lib/bundler/vendor/thor/lib/thor/version.rb
diff --git a/lib/bundler/vendored_molinillo.rb b/lib/bundler/vendored_molinillo.rb
index ce9ef0a3a1..4081f3fa92 100644
--- a/lib/bundler/vendored_molinillo.rb
+++ b/lib/bundler/vendored_molinillo.rb
@@ -1,5 +1,2 @@
-vendor = File.expand_path('../vendor/Molinillo-0.2.1/lib', __FILE__)
-loaded = $:.include?(vendor)
-$:.unshift(vendor) unless loaded
-require 'molinillo'
-$:.delete(vendor) unless loaded
+module Bundler; end
+require 'bundler/vendor/molinillo/lib/molinillo'
diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb
index 2426f0c406..1931b5f278 100644
--- a/lib/bundler/vendored_thor.rb
+++ b/lib/bundler/vendored_thor.rb
@@ -1,5 +1,3 @@
-vendor = File.expand_path('../vendor/thor-0.19.1/lib', __FILE__)
-loaded = $:.include?(vendor)
-$:.unshift(vendor) unless loaded
-require 'thor'
-require 'thor/actions'
+module Bundler; end
+require 'bundler/vendor/thor/lib/thor'
+require 'bundler/vendor/thor/lib/thor/actions'