autobuild 1.7.12.rc5 → 1.7.12.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4395f370d1e1c38b7e5b47ee51c44c21c4cf50
-  data.tar.gz: 2fbb94fa41c844eb6f883c89e82707bd5d11cee9
+  metadata.gz: 2adc58accd29a554c2853a23fe117ea15e021263
+  data.tar.gz: f5c20d74ad6ab876b0f20e0edd3f4a6137cac1c3
 SHA512:
-  metadata.gz: ffc19e8cf7505968892cbb0428f4e24bc4bd77c29cb5e9b6837e23fab111ab8ad1c53fffd2560a47d475f8e8d142f176c249939bb8dbf3b9ccf5b0d759de993b
-  data.tar.gz: 2084cca9a550f9176f793f22a96040ce1cc0ba0be484d8463f6593b9c810fe160a094079081bb8b62f0bf832852b070b463e5390f7372bf82de70032639495a0
+  metadata.gz: cb1d9df085fee0ee0e9b1fcf89497d57c09b2be06ef3559725f54135b367f9b468a2332078fb0246969218b2e533af7ef824cb9fd9354009055eeb22f212369e
+  data.tar.gz: c01f8ded6b0a6ab6a5bb15e7c96c5515ddf6802ec9c1b1c9f99a8a16310ed06203d160a1e6d5ae24cd4adbc743e377dc4f57150e61ccbff19d3ad75902dca511

data/lib/autobuild/package.rb

@@ -476,6 +476,7 @@ module Autobuild
         # and installed.
 	def depends_on(*packages)
 	    packages.each do |p|
+                p = p.name if p.respond_to?(:name)
                 raise ArgumentError, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name

data/lib/autobuild/parallel.rb

@@ -79,14 +79,14 @@ module Autobuild
             attr_reader :reverse_dependencies
             attr_reader :processed
             attr_reader :started_packages
-            attr_reader :active_packages
+            attr_reader :active_tasks
             attr_reader :queue
             attr_reader :priorities
 
             def initialize(reverse_dependencies)
                 @reverse_dependencies = reverse_dependencies
                 @processed = Set.new
-                @active_packages = Set.new
+                @active_tasks = Set.new
                 @priorities = Hash.new
                 @started_packages = Hash.new
                 @queue = Hash.new
@@ -94,7 +94,8 @@ module Autobuild
 
             def push(task, base_priority = 1)
                 if task.respond_to?(:package)
-                    queue[task] = started_packages[task.package] || base_priority
+                    started_packages[task.package] ||= -started_packages.size
+                    queue[task] = started_packages[task.package]
                 else queue[task] = base_priority
                 end
             end
@@ -113,25 +114,32 @@ module Autobuild
             end
 
             def mark_as_active(pending_task)
-                if pending_task.respond_to?(:package) && !pending_task.kind_of?(Autobuild::SourceTreeTask)
-                    active_packages << pending_task.package
-                    started_packages[pending_task.package] ||= -started_packages.size
-                end
+                active_tasks << pending_task
+            end
+
+            def active_task?(task)
+                active_tasks.include?(task)
             end
 
             def ready?(task)
                 task.prerequisite_tasks.all? do |t|
-                    t.already_invoked?
+                    already_processed?(t)
                 end
             end
 
+            def already_processed?(task)
+                task.already_invoked? && !active_task?(task)
+            end
+
+            def needs_processing?(task)
+                !task.already_invoked? && !active_task?(task)
+            end
+
             def process_finished_task(task)
-                if task.respond_to?(:package)
-                    active_packages.delete(task.package)
-                end
+                active_tasks.delete(task)
                 processed << task
                 reverse_dependencies[task].each do |candidate|
-                    if !candidate.already_invoked? && ready?(candidate)
+                    if needs_processing?(candidate) && ready?(candidate)
                         push(candidate, priorities[task])
                     end
                 end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.12.rc5" unless defined? Autobuild::VERSION
+    VERSION = "1.7.12.rc6" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.12.rc5
+  version: 1.7.12.rc6
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake