rukawa 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e06e9e3a6f053f844f030ddbdd6d41b740ae4565
-  data.tar.gz: a6cefb0f982de9eb9b26407d364394e87183204b
+  metadata.gz: a389842b98a975ff2ed0ee853e8ffff2bd4e4a70
+  data.tar.gz: c9771aba374409856f6970c9facc5a6c2fcc168e
 SHA512:
-  metadata.gz: 876ed17a6dcc459f8b97ceda257d79c33e99fade9d16edf7c7ef8e11cf715c1f7f3619e3b1cac0045616a6109fe1edf1b89fce6f2d221b1d957458e84be6db40
-  data.tar.gz: f1b491287e0541225161fe018115c0c8a1cf148c72f58e35e92eb6c32308c8fb6cef6e119a2814360d4f22112e55e10334fc3e17ef66acd4ecdbdbee05f53349
+  metadata.gz: 7121c4dab817fcdd3c08e669a03336eb34ba6bd6f1550a7c1a3c37f91133b5af6143a513cec690ef0149f2aea871ab7157c56dbe7de551a5a2c55c90ce8b2a30
+  data.tar.gz: b011617ab7508d79e5db4bb62fe65691301434b33894f4b5fb8fcc8ae105853b24ac20ac793ce774f8a377948545362cac7b81adfd16880d7b688cf71482c54f

data/README.md

@@ -1,4 +1,5 @@
 # Rukawa
+[![Gem Version](https://badge.fury.io/rb/rukawa.svg)](https://badge.fury.io/rb/rukawa)
 [![Build Status](https://travis-ci.org/joker1007/rukawa.svg?branch=master)](https://travis-ci.org/joker1007/rukawa)
 [![Code Climate](https://codeclimate.com/github/joker1007/rukawa/badges/gpa.svg)](https://codeclimate.com/github/joker1007/rukawa)
 
@@ -28,112 +29,13 @@ Or install it yourself as:
 
 ### Job Definition
 
-```rb
-# jobs/sample_job.rb
-
-module ExecuteLog
-  def self.store
-    @store ||= {}
-  end
-end
-
-class SampleJob < Rukawa::Job
-  def run
-    sleep rand(5)
-    ExecuteLog.store[self.class] = Time.now
-  end
-end
-
-class Job1 < SampleJob
-end
-class Job2 < SampleJob
-end
-class Job3 < SampleJob
-end
-class Job4 < SampleJob
-end
-class Job5 < SampleJob
-  def run
-    raise "job5 error"
-  end
-end
-class Job6 < SampleJob
-end
-class Job7 < SampleJob
-end
-class Job8 < SampleJob
-end
-
-class InnerJob1 < SampleJob
-end
-
-class InnerJob2 < SampleJob
-  def run
-    raise "inner job2 error"
-  end
-end
-
-class InnerJob3 < SampleJob
-end
-
-class InnerJob4 < SampleJob
-end
-
-class InnerJob5 < SampleJob
-  add_skip_rule ->(job) { job.is_a?(SampleJob) }
-end
-
-class InnerJob6 < SampleJob
-end
-```
+See [sample/jobs/sample_job.rb](https://github.com/joker1007/rukawa/blob/master/sample/jobs/sample_job.rb).
 
 ### JobNet Definition
-```rb
-# job_nets/sample_job_net.rb
-
-class InnerJobNet < Rukawa::JobNet
-  class << self
-    def dependencies
-      {
-        InnerJob3 => [],
-        InnerJob1 => [],
-        InnerJob2 => [InnerJob1, InnerJob3],
-      }
-    end
-  end
-end
-
-class InnerJobNet2 < Rukawa::JobNet
-  class << self
-    def dependencies
-      {
-        InnerJob4 => [],
-        InnerJob5 => [],
-        InnerJob6 => [InnerJob4, InnerJob5],
-      }
-    end
-  end
-end
-
-class SampleJobNet < Rukawa::JobNet
-  class << self
-    def dependencies
-      {
-        Job1 => [],
-        Job2 => [Job1], Job3 => [Job1],
-        Job4 => [Job2, Job3],
-        InnerJobNet => [Job3],
-        Job8 => [InnerJobNet],
-        Job5 => [Job3],
-        Job6 => [Job4, Job5],
-        Job7 => [Job6],
-        InnerJobNet2 => [Job4],
-      }
-    end
-  end
-end
-```
 
+See [sample/job_nets/sample_job_net.rb](https://github.com/joker1007/rukawa/blob/master/sample/job_nets/sample_job_net.rb).
+
+### JobGraph
 ![jobnet.png](https://raw.githubusercontent.com/joker1007/rukawa/master/sample/jobnet.png)
 
 ### Execution
@@ -142,7 +44,7 @@ end
 % cd rukawa/sample
 
 # load ./jobs/**/*.rb, ./job_net/**/*.rb automatically
-% bundle exec rukawa run SampleJobNet -r 5 -d result.dot
+% bundle exec rukawa run SampleJobNet -r 1 -d result.dot
 +--------------+---------+
 | Job          | Status  |
 +--------------+---------+

data/lib/rukawa/cli.rb

@@ -20,7 +20,7 @@ module Rukawa
       load_job_definitions
 
       job_net_class = Object.const_get(job_net_name)
-      job_net = job_net_class.new(options[:variables])
+      job_net = job_net_class.new(nil, options[:variables])
       result = Runner.run(job_net, options[:batch], options[:refresh_interval])
 
       if options[:dot]
@@ -37,7 +37,7 @@ module Rukawa
       load_job_definitions
 
       job_net_class = Object.const_get(job_net_name)
-      job_net = job_net_class.new(options[:variables])
+      job_net = job_net_class.new(nil, options[:variables])
       job_net.output_dot(options[:output])
     end
 

data/lib/rukawa/dag.rb

@@ -18,13 +18,11 @@ module Rukawa
         dependencies[job_class].each do |depend_job_class|
           depend_job = @jobs.find { |j| j.instance_of?(depend_job_class) }
 
-          depend_job.nodes_as_from.each do |from|
-            job.nodes_as_to.each do |to|
-              edge = Edge.new(from, to)
-              @edges << edge
-              from.out_goings << edge
-              to.in_comings << edge
-            end
+          depend_job.nodes_as_from.product(job.nodes_as_to).each do |from, to|
+            edge = Edge.new(from, to, job_net)
+            @edges << edge
+            from.out_goings << edge
+            to.in_comings << edge
           end
         end
       end

data/lib/rukawa/job.rb

@@ -6,7 +6,7 @@ module Rukawa
     attr_accessor :in_comings, :out_goings
     attr_reader :state
 
-    def initialize(job_net)
+    def initialize(job_net, variables = {})
       @job_net = job_net
       @in_comings = Set.new
       @out_goings = Set.new
@@ -14,11 +14,11 @@ module Rukawa
     end
 
     def root?
-      in_comings.empty?
+      in_comings.select { |edge| edge.cluster == @job_net }.empty?
     end
 
     def leaf?
-      out_goings.empty?
+      out_goings.select { |edge| edge.cluster == @job_net }.empty?
     end
 
     def dataflow
@@ -58,9 +58,9 @@ module Rukawa
 
     def to_dot_def
       if state == Rukawa::State::Waiting
-        ""
+        "#{name};\n"
       else
-        "#{name} [color = #{state.color}];\n" unless state == Rukawa::State::Waiting
+        "#{name} [color = #{state.color}];\n"
       end
     end
 

data/lib/rukawa/job_net.rb

@@ -11,7 +11,7 @@ module Rukawa
       end
     end
 
-    def initialize(variables = {})
+    def initialize(_job_net, variables = {})
       @variables = variables
       @dag = Dag.new(self, self.class.dependencies)
     end

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/sample/job_nets/sample_job_net.rb

@@ -15,13 +15,38 @@ class InnerJobNet2 < Rukawa::JobNet
     def dependencies
       {
         InnerJob4 => [],
-        InnerJob5 => [],
+        InnerJob5 => [InnerJob4],
         InnerJob6 => [InnerJob4, InnerJob5],
       }
     end
   end
 end
 
+class InnerJobNet3 < Rukawa::JobNet
+  class << self
+    def dependencies
+      {
+        InnerJob7 => [],
+        InnerJob8 => [],
+        InnerJob9 => [InnerJob7, InnerJob8],
+        InnerJob10 => [InnerJob7, InnerJob8],
+      }
+    end
+  end
+end
+
+class InnerJobNet4 < Rukawa::JobNet
+  class << self
+    def dependencies
+      {
+        InnerJob11 => [],
+        InnerJob12 => [],
+        InnerJob13 => [],
+      }
+    end
+  end
+end
+
 class SampleJobNet < Rukawa::JobNet
   class << self
     def dependencies
@@ -35,6 +60,8 @@ class SampleJobNet < Rukawa::JobNet
         Job6 => [Job4, Job5],
         Job7 => [Job6],
         InnerJobNet2 => [Job4],
+        InnerJobNet3 => [Job8, Job7],
+        InnerJobNet4 => [InnerJobNet3],
       }
     end
   end

data/sample/jobs/sample_job.rb

@@ -52,3 +52,24 @@ end
 
 class InnerJob6 < SampleJob
 end
+
+class InnerJob7 < SampleJob
+end
+
+class InnerJob8 < SampleJob
+end
+
+class InnerJob9 < SampleJob
+end
+
+class InnerJob10 < SampleJob
+end
+
+class InnerJob11 < SampleJob
+end
+
+class InnerJob12 < SampleJob
+end
+
+class InnerJob13 < SampleJob
+end

metadata

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