pwrake 0.9.3 → 0.9.4

data/lib/pwrake/application.rb

@@ -29,16 +29,21 @@ module Pwrake
       @master.pwrake_options
     end
 
+    def start_worker
+      @master.start
+    end
 
     # Run the Pwrake application.
     def run
       standard_exception_handling do
-        @master = Master.new
         init("pwrake")
-        @master.init
+        @master = Master.new
         load_rakefile
-        @master.setup
-        top_level
+        begin
+          top_level
+        ensure
+          @master.finish
+        end
       end
     end
 
@@ -50,12 +55,7 @@ module Pwrake
         elsif options.show_prereqs
           display_prerequisites
         else
-          begin
-            @master.start
-            top_level_tasks.each { |task_name| invoke_task(task_name) }
-          ensure
-            @master.finish
-          end
+          top_level_tasks.each { |task_name| invoke_task(task_name) }
         end
       end
     end

data/lib/pwrake/master.rb

@@ -18,18 +18,13 @@ module Pwrake
     attr_reader :shell_set
 
     def initialize
-    end
-
-    def init
-      init_option   # Pwrake::Option
-    end
-
-    def setup
+      init_option    # Pwrake::Option
       setup_option   # Pwrake::Option
+      @started = false
     end
 
     def start
-      @counter = Counter.new
+      return if @task_queue
       @task_queue = @queue_class.new(@core_list)
       @task_queue.enable_steal = !Rake.application.options.disable_steal
       @shell_set = []
@@ -42,8 +37,8 @@ module Pwrake
     def finish
       Log.debug "-- Master#finish called"
       @task_queue.finish if @task_queue
-      @threads.each{|t| t.join }
-      @counter.print
+      @threads.each{|t| t.join } if @threads
+      @counter.print if @counter
       finish_option   # Pwrake::Option
     end
 

data/lib/pwrake/task_algorithm.rb

@@ -15,6 +15,7 @@ module Pwrake
 
 
     def invoke_modify(*args)
+      application.start_worker
       task_args = TaskArguments.new(arg_names, args)
       flag = application.pwrake_options['HALT_QUEUE_WHILE_SEARCH']
       start_time = Time.now
@@ -26,6 +27,7 @@ module Pwrake
         search_with_call_chain(self, task_args, InvocationChain::EMPTY)
       end
       Log.info "-- search_tasks %.6fs" % (Time.now-start_time)
+      return if @already_invoked
 
       if conn = Pwrake.current_shell
         @waiting_thread = nil

data/lib/pwrake/task_queue.rb

@@ -36,10 +36,10 @@ module Pwrake
 
     def enq_synchronize
       if @halt
-        yield
+        ret = yield
       else
         @mutex.synchronize do
-          yield
+          ret = yield
           enq_finish
         end
         @cv.broadcast
@@ -48,6 +48,7 @@ module Pwrake
         Log.debug "--- run #{th}";
         th.run
       end
+      ret
     end
 
     def enq_finish

data/lib/pwrake/version.rb

@@ -1,3 +1,3 @@
 module Pwrake
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/010/Rakefile

@@ -0,0 +1,3 @@
+task :default do
+  sh "echo OK"
+end.invoke

data/spec/pwrake_spec.rb

@@ -80,4 +80,9 @@ describe Helper do
     its(:n_files) { should eq 3 }
   end
 
+  context "dir=010 invoke in Rakefile" do
+    subject { Helper.new("010").run }
+    it { should be_success }
+  end
+
 end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pwrake
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 3
-  version: 0.9.3
 platform: ruby
-authors: 
+authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-26 00:00:00 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Parallel workflow extension for Rake
-email: 
+email:
 - masa16.tanaka@gmail.com
-executables: 
+executables:
 - pwrake
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -65,43 +56,35 @@ files:
 - spec/008/pwrake_conf.yaml
 - spec/009/Rakefile
 - spec/009/pwrake_conf.yaml
+- spec/010/Rakefile
 - spec/helper.rb
 - spec/hosts
 - spec/pwrake_spec.rb
 homepage: http://masa16.github.com/pwrake
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adding Parallel and Distributed feature to Rake
-test_files: 
+test_files:
 - spec/001/Rakefile
 - spec/002/Rakefile
 - spec/003/Rakefile
@@ -114,6 +97,7 @@ test_files:
 - spec/008/pwrake_conf.yaml
 - spec/009/Rakefile
 - spec/009/pwrake_conf.yaml
+- spec/010/Rakefile
 - spec/helper.rb
 - spec/hosts
 - spec/pwrake_spec.rb