rukawa 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd835345eb1c1841c6dd7d6a907287eea0e359d6
-  data.tar.gz: 48eecf5784e84b8061edc309a657458567ea0743
+  metadata.gz: 3708a96687aab4647f068cda298ad49619ae352d
+  data.tar.gz: 27ac524cfb1eeb05a479e93e6f433a17a6498842
 SHA512:
-  metadata.gz: 07caf395ab5d616dc6803fbb6da39465465aaa6bf295900792c4643721328b5f531abfe3b3e01a31dc8853aa4e11e7b19fdf254177ae8112ee2d8b0a66a723ba
-  data.tar.gz: 1b77d69131e8fc808294a7ef2e814b649c995a56a78e8422d6866127ad9bd229b9137ab4dea8a3bc645d4c05b885e5e7a2d0952d06731d3e9804d5cfa309c36b
+  metadata.gz: ad83b7c946d04cccfee6e16b3ac6b30d7421e361ece92287d0de503f380d1c9bda1e88b087f750b8cb994f0aca007e113008d028110f2ef959073277ef0fcd7a
+  data.tar.gz: 51aae209a567c73ce9fa031e91423c37facd25f93829d1c08a1467b73561d238a4fbbe9f56f3d85718d1586d57309d3ab5cac0cc2dfcba0afad0faef56a2f087

data/lib/rukawa/abstract_job.rb

@@ -42,15 +42,16 @@ module Rukawa
     end
 
     def formatted_elapsed_time_from(time = Time.now)
-      sec = elapsed_time_from(time)
-      return "N/A" unless sec
+      elapsed = elapsed_time_from(time)
+      return "N/A" unless elapsed
 
-      hour = sec.to_i / 3600
-      min = sec.to_i / 60
+      hour = elapsed.to_i / 3600
+      min = elapsed.to_i / 60
+      sec = (elapsed - hour * 3600 - min * 60).to_i
 
       hour_format = min > 0 ? "%dh " % hour : ""
       min_format = min > 0 ? "%dm " % min : ""
-      sec_format = "#{sec.to_i}s"
+      sec_format = "#{sec}s"
       "#{hour_format}#{min_format}#{sec_format}"
     end
   end

data/lib/rukawa/dag.rb

@@ -11,6 +11,7 @@ module Rukawa
     def initialize
       @nodes = Set.new
       @jobs = Set.new
+      @start_jobs = Set.new
       @edges = Set.new
     end
 
@@ -21,6 +22,7 @@ module Rukawa
         job = job_class.new(job_net)
         @nodes << job
         @jobs << job if job.is_a?(Job)
+        @start_jobs << job if job.is_a?(Job) && dependencies[job_class].empty?
 
         dependencies[job_class].each do |depend_job_class|
           depend_job = @nodes.find { |j| j.instance_of?(depend_job_class) }
@@ -67,6 +69,32 @@ module Rukawa
       end
     end
 
+    def leveled_each
+      visited = Set.new
+      queue = []
+      queue.push(*@start_jobs)
+
+      if block_given?
+        until queue.empty?
+          next_job = queue.shift
+          yield next_job unless visited.include?(next_job)
+          queue.push(*next_job.out_goings.map(&:to)) if visited.add?(next_job)
+        end
+      else
+        Enumerator.new do |y|
+          until queue.empty?
+            next_job = queue.shift
+            y << next_job unless visited.include?(next_job)
+            queue.push(*next_job.out_goings.map(&:to)) if visited.add?(next_job)
+          end
+        end
+      end
+    end
+
+    def start_jobs
+      @start_jobs
+    end
+
     private
 
     def tsortable_hash(hash)

data/lib/rukawa/job_net.rb

@@ -49,7 +49,7 @@ module Rukawa
     end
 
     def dataflows
-      @dag.tsort.reverse.map(&:dataflow)
+      @dag.leveled_each.map(&:dataflow)
     end
 
     def state

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - joker1007