From 7d56fd9f08795e7dddac9d31b34d707b83023c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 28 Jul 2009 16:21:30 +0200 Subject: Always use application generator to run templates. --- railties/lib/generators/rails/app/app_generator.rb | 1 - railties/lib/tasks/framework.rake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index 0c9bbeb847..c8044d13b1 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -176,7 +176,6 @@ module Rails::Generators protected # Define file as an alias to create_file for backwards compatibility. - # TODO Add deprecation warning? # def file(*args, &block) create_file(*args, &block) diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 72cba5ce8b..a084af7e11 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -86,7 +86,7 @@ namespace :rails do template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} require 'generators' - generator = Rails::Generators::Base.new [], {}, :destination_root => RAILS_ROOT + generator = Rails::Generators::App.new [ RAILS_ROOT ], {}, :destination_root => RAILS_ROOT generator.apply template, :verbose => false end -- cgit v1.2.3