From d1d4490a57413ff5cb7e8bd0274bb34c7da68d29 Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 29 Nov 2012 19:16:46 +0000 Subject: * lib/rake/*: Updated to rake 0.9.5 * test/rake/*: ditto. * NEWS: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rake/task.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/rake/task.rb') diff --git a/lib/rake/task.rb b/lib/rake/task.rb index afa1b6153d..ac0ce68c60 100644 --- a/lib/rake/task.rb +++ b/lib/rake/task.rb @@ -105,7 +105,7 @@ module Rake # Argument description (nil if none). def arg_description # :nodoc: - @arg_names ? "[#{(arg_names || []).join(',')}]" : nil + @arg_names ? "[#{arg_names.join(',')}]" : nil end # Name of arguments for this task. @@ -182,18 +182,19 @@ module Rake if application.options.always_multitask invoke_prerequisites_concurrently(task_args, invocation_chain) else - prerequisite_tasks.each { |prereq| - prereq_args = task_args.new_scope(prereq.arg_names) - prereq.invoke_with_call_chain(prereq_args, invocation_chain) + prerequisite_tasks.each { |p| + prereq_args = task_args.new_scope(p.arg_names) + p.invoke_with_call_chain(prereq_args, invocation_chain) } end end # Invoke all the prerequisites of a task in parallel. - def invoke_prerequisites_concurrently(args, invocation_chain) # :nodoc: - futures = @prerequisites.collect do |p| + def invoke_prerequisites_concurrently(task_args, invocation_chain) # :nodoc: + futures = prerequisite_tasks.collect do |p| + prereq_args = task_args.new_scope(p.arg_names) application.thread_pool.future(p) do |r| - application[r, @scope].invoke_with_call_chain(args, invocation_chain) + r.invoke_with_call_chain(prereq_args, invocation_chain) end end futures.each { |f| f.value } -- cgit v1.2.3