diff --git a/.gitignore b/.gitignore index d27351f37..697c62419 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ TAGS temp_* pkg x +*.patch +.#* diff --git a/Rakefile b/Rakefile index 1fb6587ae..0433b1584 100644 --- a/Rakefile +++ b/Rakefile @@ -216,7 +216,7 @@ else pkg.need_tar = true end - file "rake.gemspec" => "Rakefile" do |t| + file "rake.gemspec" => ["Rakefile", "lib/rake.rb"] do |t| require 'yaml' open(t.name, "w") { |f| f.puts SPEC.to_yaml } end diff --git a/lib/rake.rb b/lib/rake.rb index 5bc8e12d7..980c0119b 100755 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -2248,7 +2248,7 @@ def handle_options end # Similar to the regular Ruby +require+ command, but will check - # for .rake files in addition to .rb files. + # for *.rake files in addition to *.rb files. def rake_require(file_name, paths=$LOAD_PATH, loaded=$") return false if loaded.include?(file_name) paths.each do |path| diff --git a/test/session_functional.rb b/test/session_functional.rb index f5bbff592..aad5f2eeb 100644 --- a/test/session_functional.rb +++ b/test/session_functional.rb @@ -174,7 +174,7 @@ def test_dash_f_with_no_arg_foils_rakefile_lookup assert_match(/^TEST1$/, @out) end - def test_dot_rake_files_can_be_laoded_with_dash_r + def test_dot_rake_files_can_be_loaded_with_dash_r rake "-I test/data/rakelib -rtest2 -f" assert_match(/^TEST2$/, @out) end