From c9ea21717eefb9e9b49891c519cc4d121ef7bb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 8 Jul 2009 12:19:17 +0200 Subject: Generators are configured on initialization if RAILS_ENV=generators. --- railties/lib/initializer.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index f0fb78c8f4..fa7d2d5249 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -568,4 +568,14 @@ Run `rake gems:install` to install the missing gems. ActiveSupport::Dependencies.unhook! end end + + # Load generators if RAILS_ENV == "generators" + Initializer.default.add :initialize_generators do + if RAILS_ENV == "generators" + require 'generators' + Rails::Generators.no_color! unless config.generators.colorize_logging + Rails::Generators.aliases.merge! config.generators.aliases + Rails::Generators.options.merge! config.generators.options + end + end end -- cgit v1.2.3 From 09c288f0c5b5f9da4473bb321cccb766d9f59d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 8 Jul 2009 12:55:50 +0200 Subject: Add the new generators environment and update commands. --- railties/lib/initializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index fa7d2d5249..be65950a5b 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -572,7 +572,7 @@ Run `rake gems:install` to install the missing gems. # Load generators if RAILS_ENV == "generators" Initializer.default.add :initialize_generators do if RAILS_ENV == "generators" - require 'generators' + require "generators" Rails::Generators.no_color! unless config.generators.colorize_logging Rails::Generators.aliases.merge! config.generators.aliases Rails::Generators.options.merge! config.generators.options -- cgit v1.2.3 From f68e7a3987adf2cffe0e48263d117839c2028185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 13 Jul 2009 18:18:08 +0200 Subject: Remove generator environment until we have a gem manifest. --- railties/lib/initializer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index be65950a5b..d0ef9d0c2f 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -569,10 +569,9 @@ Run `rake gems:install` to install the missing gems. end end - # Load generators if RAILS_ENV == "generators" + # Configure generators if they were already loaded Initializer.default.add :initialize_generators do - if RAILS_ENV == "generators" - require "generators" + if defined?(Rails::Generators) Rails::Generators.no_color! unless config.generators.colorize_logging Rails::Generators.aliases.merge! config.generators.aliases Rails::Generators.options.merge! config.generators.options -- cgit v1.2.3 From 7022b58842ec3490d85efc5b947d86a0fd72d0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 15 Jul 2009 16:20:48 +0200 Subject: Allow namespaced configuration on generators. --- railties/lib/initializer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index d0ef9d0c2f..bb04dfa370 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -573,8 +573,8 @@ Run `rake gems:install` to install the missing gems. Initializer.default.add :initialize_generators do if defined?(Rails::Generators) Rails::Generators.no_color! unless config.generators.colorize_logging - Rails::Generators.aliases.merge! config.generators.aliases - Rails::Generators.options.merge! config.generators.options + Rails::Generators.aliases.deep_merge! config.generators.aliases + Rails::Generators.options.deep_merge! config.generators.options end end end -- cgit v1.2.3 From 2c2ca833a531d825d9b46e501b564a52a8a69358 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Thu, 30 Jul 2009 09:53:10 -0700 Subject: Removed default_internal, which was preventing round-tripping of some encodings. --- railties/lib/initializer.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties/lib/initializer.rb') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index bb04dfa370..336bff9534 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -244,7 +244,6 @@ module Rails if RUBY_VERSION < '1.9' $KCODE='u' else - Encoding.default_internal = Encoding::UTF_8 Encoding.default_external = Encoding::UTF_8 end end -- cgit v1.2.3