From 5021dc69a423e1dbf59aca84217af920707c10ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 13 Jul 2009 23:13:48 +0200 Subject: Vendorized Thor. --- railties/lib/generators.rb | 6 +----- railties/lib/vendor/thor | 1 + railties/lib/vendor/thor.rb | 9 +++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 160000 railties/lib/vendor/thor create mode 100644 railties/lib/vendor/thor.rb (limited to 'railties') 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 index 0000000000..fccc2fddfb --- /dev/null +++ b/railties/lib/vendor/thor @@ -0,0 +1 @@ +Subproject commit fccc2fddfb3e696d4715bfddc1c25211fc7480d6 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' -- cgit v1.2.3