From 00379ee998b5ed10d8a4197f3fa0f57873f17ba1 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 13 May 2011 04:05:44 +0900 Subject: [PATCH] Revert "Delegate everything to the generator" This reverts commit 0904e8256864239f673bf91fce1cfffb9345ee61. reason: rake rails:update:scripts fails due to this change --- .../generators/rails/app/app_generator.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index d79f76c799cce..ed3bf15ca966b 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -9,11 +9,21 @@ def initialize(generator) @options = generator.options end - private + private + %w(template copy_file directory empty_directory inside + empty_directory_with_gitkeep create_file chmod shebang).each do |method| + class_eval <<-RUBY, __FILE__, __LINE__ + 1 + def #{method}(*args, &block) + @generator.send(:#{method}, *args, &block) + end + RUBY + end - def method_missing(meth, *args, &block) - @generator.send(meth, *args, &block) - end + # TODO: Remove once this is fully in place + def method_missing(meth, *args, &block) + STDERR.puts "Calling #{meth} with #{args.inspect} with #{block}" + @generator.send(meth, *args, &block) + end end # The application builder allows you to override elements of the application