diff options
Diffstat (limited to 'railties/lib/generator')
-rw-r--r-- | railties/lib/generator/base.rb | 13 | ||||
-rw-r--r-- | railties/lib/generator/generators/app/app_generator.rb | 1 | ||||
-rw-r--r-- | railties/lib/generator/generators/metal/metal_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/generator/named_base.rb | 8 |
4 files changed, 9 insertions, 15 deletions
diff --git a/railties/lib/generator/base.rb b/railties/lib/generator/base.rb index 08f488932b..c1452cdb7f 100644 --- a/railties/lib/generator/base.rb +++ b/railties/lib/generator/base.rb @@ -1,15 +1,4 @@ -# Load ActiveSupport mini -activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" -$:.unshift(activesupport_path) if File.directory?(activesupport_path) -require 'active_support/all' - -# TODO Use vendored Thor -require 'rubygems' -gem 'josevalim-thor' -require 'thor' - -require File.dirname(__FILE__) + '/../rails/version' unless defined?(Rails::VERSION) -require File.dirname(__FILE__) + '/actions' +require 'generator/actions' module Rails module Generators diff --git a/railties/lib/generator/generators/app/app_generator.rb b/railties/lib/generator/generators/app/app_generator.rb index 3eb9b8c79a..45e46aed02 100644 --- a/railties/lib/generator/generators/app/app_generator.rb +++ b/railties/lib/generator/generators/app/app_generator.rb @@ -1,4 +1,3 @@ -require File.dirname(__FILE__) + '/../../base' require 'digest/md5' require 'active_support/secure_random' diff --git a/railties/lib/generator/generators/metal/metal_generator.rb b/railties/lib/generator/generators/metal/metal_generator.rb index 1c59a4e90a..d999bd89f7 100644 --- a/railties/lib/generator/generators/metal/metal_generator.rb +++ b/railties/lib/generator/generators/metal/metal_generator.rb @@ -1,5 +1,3 @@ -require File.dirname(__FILE__) + '/../../base' - module Rails::Generators class MetalGenerator < Base argument :file_name, :type => :string diff --git a/railties/lib/generator/named_base.rb b/railties/lib/generator/named_base.rb new file mode 100644 index 0000000000..1d3de123d5 --- /dev/null +++ b/railties/lib/generator/named_base.rb @@ -0,0 +1,8 @@ +require 'generator/base' + +module Rails + module Generators + class NamedBase < Base + end + end +end |