dake 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6015ab5226665506052c97193879c5747c726924fe1a0706ed68d26e6616e067
-  data.tar.gz: 9566fa629a716eede2f11277c7cdc40c009377e33ae84c05261ec28c433821e3
+  metadata.gz: e5cbfb1274b657c4a5e7c998d196af197ecbe2efe4ff8f48131a99220d5a76e3
+  data.tar.gz: 5f58940173637dc3e4733f2cb242d88b4a2e3080054108101831576890648c10
 SHA512:
-  metadata.gz: 3f53b15a4c8edf2f1559f1c45f573762393652f2fd924c61c834d76a092acb37dce1b22efef07f58b34eeb7f8e272d14a40997bd7b7b44b0e62a7cc7129bb1ef
-  data.tar.gz: d2516d0cf223c38b599ca96beb37fc3f4d87e68dd04772313255d669eb3ccfe6f3f97740a6910e1268259a6f3db1a73875998082bbdc5bdbb164b52e86e42c73
+  metadata.gz: 78aa071f1564255a83ac88c241b2ea3756ef63abbd65f201d918d580e1cd81ae2ae56065801fa1808cfd62e642f7aacbabcecca48e9f74689793451acf6e0e3e
+  data.tar.gz: e121ff5e715686e55d2922d16df895359b516809402b54223175b7c5c65245d9bdaa53496156aac5ccc9d9054b7ec135b5a71ccacc46486ceacb6ece01cd2efe

data/lib/dake/executor.rb

@@ -43,7 +43,7 @@ class DakeExecutor
       end
 
       lock = Concurrent::ReadWriteLock.new
-      @dep_graph.leaf_step.each { |step| queue << step if rebuild_set.include? step }
+      rebuild_set.each { |step| queue << step if @dep_graph.dep_step[step].all? { |dep| not rebuild_set.include? dep} }
 
       while next_step = queue.deq
         @pool.post(next_step) do |step|

data/lib/dake/resolver.rb

@@ -2,12 +2,12 @@
 # note that this is not nessesarily the complete graph,
 # the graph is only used to produce the given targets
 DepGraph = Struct.new(
-    :succ_step,    # a dict maps each step in the DepGraph to the steps depend on it
-    :dep_step,     # a dict maps each step in the DepGraph to the steps it depends on
-    :step_list,    # a list of steps represents one sequential execution order
-    :root_step,    # a set of steps that hos no dependant
-    :leaf_step,    # a set of steps that has no prerequisite
-    :step_target   # a dict maps each step in the DepGraph to its output files used while resolving targets
+    :succ_step,   # a dict maps each step in the DepGraph to the steps depend on it
+    :dep_step,    # a dict maps each step in the DepGraph to the steps it depends on
+    :step_list,   # a list of steps represents one sequential execution order
+    :root_step,   # a set of steps that hos no dependant
+    :step_prereq, # a dict maps step to its prerequisite which has no corresponding step
+    :step_target  # a dict maps each step in the DepGraph to its output files used while resolving targets
 )
 
 class DakeResolver
@@ -57,8 +57,8 @@ class DakeResolver
           else
             stack.pop
 
-            if dep_graph.leaf_step.include? step
-              step.prerequisites.each do |prereq|
+            if dep_graph.step_prereq[step]
+              dep_graph.step_prereq[step].each do |prereq|
                 if prereq.flag != '?' and not prereq.scheme.exist?
                   raise "No step found for building file `#{prereq.scheme.path}'."
                 end
@@ -70,14 +70,10 @@ class DakeResolver
             end
 
             if target_opts.build_mode == :check and (up_tree_steps.include? step or down_tree_steps.include? step)
-              if dep_graph.leaf_step.include? step
-                need_rebuild << step if need_execute?(dep_graph.step_target[step], step)
+              if dep_graph.dep_step[step].any? { |dep_step| need_rebuild.include? dep_step }
+                need_rebuild << step
               else
-                if dep_graph.dep_step[step].any? { |dep_step| need_rebuild.include? dep_step }
-                  need_rebuild << step
-                else
-                  need_rebuild << step if need_execute?(dep_graph.step_target[step], step)
-                end
+                need_rebuild << step if need_execute?(dep_graph.step_target[step], step)
               end
             end
 
@@ -239,12 +235,12 @@ class DakeResolver
     step_list = []
     visited = Set.new
     path_visited = Set.new
-    leaf_steps = Set.new
     target_steps = Set.new
     succ_step_dict = {}
     dep_step_dict = {}
     dep_step_list = {}
     succ_target_dict = {}
+    step_prereq_dict = {}
 
     target_pairs.each do |target_name, target_opts|
       if target_opts.tag
@@ -275,6 +271,10 @@ class DakeResolver
           step.prerequisites.map! { |file| @analyzer.analyze_file(file, :prerequisites, step) }.flatten!
           step.prerequisites.each do |dep|
             dep_steps = find_steps(dep.scheme, dep.tag)
+            if dep_steps.empty?
+              step_prereq_dict[step] ||= Set.new
+              step_prereq_dict[step] << dep
+            end
             dep_steps.each do |dep_step|
               dep_step_dict[step] << dep_step
               succ_step_dict[dep_step] ||= Set.new
@@ -302,11 +302,10 @@ class DakeResolver
           stack.pop
           path_visited.delete step
           step_list << step
-          leaf_steps << step if dep_step_dict[step].empty?
         end
       end
     end
     root_steps = target_steps.select { |step| succ_step_dict[step].empty? }.to_set
-    DepGraph.new(succ_step_dict, dep_step_dict, step_list, root_steps, leaf_steps, succ_target_dict)
+    DepGraph.new(succ_step_dict, dep_step_dict, step_list, root_steps, step_prereq_dict, succ_target_dict)
   end
 end

data/lib/dake/version.rb

@@ -1,3 +1,3 @@
 module Dake
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dake
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - minor6th
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler