Skip to content

Commit

Permalink
Misc changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jimweirich committed Aug 30, 2008
1 parent fa2e26f commit bc08e77
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -2,3 +2,5 @@ TAGS
temp_*
pkg
x
*.patch
.#*
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/rake.rb
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion test/session_functional.rb
Expand Up @@ -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
Expand Down

0 comments on commit bc08e77

Please sign in to comment.