From 51fe6d05e73a4e0f8481f4e441f4ca886d65a69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 6 Nov 2009 23:40:18 -0200 Subject: Refactor generators a little bit. Signed-off-by: Yehuda Katz --- railties/lib/rails/commands/destroy.rb | 3 +++ railties/lib/rails/commands/generate.rb | 3 +++ railties/lib/rails/generators/rails/app/app_generator.rb | 6 ++++-- railties/lib/rails/generators/rails/app/templates/script/about | 3 +++ railties/lib/rails/generators/rails/app/templates/script/about.tt | 4 ---- railties/lib/rails/generators/rails/app/templates/script/console | 2 ++ railties/lib/rails/generators/rails/app/templates/script/console.tt | 3 --- railties/lib/rails/generators/rails/app/templates/script/dbconsole | 2 ++ .../lib/rails/generators/rails/app/templates/script/dbconsole.tt | 3 --- railties/lib/rails/generators/rails/app/templates/script/destroy | 2 ++ railties/lib/rails/generators/rails/app/templates/script/destroy.tt | 5 ----- railties/lib/rails/generators/rails/app/templates/script/generate | 2 ++ .../lib/rails/generators/rails/app/templates/script/generate.tt | 5 ----- .../generators/rails/app/templates/script/performance/benchmarker | 2 ++ .../rails/app/templates/script/performance/benchmarker.tt | 3 --- .../generators/rails/app/templates/script/performance/profiler | 2 ++ .../generators/rails/app/templates/script/performance/profiler.tt | 3 --- railties/lib/rails/generators/rails/app/templates/script/plugin | 2 ++ railties/lib/rails/generators/rails/app/templates/script/plugin.tt | 3 --- railties/lib/rails/generators/rails/app/templates/script/runner | 2 ++ railties/lib/rails/generators/rails/app/templates/script/runner.tt | 3 --- railties/lib/rails/generators/rails/app/templates/script/server | 2 ++ railties/lib/rails/generators/rails/app/templates/script/server.tt | 3 --- 23 files changed, 31 insertions(+), 37 deletions(-) create mode 100755 railties/lib/rails/generators/rails/app/templates/script/about delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/about.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/console delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/console.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/dbconsole delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/destroy delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/destroy.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/generate delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/generate.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/performance/profiler delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/plugin delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/plugin.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/runner delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/runner.tt create mode 100755 railties/lib/rails/generators/rails/app/templates/script/server delete mode 100755 railties/lib/rails/generators/rails/app/templates/script/server.tt diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index 15ff90f78a..f85c17bb94 100644 --- a/railties/lib/rails/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb @@ -1,3 +1,6 @@ +require 'rails/generators' +Rails::Generators.configure! + if ARGV.size == 0 Rails::Generators.help exit diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb index 82a658e2ed..c5e3ae3529 100755 --- a/railties/lib/rails/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb @@ -1,3 +1,6 @@ +require 'rails/generators' +Rails::Generators.configure! + if ARGV.size == 0 Rails::Generators.help exit diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index e552cc4520..2bcea4bc8f 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -123,8 +123,10 @@ module Rails::Generators end def create_script_files - directory "script" - chmod "script", 0755, :verbose => false + directory "script" do |file| + prepend_file file, "#{shebang}\n", :verbose => false + chmod file, 0755, :verbose => false + end end def create_test_files diff --git a/railties/lib/rails/generators/rails/app/templates/script/about b/railties/lib/rails/generators/rails/app/templates/script/about new file mode 100755 index 0000000000..93fd007649 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/about @@ -0,0 +1,3 @@ +require File.expand_path('../../config/environment', __FILE__) +$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" +require 'rails/commands/about' diff --git a/railties/lib/rails/generators/rails/app/templates/script/about.tt b/railties/lib/rails/generators/rails/app/templates/script/about.tt deleted file mode 100755 index 7639d4040f..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/about.tt +++ /dev/null @@ -1,4 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/environment', __FILE__) -$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" -require 'rails/commands/about' diff --git a/railties/lib/rails/generators/rails/app/templates/script/console b/railties/lib/rails/generators/rails/app/templates/script/console new file mode 100755 index 0000000000..20aa799d2f --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/console @@ -0,0 +1,2 @@ +require File.expand_path('../../config/application', __FILE__) +require 'rails/commands/console' diff --git a/railties/lib/rails/generators/rails/app/templates/script/console.tt b/railties/lib/rails/generators/rails/app/templates/script/console.tt deleted file mode 100755 index 1cd2eb8b53..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/console.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/application', __FILE__) -require 'rails/commands/console' diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole b/railties/lib/rails/generators/rails/app/templates/script/dbconsole new file mode 100755 index 0000000000..e6a1c59394 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/dbconsole @@ -0,0 +1,2 @@ +require File.expand_path('../../config/application', __FILE__) +require 'rails/commands/dbconsole' diff --git a/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt deleted file mode 100755 index 94beb13715..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/application', __FILE__) -require 'rails/commands/dbconsole' diff --git a/railties/lib/rails/generators/rails/app/templates/script/destroy b/railties/lib/rails/generators/rails/app/templates/script/destroy new file mode 100755 index 0000000000..adfa8e8426 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/destroy @@ -0,0 +1,2 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/commands/destroy' diff --git a/railties/lib/rails/generators/rails/app/templates/script/destroy.tt b/railties/lib/rails/generators/rails/app/templates/script/destroy.tt deleted file mode 100755 index 6adc90b2c3..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/destroy.tt +++ /dev/null @@ -1,5 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/environment', __FILE__) -require 'rails/generators' -Rails::Generators.configure! -require 'rails/commands/destroy' diff --git a/railties/lib/rails/generators/rails/app/templates/script/generate b/railties/lib/rails/generators/rails/app/templates/script/generate new file mode 100755 index 0000000000..6fb8ad0395 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/generate @@ -0,0 +1,2 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/commands/generate' diff --git a/railties/lib/rails/generators/rails/app/templates/script/generate.tt b/railties/lib/rails/generators/rails/app/templates/script/generate.tt deleted file mode 100755 index 71d47dec92..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/generate.tt +++ /dev/null @@ -1,5 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/environment', __FILE__) -require 'rails/generators' -Rails::Generators.configure! -require 'rails/commands/generate' diff --git a/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker new file mode 100755 index 0000000000..9647d8f10a --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker @@ -0,0 +1,2 @@ +require File.expand_path('../../../config/environment', __FILE__) +require 'rails/commands/performance/benchmarker' diff --git a/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt deleted file mode 100755 index 9ebc4c92fc..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/performance/benchmarker.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../../config/environment', __FILE__) -require 'rails/commands/performance/benchmarker' diff --git a/railties/lib/rails/generators/rails/app/templates/script/performance/profiler b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler new file mode 100755 index 0000000000..a5822042d2 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler @@ -0,0 +1,2 @@ +require File.expand_path('../../../config/environment', __FILE__) +require 'rails/commands/performance/profiler' diff --git a/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt b/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt deleted file mode 100755 index 5f4c763f9d..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/performance/profiler.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../../config/environment', __FILE__) -require 'rails/commands/performance/profiler' diff --git a/railties/lib/rails/generators/rails/app/templates/script/plugin b/railties/lib/rails/generators/rails/app/templates/script/plugin new file mode 100755 index 0000000000..1f1af6c880 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/plugin @@ -0,0 +1,2 @@ +require File.expand_path('../../config/application', __FILE__) +require 'rails/commands/plugin' diff --git a/railties/lib/rails/generators/rails/app/templates/script/plugin.tt b/railties/lib/rails/generators/rails/app/templates/script/plugin.tt deleted file mode 100755 index 4a335ee33c..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/plugin.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/application', __FILE__) -require 'rails/commands/plugin' diff --git a/railties/lib/rails/generators/rails/app/templates/script/runner b/railties/lib/rails/generators/rails/app/templates/script/runner new file mode 100755 index 0000000000..7a70828e90 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/runner @@ -0,0 +1,2 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/commands/runner' diff --git a/railties/lib/rails/generators/rails/app/templates/script/runner.tt b/railties/lib/rails/generators/rails/app/templates/script/runner.tt deleted file mode 100755 index 34ad7c18eb..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/runner.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/environment', __FILE__) -require 'rails/commands/runner' diff --git a/railties/lib/rails/generators/rails/app/templates/script/server b/railties/lib/rails/generators/rails/app/templates/script/server new file mode 100755 index 0000000000..a7aaee2953 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/script/server @@ -0,0 +1,2 @@ +require File.expand_path('../../config/application', __FILE__) +require 'rails/commands/server' diff --git a/railties/lib/rails/generators/rails/app/templates/script/server.tt b/railties/lib/rails/generators/rails/app/templates/script/server.tt deleted file mode 100755 index 932e72ea58..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/script/server.tt +++ /dev/null @@ -1,3 +0,0 @@ -<%= shebang %> -require File.expand_path('../../config/application', __FILE__) -require 'rails/commands/server' -- cgit v1.2.3