Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/rake/task_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -302,16 +302,18 @@ def make_sources(task_name, task_pattern, extensions)
source == ext ? task_name.ext(ext) : source
when String, Symbol
ext.to_s
when Pathname
Rake.from_pathname(ext)
when Proc, Method
if ext.arity == 1
ext.call(task_name)
else
ext.call
end
else
fail "Don't know how to handle rule dependent: #{ext.inspect}"
if ext.respond_to?(:to_path)
Rake.from_pathname(ext)
else
fail "Don't know how to handle rule dependent: #{ext.inspect}"
end
end
}
result.flatten
Expand Down
14 changes: 14 additions & 0 deletions test/support/rakefile_definitions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,20 @@ def rakefile_chains
DEFAULT
end

def rakefile_rule_with_proc
rakefile <<~RAKEFILE
task :default => "play.app"

rule ".app" => [->(name) { name.ext(".scpt") }] do |t|
cp t.source, t.name
end

file 'play.scpt' do
touch 'play.scpt'
end
RAKEFILE
end

def rakefile_file_chains
rakefile <<~RAKEFILE
file "fileA" do |t|
Expand Down
9 changes: 9 additions & 0 deletions test/test_rake_functional.rb
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,15 @@ def test_rules_chaining_to_file_task
"'play.app' file should exist"
end

def test_rule_with_proc_prerequisite
rakefile_rule_with_proc

rake

assert File.exist?(File.join(@tempdir, "play.app")),
"'play.app' file should exist"
end

def dryrun_tasks
@err.split("\n").select { |line|
line.match(/^\*\* Execute/)
Expand Down