aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-03 18:58:40 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-03 18:58:40 -0800
commita3d5274e67c841a6fdc9f9acb9e1b6bbc351dd28 (patch)
tree78b1ab39446198e36b994215eacb1138438322ba /railties/lib/rails/generators.rb
parentd627c932bdc5c0e2911e39cfb38952c29dab7afc (diff)
downloadrails-a3d5274e67c841a6fdc9f9acb9e1b6bbc351dd28.tar.gz
rails-a3d5274e67c841a6fdc9f9acb9e1b6bbc351dd28.tar.bz2
rails-a3d5274e67c841a6fdc9f9acb9e1b6bbc351dd28.zip
Configure generator when needed rather than during initialization
Diffstat (limited to 'railties/lib/rails/generators.rb')
-rw-r--r--railties/lib/rails/generators.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index a6a59f039f..fa2c11795b 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -72,6 +72,12 @@ module Rails
}
}
+ def self.configure!(config = Rails.application.config.generators) #:nodoc:
+ no_color! unless config.colorize_logging
+ aliases.deep_merge! config.aliases
+ options.deep_merge! config.options
+ end
+
def self.aliases #:nodoc:
@aliases ||= DEFAULT_ALIASES.dup
end