diff options
Diffstat (limited to 'railties')
| -rwxr-xr-x | railties/bin/rails | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators.rb | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/railties/bin/rails b/railties/bin/rails index 0f51d5739f..b8b2d6188f 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -20,7 +20,7 @@ end ARGV << "--help" if ARGV.empty? -require 'rails' + require 'rails/generators' require 'rails/generators/rails/app/app_generator' diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 0e66c9f58f..16b28dd295 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -4,8 +4,7 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.inc require 'active_support' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/metaclass' -require 'active_support/core_ext/array' -require 'active_support/core_ext/hash' +require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/string/inflections' @@ -95,7 +94,7 @@ module Rails end def self.plugins_generators_paths #:nodoc: - return [] unless Rails.root + return [] unless defined?(Rails.root) Dir[File.join(Rails.root, "vendor", "plugins", "*", "lib", "{generators,rails_generators}")] end @@ -136,7 +135,7 @@ module Rails def self.load_paths @load_paths ||= begin paths = [] - paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if Rails.root + paths += Dir[File.join(Rails.root, "lib", "{generators,rails_generators}")] if defined?(Rails.root) paths += Dir[File.join(Thor::Util.user_home, ".rails", "{generators,rails_generators}")] paths += self.plugins_generators_paths paths += self.gems_generators_paths |