prepend module TaskInvoke to override Task#invoke, reenable.

not enq @already_finished tasks.
raise error when accessing undefined @wrapper.

bin/pwrake

@@ -22,6 +22,7 @@ class Rake::Application
 end
 class Rake::Task
   include Pwrake::TaskAlgorithm
+  prepend Pwrake::TaskInvoke
 end
 
 # does NOT exit when writing to broken pipe

lib/pwrake/master/master_application.rb

@@ -52,6 +52,10 @@ def invoke_task(task_string)
       @master.invoke(t,args)
     end
 
+    def invoke(t,*args)
+      @master.invoke(t,args)
+    end
+
     def standard_rake_options
       opts = super
       opts.each_with_index do |a,i|

lib/pwrake/task/task_algorithm.rb

@@ -5,12 +5,18 @@ module Pwrake
 
   module TaskAlgorithm
 
-    attr_reader :wrapper
     attr_reader :subsequents
     attr_reader :arguments
     attr_reader :property
     attr_reader :unfinished_prereq
 
+    def wrapper
+      if @wrapper.nil?
+        raise "TaskWrapper is not defined for #{self.class}[#{name}]"
+      end
+      @wrapper
+    end
+
     def pw_search_tasks(args)
       Log.debug "#{self.class}#pw_search_tasks start, args=#{args.inspect}"
       tm = Time.now
@@ -48,7 +54,7 @@ def search_with_call_chain(subseq, task_args, invocation_chain) # :nodoc:
             search_prerequisites(task_args, new_chain)
           end
           #check_and_enq
-          if @unfinished_prereq.empty?
+          if !@already_finished && @unfinished_prereq.empty?
             application.task_queue.enq(@wrapper)
           end
         end
@@ -87,7 +93,6 @@ def pw_enq_subsequents
       #application.task_queue.synchronize(h) do
         @subsequents.each do |t|        # <<--- competition !!!
           #u = t.unfinished_prereq.keys
-          #Log.debug "enq_subseq: self=#{self.name} subseq=#{t.name} @unfin_preq=#{u.inspect}"
           if t && t.check_prereq_finished(self.name)
             application.task_queue.enq(t.wrapper)
           end
@@ -98,13 +103,23 @@ def pw_enq_subsequents
 
     def check_prereq_finished(preq_name=nil)
       @unfinished_prereq.delete(preq_name)
-      @unfinished_prereq.empty?
+      !@already_finished && @unfinished_prereq.empty?
     end
 
     def pw_set_property(property)
       @property = property
       self
     end
 
+  end # TaskAlgorithm
+
+  module TaskInvoke
+    def invoke(*args)
+      Rake.application.invoke(self,*args)
+    end
+    def reenable
+      @already_invoked = false
+      @already_searched = false
+    end
   end
 end