From c9ea21717eefb9e9b49891c519cc4d121ef7bb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 8 Jul 2009 12:19:17 +0200
Subject: Generators are configured on initialization if RAILS_ENV=generators.

---
 railties/lib/generators/base.rb                    | 35 +++-------------------
 railties/lib/generators/rails/app/app_generator.rb |  1 +
 2 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'railties/lib/generators')

diff --git a/railties/lib/generators/base.rb b/railties/lib/generators/base.rb
index 0d2d165741..dcc210240e 100644
--- a/railties/lib/generators/base.rb
+++ b/railties/lib/generators/base.rb
@@ -2,33 +2,6 @@ require 'generators/actions'
 
 module Rails
   module Generators
-    DEFAULTS = {
-      :fixture => true,
-      :force_plural => false,
-      :helper => true,
-      :layout => true,
-      :migration => true,
-      :orm => 'active_record',
-      :resource_controller => 'controller',
-      :scaffold_controller => 'scaffold_controller',
-      :singleton => false,
-      :stylesheets => true,
-      :test_framework => 'test_unit',
-      :template_engine => 'erb',
-      :timestamps => true
-    }
-
-    ALIASES = {
-      :actions => '-a',
-      :fixture_replacement => '-r',
-      :orm => '-o',
-      :resource_controller => '-c',
-      :scaffold_controller => '-c',
-      :stylesheets => '-y',
-      :test_framework => '-t',
-      :template_engine => '-e'
-    }
-
     class Error < Thor::Error
     end
 
@@ -137,7 +110,7 @@ module Rails
         names.each do |name|
           defaults = if options[:type] == :boolean
             { }
-          elsif [true, false].include?(options.fetch(:default, DEFAULTS[name]))
+          elsif [true, false].include?(options.fetch(:default, Rails::Generators.options[name]))
             { :banner => "" }
           else
             { :desc => "#{name.to_s.humanize} to be invoked", :banner => "NAME" }
@@ -212,12 +185,12 @@ module Rails
         end
       end
 
-      # Make class option aware of DEFAULTS and ALIASES.
+      # Make class option aware of Rails::Generators.options and Rails::Generators.aliases.
       #
       def self.class_option(name, options) #:nodoc:
         options[:desc]    = "Indicates when to generate #{name.to_s.humanize.downcase}" unless options.key?(:desc)
-        options[:aliases] = ALIASES[name]  unless options.key?(:aliases)
-        options[:default] = DEFAULTS[name] unless options.key?(:default)
+        options[:aliases] = Rails::Generators.aliases[name]  unless options.key?(:aliases)
+        options[:default] = Rails::Generators.options[name] unless options.key?(:default)
         super(name, options)
       end
 
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb
index 1971d150c8..dc1d360e3f 100644
--- a/railties/lib/generators/rails/app/app_generator.rb
+++ b/railties/lib/generators/rails/app/app_generator.rb
@@ -1,5 +1,6 @@
 require 'digest/md5' 
 require 'active_support/secure_random'
+require 'rails/version' unless defined?(RAILS::VERSION)
 
 module Rails::Generators
   class AppGenerator < Base
-- 
cgit v1.2.3