Vendorized Thor.

4 files changed, 12 insertions, 6 deletions

diff --git a/Rakefile b/Rakefile
index fbb7f2213c..5dd9f40310 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,7 +38,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('railties/CHANGELOG')
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
   rdoc.rdoc_files.include('railties/README')
-  rdoc.rdoc_files.include('railties/lib/{*.rb,commands/*.rb,rails/*.rb,rails_generator/*.rb}')
+  rdoc.rdoc_files.include('railties/lib/{*.rb,commands/*.rb,rails/*.rb,generators/*.rb}')
+  rdoc.rdoc_files.exclude('railties/lib/vendor/*')
 
   rdoc.rdoc_files.include('activerecord/README')
   rdoc.rdoc_files.include('activerecord/CHANGELOG')
diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb
index 3cf4ccb79a..ed2ce43ba2 100644
--- a/railties/lib/generators.rb
+++ b/railties/lib/generators.rb
@@ -11,11 +11,7 @@ end
 
 $:.unshift(File.dirname(__FILE__))
 
-# TODO Use vendored Thor
-require 'rubygems'
-gem 'josevalim-thor'
-require 'thor'
-
+require 'vendor/thor'
 require 'generators/base'
 require 'generators/named_base'
 
diff --git a/railties/lib/vendor/thor b/railties/lib/vendor/thor
new file mode 160000
+Subproject fccc2fddfb3e696d4715bfddc1c25211fc7480d
diff --git a/railties/lib/vendor/thor.rb b/railties/lib/vendor/thor.rb
new file mode 100644
index 0000000000..a98799ce08
--- /dev/null
+++ b/railties/lib/vendor/thor.rb
@@ -0,0 +1,9 @@
+begin
+  # Prefer gems to the bundled libs.
+  require 'rubygems'
+  gem 'thor', '>= 0.11.0'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/thor/lib"
+end
+
+require 'thor'