From cb1570936d70d624f72229c8a19ffbe3a10cc5ca Mon Sep 17 00:00:00 2001 From: raggi Date: Thu, 25 Nov 2010 04:03:04 +0800 Subject: [PATCH] Rakefiles are executables, and rake loads rake, not rakefile code --- Rakefile | 2 +- actionmailer/Rakefile | 2 +- actionpack/Rakefile | 2 +- activemodel/Rakefile | 0 activerecord/Rakefile | 2 +- activeresource/Rakefile | 2 +- activesupport/Rakefile | 0 railties/Rakefile | 2 +- railties/lib/rails/generators/rails/app/templates/Rakefile | 2 +- .../lib/rails/generators/rails/plugin/templates/Rakefile.tt | 2 +- .../lib/rails/generators/rails/plugin_new/templates/Rakefile | 4 +--- 11 files changed, 9 insertions(+), 11 deletions(-) mode change 100644 => 100755 Rakefile mode change 100644 => 100755 actionmailer/Rakefile mode change 100644 => 100755 actionpack/Rakefile mode change 100644 => 100755 activemodel/Rakefile mode change 100644 => 100755 activerecord/Rakefile mode change 100644 => 100755 activeresource/Rakefile mode change 100644 => 100755 activesupport/Rakefile mode change 100644 => 100755 railties/Rakefile mode change 100644 => 100755 railties/lib/rails/generators/rails/app/templates/Rakefile mode change 100644 => 100755 railties/lib/rails/generators/rails/plugin_new/templates/Rakefile diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index 8c72312f28..1f3c770c77 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ +#!/usr/bin/env rake gem 'rdoc', '>= 2.5.10' require 'rdoc' -require 'rake' require 'rdoc/task' require 'net/http' diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile old mode 100644 new mode 100755 index cba6e93c8a..123ef9bbbf --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/packagetask' require 'rake/gempackagetask' diff --git a/actionpack/Rakefile b/actionpack/Rakefile old mode 100644 new mode 100755 index a6ce08113f..9030db9f7a --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/packagetask' require 'rake/gempackagetask' diff --git a/activemodel/Rakefile b/activemodel/Rakefile old mode 100644 new mode 100755 diff --git a/activerecord/Rakefile b/activerecord/Rakefile old mode 100644 new mode 100755 index 395c72dfbc..f9b77c1799 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/packagetask' require 'rake/gempackagetask' diff --git a/activeresource/Rakefile b/activeresource/Rakefile old mode 100644 new mode 100755 index 905241acc0..cf01bc1389 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/packagetask' require 'rake/gempackagetask' diff --git a/activesupport/Rakefile b/activesupport/Rakefile old mode 100644 new mode 100755 diff --git a/railties/Rakefile b/railties/Rakefile old mode 100644 new mode 100755 index 9504661c0e..5137bee761 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/gempackagetask' diff --git a/railties/lib/rails/generators/rails/app/templates/Rakefile b/railties/lib/rails/generators/rails/app/templates/Rakefile old mode 100644 new mode 100755 index d83cafc3be..4dc1023f1f --- a/railties/lib/rails/generators/rails/app/templates/Rakefile +++ b/railties/lib/rails/generators/rails/app/templates/Rakefile @@ -1,7 +1,7 @@ +#!/usr/bin/env rake # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/application', __FILE__) -require 'rake' <%= app_const %>.load_tasks diff --git a/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt b/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt index 733e321c94..77149ae351 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt +++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt @@ -1,4 +1,4 @@ -require 'rake' +#!/usr/bin/env rake require 'rake/testtask' require 'rake/rdoctask' diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile old mode 100644 new mode 100755 index 88f50f9f04..12350309bf --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -1,12 +1,10 @@ -# encoding: UTF-8 -require 'rubygems' +#!/usr/bin/env rake begin require 'bundler/setup' rescue LoadError puts 'You must `gem install bundler` and `bundle install` to run rake tasks' end -require 'rake' require 'rake/rdoctask' Rake::RDocTask.new(:rdoc) do |rdoc|