Add the new generators environment and update commands.

3 files changed, 21 insertions, 2 deletions

diff --git a/railties/lib/generators/base.rb b/railties/lib/generators/base.rb
index dcc210240e..13916e081b 100644
--- a/railties/lib/generators/base.rb
+++ b/railties/lib/generators/base.rb
@@ -163,7 +163,7 @@ module Rails
                 end
                 shell.padding -= 1
               else
-                say "Could not find and invoke '\#{klass_name}'."
+                say_status :error, "\#{klass_name} [not found]", :red
               end
             end
           METHOD
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb
index dc1d360e3f..20a06ed16a 100644
--- a/railties/lib/generators/rails/app/app_generator.rb
+++ b/railties/lib/generators/rails/app/app_generator.rb
@@ -1,6 +1,6 @@
 require 'digest/md5' 
 require 'active_support/secure_random'
-require 'rails/version' unless defined?(RAILS::VERSION)
+require 'rails/version' unless defined?(Rails::VERSION)
 
 module Rails::Generators
   class AppGenerator < Base
diff --git a/railties/lib/generators/rails/app/templates/config/environments/generators.rb b/railties/lib/generators/rails/app/templates/config/environments/generators.rb
new file mode 100644
index 0000000000..503a281e20
--- /dev/null
+++ b/railties/lib/generators/rails/app/templates/config/environments/generators.rb
@@ -0,0 +1,19 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# Cache classes and log when you accidentally call methods on nil.
+config.cache_classes = false
+config.whiny_nils = true
+
+# We do not need any framework on generators. They are loaded on demand.
+config.frameworks.clear
+
+# Configure generators. Below you have the default values, delete them if you want.
+config.generators do |g|
+  g.helper          = true
+  g.layout          = true
+  g.orm             = :active_record
+  g.stylesheets     = true
+  g.template_engine = :erb
+  g.test_framework  = :test_unit
+  g.timestamps      = true
+end