From 17ea8d8d4d81b4b9fb40bd6c6ee80f4acf3bad94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 29 Jan 2010 17:41:10 +0100 Subject: Automatically configure generators if application is defined. --- railties/lib/rails/commands/destroy.rb | 1 - railties/lib/rails/commands/generate.rb | 1 - railties/lib/rails/generators.rb | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index a2eff377ce..92a06ebdd8 100644 --- a/railties/lib/rails/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb @@ -1,5 +1,4 @@ require 'rails/generators' -Rails::Generators.configure! if ARGV.size == 0 Rails::Generators.help diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb index c1120aad74..5e45d8ab46 100755 --- a/railties/lib/rails/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb @@ -1,5 +1,4 @@ require 'rails/generators' -Rails::Generators.configure! if ARGV.size == 0 Rails::Generators.help diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 1271de7af9..90b513fcb4 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -286,3 +286,6 @@ module Rails end end +# If the application was already defined, configure generators, +# otherwise you have to configure it by hand. +Rails::Generators.configure! if Rails.respond_to?(:application) && Rails.application \ No newline at end of file -- cgit v1.2.3