rukawa 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999a3ff79a503ecea000dd2bed167c22a449f8cf
-  data.tar.gz: 4fc79536e34bbe56be38e7761634ffaff46fa388
+  metadata.gz: cd835345eb1c1841c6dd7d6a907287eea0e359d6
+  data.tar.gz: 48eecf5784e84b8061edc309a657458567ea0743
 SHA512:
-  metadata.gz: d5cf437492c3461a218b817834fbd0d50cdcb613b06a587b5770458acd18fc0945f1640cd19447eacae2357003a1e371a605f77f7646c6032596b4ed7fdcc10e
-  data.tar.gz: b0c0649300511b87a1afe1d9ba04fbb2084169c718fdef5ef0f322333a7881204ff082717b871d495fd34f1f0da123c165d85213bd2f9dc29dc018dc169638ce
+  metadata.gz: 07caf395ab5d616dc6803fbb6da39465465aaa6bf295900792c4643721328b5f531abfe3b3e01a31dc8853aa4e11e7b19fdf254177ae8112ee2d8b0a66a723ba
+  data.tar.gz: 1b77d69131e8fc808294a7ef2e814b649c995a56a78e8422d6866127ad9bd229b9137ab4dea8a3bc645d4c05b885e5e7a2d0952d06731d3e9804d5cfa309c36b

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+-r power_assert

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/joker1007/rukawa.png?label=ready&title=Ready)](https://waffle.io/joker1007/rukawa)
 # 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)
@@ -44,67 +45,71 @@ See [sample/job_nets/sample_job_net.rb](https://github.com/joker1007/rukawa/blob
 % cd rukawa/sample
 
 # load ./jobs/**/*.rb, ./job_net/**/*.rb automatically
-% bundle exec rukawa run SampleJobNet -r 1 -d result.dot
-+--------------+---------+
-| Job          | Status  |
-+--------------+---------+
-| Job1         | waiting |
-| Job2         | waiting |
-| Job3         | waiting |
-| Job4         | waiting |
-| InnerJobNet  | waiting |
-|   InnerJob3  | waiting |
-|   InnerJob1  | waiting |
-|   InnerJob2  | waiting |
-| Job8         | waiting |
-| Job5         | waiting |
-| Job6         | waiting |
-| Job7         | waiting |
-| InnerJobNet2 | waiting |
-|   InnerJob4  | waiting |
-|   InnerJob5  | waiting |
-|   InnerJob6  | waiting |
-+--------------+---------+
-+--------------+----------+
-| Job          | Status   |
-+--------------+----------+
-| Job1         | finished |
-| Job2         | finished |
-| Job3         | finished |
-| Job4         | finished |
-| InnerJobNet  | running  |
-|   InnerJob3  | running  |
-|   InnerJob1  | running  |
-|   InnerJob2  | waiting  |
-| Job8         | waiting  |
-| Job5         | error    |
-| Job6         | error    |
-| Job7         | error    |
-| InnerJobNet2 | running  |
-|   InnerJob4  | running  |
-|   InnerJob5  | skipped  |
-|   InnerJob6  | waiting  |
-+--------------+----------+
-+--------------+----------+
-| Job          | Status   |
-+--------------+----------+
-| Job1         | finished |
-| Job2         | finished |
-| Job3         | finished |
-| Job4         | finished |
-| InnerJobNet  | error    |
-|   InnerJob3  | finished |
-|   InnerJob1  | finished |
-|   InnerJob2  | error    |
-| Job8         | error    |
-| Job5         | error    |
-| Job6         | error    |
-| Job7         | error    |
-| InnerJobNet2 | finished |
-|   InnerJob4  | finished |
-|   InnerJob5  | skipped  |
-|   InnerJob6  | skipped  |
-+--------------+----------+
+% bundle exec rukawa run SampleJobNet -r 10 -c 10
++----------------+----------+
+| Job            | Status   |
++----------------+----------+
+| Job1           | finished |
+| Job2           | waiting  |
+| Job3           | waiting  |
+| Job4           | waiting  |
+| InnerJobNet    | waiting  |
+|   InnerJob3    | waiting  |
+|   InnerJob1    | waiting  |
+|   InnerJob2    | waiting  |
+| Job8           | waiting  |
+| Job5           | waiting  |
+| Job6           | waiting  |
+| Job7           | waiting  |
+| InnerJobNet2   | waiting  |
+|   InnerJob4    | waiting  |
+|   InnerJob5    | waiting  |
+|   InnerJob6    | waiting  |
+| InnerJobNet3   | waiting  |
+|   InnerJob7    | waiting  |
+|   InnerJob8    | waiting  |
+|   InnerJob9    | waiting  |
+|   InnerJob10   | waiting  |
+| InnerJobNet4   | waiting  |
+|   InnerJob11   | waiting  |
+|   InnerJob12   | waiting  |
+|   InnerJob13   | waiting  |
+|   NestedJobNet | waiting  |
+|     NestedJob1 | waiting  |
+|     NestedJob2 | waiting  |
++----------------+----------+
++----------------+----------+
+| Job            | Status   |
++----------------+----------+
+| Job1           | finished |
+| Job2           | finished |
+| Job3           | finished |
+| Job4           | finished |
+| InnerJobNet    | error    |
+|   InnerJob3    | finished |
+|   InnerJob1    | finished |
+|   InnerJob2    | error    |
+| Job8           | aborted  |
+| Job5           | error    |
+| Job6           | aborted  |
+| Job7           | aborted  |
+| InnerJobNet2   | running  |
+|   InnerJob4    | running  |
+|   InnerJob5    | waiting  |
+|   InnerJob6    | waiting  |
+| InnerJobNet3   | aborted  |
+|   InnerJob7    | aborted  |
+|   InnerJob8    | aborted  |
+|   InnerJob9    | aborted  |
+|   InnerJob10   | aborted  |
+| InnerJobNet4   | aborted  |
+|   InnerJob11   | aborted  |
+|   InnerJob12   | aborted  |
+|   InnerJob13   | aborted  |
+|   NestedJobNet | aborted  |
+|     NestedJob1 | aborted  |
+|     NestedJob2 | aborted  |
++----------------+----------+
 
 # generate result graph image
 % dot -Tpng -o result.png result.dot
@@ -112,6 +117,108 @@ See [sample/job_nets/sample_job_net.rb](https://github.com/joker1007/rukawa/blob
 
 ![jobnet.png](https://raw.githubusercontent.com/joker1007/rukawa/master/sample/result.png)
 
+`aborted` means that dependent job failure aborts following jobs.
+
+### Resume
+
+Add `JOB_NAME` arguments to `run` command.
+
+```
+% bundle exec rukawa run SampleJobNet Job8 InnerJob4 -r 5 -c 10
++----------------+----------+
+| Job            | Status   |
++----------------+----------+
+| Job1           | bypassed |
+| Job2           | bypassed |
+| Job3           | bypassed |
+| Job4           | bypassed |
+| InnerJobNet    | bypassed |
+|   InnerJob3    | bypassed |
+|   InnerJob1    | bypassed |
+|   InnerJob2    | bypassed |
+| Job8           | waiting  |
+| Job5           | bypassed |
+| Job6           | bypassed |
+| Job7           | bypassed |
+| InnerJobNet2   | waiting  |
+|   InnerJob4    | waiting  |
+|   InnerJob5    | waiting  |
+|   InnerJob6    | waiting  |
+| InnerJobNet3   | waiting  |
+|   InnerJob7    | waiting  |
+|   InnerJob8    | waiting  |
+|   InnerJob9    | waiting  |
+|   InnerJob10   | waiting  |
+| InnerJobNet4   | waiting  |
+|   InnerJob11   | waiting  |
+|   InnerJob12   | waiting  |
+|   InnerJob13   | waiting  |
+|   NestedJobNet | waiting  |
+|     NestedJob1 | waiting  |
+|     NestedJob2 | waiting  |
++----------------+----------+
++----------------+----------+
+| Job            | Status   |
++----------------+----------+
+| Job1           | bypassed |
+| Job2           | bypassed |
+| Job3           | bypassed |
+| Job4           | bypassed |
+| InnerJobNet    | bypassed |
+|   InnerJob3    | bypassed |
+|   InnerJob1    | bypassed |
+|   InnerJob2    | bypassed |
+| Job8           | finished |
+| Job5           | bypassed |
+| Job6           | bypassed |
+| Job7           | bypassed |
+| InnerJobNet2   | skipped  |
+|   InnerJob4    | finished |
+|   InnerJob5    | skipped  |
+|   InnerJob6    | skipped  |
+| InnerJobNet3   | running  |
+|   InnerJob7    | finished |
+|   InnerJob8    | running  |
+|   InnerJob9    | waiting  |
+|   InnerJob10   | waiting  |
+| InnerJobNet4   | waiting  |
+|   InnerJob11   | waiting  |
+|   InnerJob12   | waiting  |
+|   InnerJob13   | waiting  |
+|   NestedJobNet | waiting  |
+|     NestedJob1 | waiting  |
+|     NestedJob2 | waiting  |
++----------------+----------+
+```
+
+In above case, All jobs except `Job8` and `InnerJob4` and depending them are set `bypassed`.
+`bypassed` means that job is not executed, and regarded as successful.
+For example, a job depends two other jobs. Even if either job is `bypassed`, and another job is `finished`, it is executed.
+
+
+### Run Specific jobs
+
+`run_job` command executes specified job forcely.
+
+```
+% be rukawa run_job Job8 InnerJob6 NestedJob1 -c 3 -r 5
++------------+---------+
+| Job        | Status  |
++------------+---------+
+| Job8       | waiting |
+| InnerJob6  | waiting |
+| NestedJob1 | running |
++------------+---------+
++------------+----------+
+| Job        | Status   |
++------------+----------+
+| Job8       | finished |
+| InnerJob6  | finished |
+| NestedJob1 | finished |
++------------+----------+
+```
+
+Main usage is manual reentering.
 
 ### Output jobnet graph (dot file)
 
@@ -124,18 +231,53 @@ See [sample/job_nets/sample_job_net.rb](https://github.com/joker1007/rukawa/blob
 ```
 % bundle exec rukawa help run
 Usage:
-  rukawa run JOB_NET_NAME
+  rukawa run JOB_NET_NAME [JOB_NAME] [JOB_NAME] ...
+
+Options:
+  -c, [--concurrency=N]           # Default: cpu count
+      [--variables=key:value]
+      [--config=CONFIG]           # If this options is not set, try to load ./rukawa.rb
+      [--job-dirs=one two three]  # Load job directories
+  -b, [--batch], [--no-batch]     # If batch mode, not display running status
+  -l, [--log=LOG]
+                                  # Default: ./rukawa.log
+      [--stdout], [--no-stdout]   # Output log to stdout
+  -d, [--dot=DOT]                 # Output job status by dot format
+  -r, [--refresh-interval=N]      # Refresh interval for running status information
+                                  # Default: 3
+
+Run jobnet. If JOB_NET is set, resume from JOB_NAME
+
+
+% bundle exec rukawa help run_job
+Usage:
+  rukawa run_job JOB_NAME [JOB_NAME] ...
 
 Options:
   -c, [--concurrency=N]           # Default: cpu count
       [--variables=key:value]
+      [--config=CONFIG]           # If this options is not set, try to load ./rukawa.rb
       [--job-dirs=one two three]  # Load job directories
   -b, [--batch], [--no-batch]     # If batch mode, not display running status
   -l, [--log=LOG]
                                   # Default: ./rukawa.log
+      [--stdout], [--no-stdout]   # Output log to stdout
   -d, [--dot=DOT]                 # Output job status by dot format
   -r, [--refresh-interval=N]      # Refresh interval for running status information
                                   # Default: 3
+
+Run specific jobs.
+
+% bundle exec rukawa help graph
+Usage:
+  rukawa graph JOB_NET_NAME [JOB_NAME] [JOB_NAME] ... -o, --output=OUTPUT
+
+Options:
+      [--config=CONFIG]           # If this options is not set, try to load ./rukawa.rb
+      [--job-dirs=one two three]
+  -o, --output=OUTPUT
+
+Output jobnet graph. If JOB_NET is set, simulate resumed job sequence
 ```
 
 ## ToDo

data/lib/rukawa/abstract_job.rb

@@ -3,6 +3,8 @@ require 'rukawa/state'
 
 module Rukawa
   class AbstractJob
+    attr_reader :parent_job_net
+
     class << self
       def skip_rules
         @skip_rules ||= []
@@ -17,8 +19,13 @@ module Rukawa
       self.class.to_s
     end
 
+    def inspect
+      to_s
+    end
+
     def skip?
-      skip_rules.inject(false) do |cond, rule|
+      parent_skip = @parent_job_net ? @parent_job_net.skip? : false
+      parent_skip || skip_rules.inject(false) do |cond, rule|
         cond || rule.is_a?(Symbol) ? method(rule).call : rule.call(self)
       end
     end
@@ -26,5 +33,25 @@ module Rukawa
     def skip_rules
       self.class.skip_rules
     end
+
+    def elapsed_time_from(time = Time.now)
+      return finished_at - started_at if started_at && finished_at
+      return time - started_at if started_at
+
+      nil
+    end
+
+    def formatted_elapsed_time_from(time = Time.now)
+      sec = elapsed_time_from(time)
+      return "N/A" unless sec
+
+      hour = sec.to_i / 3600
+      min = sec.to_i / 60
+
+      hour_format = min > 0 ? "%dh " % hour : ""
+      min_format = min > 0 ? "%dm " % min : ""
+      sec_format = "#{sec.to_i}s"
+      "#{hour_format}#{min_format}#{sec_format}"
+    end
   end
 end

data/lib/rukawa/cli.rb

@@ -34,19 +34,50 @@ module Rukawa
       exit 1 unless result
     end
 
-    desc "graph JOB_NET_NAME", "Output jobnet graph"
+    desc "graph JOB_NET_NAME [JOB_NAME] [JOB_NAME] ...", "Output jobnet graph. If JOB_NET is set, simulate resumed job sequence"
     method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
     method_option :job_dirs, type: :array, default: []
     method_option :output, aliases: "-o", type: :string, required: true
-    def graph(job_net_name)
+    def graph(job_net_name, *job_name)
       load_config
       load_job_definitions
 
       job_net_class = Object.const_get(job_net_name)
-      job_net = job_net_class.new(nil, options[:variables])
+      job_classes = job_name.map { |name| Object.const_get(name) }
+      job_net = job_net_class.new(nil, *job_classes)
       job_net.output_dot(options[:output])
     end
 
+    desc "run_job JOB_NAME [JOB_NAME] ...", "Run specific jobs."
+    method_option :concurrency, aliases: "-c", type: :numeric, default: nil, desc: "Default: cpu count"
+    method_option :variables, type: :hash, default: {}
+    method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
+    method_option :job_dirs, type: :array, default: [], desc: "Load job directories"
+    method_option :batch, aliases: "-b", type: :boolean, default: false, desc: "If batch mode, not display running status"
+    method_option :log, aliases: "-l", type: :string, default: "./rukawa.log"
+    method_option :stdout, type: :boolean, default: false, desc: "Output log to stdout"
+    method_option :dot, aliases: "-d", type: :string, default: nil, desc: "Output job status by dot format"
+    method_option :refresh_interval, aliases: "-r", type: :numeric, default: 3, desc: "Refresh interval for running status information"
+    def run_job(*job_name)
+      load_config
+      Rukawa.configure do |c|
+        c.log_file = options[:stdout] ? $stdout : options[:log]
+        c.concurrency = options[:concurrency] if options[:concurrency]
+      end
+      load_job_definitions
+
+      job_classes = job_name.map { |name| Object.const_get(name) }
+      job_net_class = anonymous_job_net_class(*job_classes)
+      job_net = job_net_class.new(nil)
+      result = Runner.run(job_net, options[:batch], options[:refresh_interval])
+
+      if options[:dot]
+        job_net.output_dot(options[:dot])
+      end
+
+      exit 1 unless result
+    end
+
     private
 
     def load_config
@@ -71,5 +102,15 @@ module Rukawa
         Dir.glob(File.join(dir, "**/*.rb")) { |f| load f }
       end
     end
+
+    def anonymous_job_net_class(*job_classes)
+      Class.new(JobNet) do
+        self.singleton_class.send(:define_method, :dependencies) do
+          job_classes.map { |klass| [klass, []] }.to_h
+        end
+
+        define_method(:name) { "AnonymousJobNet" }
+      end
+    end
   end
 end

data/lib/rukawa/dag.rb

@@ -1,8 +1,10 @@
 require 'set'
+require 'tsort'
 
 module Rukawa
   class Dag
     include Enumerable
+    include TSort
 
     attr_reader :nodes, :jobs, :edges
 
@@ -47,6 +49,24 @@ module Rukawa
       end
     end
 
+    def tsort_each_node(&block)
+      @jobs.each(&block)
+    end
+
+    def tsort_each_child(node)
+      if block_given?
+        node.out_goings.each do |edge|
+          yield edge.to
+        end
+      else
+        Enumerator.new do |y|
+          node.out_goings.each do |edge|
+            y << edge.to
+          end
+        end
+      end
+    end
+
     private
 
     def tsortable_hash(hash)

data/lib/rukawa/job.rb

@@ -4,7 +4,7 @@ require 'rukawa/abstract_job'
 module Rukawa
   class Job < AbstractJob
     attr_accessor :in_comings, :out_goings
-    attr_reader :parent_job_net, :state
+    attr_reader :state, :started_at, :finished_at
 
     def initialize(parent_job_net)
       @parent_job_net = parent_job_net
@@ -13,6 +13,10 @@ module Rukawa
       set_state(:waiting)
     end
 
+    def set_state(name)
+      @state = Rukawa::State.get(name)
+    end
+
     def root?
       in_comings.select { |edge| edge.cluster == @parent_job_net }.empty?
     end
@@ -23,27 +27,10 @@ module Rukawa
 
     def dataflow
       return @dataflow if @dataflow
+      return @dataflow = bypass_dataflow if @state.bypassed?
 
       @dataflow = Concurrent.dataflow_with(Rukawa.executor, *depend_dataflows) do |*results|
-        begin
-          raise DependentJobFailure unless results.all? { |r| !r.nil? }
-
-          if skip? || @parent_job_net.skip? || results.any? { |r| r == Rukawa::State.get(:skipped) }
-            Rukawa.logger.info("Skip #{self.class}")
-            set_state(:skipped)
-          else
-            Rukawa.logger.info("Start #{self.class}")
-            set_state(:running)
-            run
-            Rukawa.logger.info("Finish #{self.class}")
-            set_state(:finished)
-          end
-        rescue => e
-          Rukawa.logger.error("Error #{self.class} by #{e}")
-          set_state(:error)
-          raise
-        end
-
+        do_run(*results)
         @state
       end
     end
@@ -51,6 +38,27 @@ module Rukawa
     def run
     end
 
+    private def do_run(*results)
+      @started_at = Time.now
+      check_dependencies(results)
+
+      if skip? || results.any?(&:skipped?)
+        Rukawa.logger.info("Skip #{self.class}")
+        set_state(:skipped)
+      else
+        Rukawa.logger.info("Start #{self.class}")
+        set_state(:running)
+        run
+        Rukawa.logger.info("Finish #{self.class}")
+        set_state(:finished)
+      end
+    rescue => e
+      handle_error(e)
+      raise
+    ensure
+      @finished_at = Time.now
+    end
+
     def jobs_as_from
       [self]
     end
@@ -70,8 +78,23 @@ module Rukawa
       in_comings.map { |edge| edge.from.dataflow }
     end
 
-    def set_state(name)
-      @state = Rukawa::State.get(name)
+    def bypass_dataflow
+      Concurrent.dataflow_with(Rukawa.executor, *depend_dataflows) do |*results|
+        Rukawa.logger.info("Skip #{self.class}")
+        @state
+      end
+    end
+
+    def check_dependencies(results)
+      unless results.all? { |r| !r.nil? }
+        set_state(:aborted)
+        raise DependentJobFailure
+      end
+    end
+
+    def handle_error(e)
+      Rukawa.logger.error("Error #{self.class} by #{e}")
+      set_state(:error) unless e.is_a?(DependentJobFailure)
     end
 
     def store(key, value)

data/lib/rukawa/job_net.rb

@@ -3,7 +3,7 @@ require 'rukawa/abstract_job'
 module Rukawa
   class JobNet < AbstractJob
     include Enumerable
-    attr_reader :parent_job_net, :dag
+    attr_reader :dag
 
     class << self
       def dependencies
@@ -15,6 +15,29 @@ module Rukawa
       @parent_job_net = parent_job_net
       @dag = Dag.new
       @dag.build(self, self.class.dependencies)
+      @resume_job_classes = resume_job_classes
+
+      unless resume_job_classes.empty?
+        resume_targets = []
+        @dag.tsort_each_node do |node|
+          node.set_state(:bypassed)
+          resume_targets << node if resume_job_classes.include?(node.class)
+        end
+
+        resume_targets.each do |node|
+          @dag.each_strongly_connected_component_from(node) do |nodes|
+            nodes.each { |connected| connected.set_state(:waiting) }
+          end
+        end
+      end
+    end
+
+    def started_at
+      @dag.nodes.min_by { |j| j.started_at ? j.started_at.to_i : Float::INFINITY }.started_at
+    end
+
+    def finished_at
+      @dag.nodes.max_by { |j| j.finished_at.to_i }.finished_at
     end
 
     def toplevel?
@@ -26,13 +49,7 @@ module Rukawa
     end
 
     def dataflows
-      flat_map do |j|
-        if j.respond_to?(:dataflows)
-          j.dataflows
-        else
-          [j.dataflow]
-        end
-      end
+      @dag.tsort.reverse.map(&:dataflow)
     end
 
     def state
@@ -48,7 +65,7 @@ module Rukawa
     def to_dot(subgraph = false)
       graphdef = subgraph ? "subgraph" : "digraph"
       buf = %Q|#{graphdef} "#{subgraph ? "cluster_" : ""}#{name}" {\n|
-      buf += %Q{label = "#{name}";\n}
+      buf += %Q{label = "#{graph_label}";\n}
       buf += Rukawa.config.graph.attrs
       buf += Rukawa.config.graph.node.attrs
       buf += "color = blue;\n" if subgraph
@@ -77,5 +94,15 @@ module Rukawa
     def each(&block)
       @dag.each(&block)
     end
+
+    private
+
+    def graph_label
+      if @resume_job_classes.empty?
+        name
+      else
+        "#{name} resume from (#{@resume_job_classes.join(", ")})"
+      end
+    end
   end
 end

data/lib/rukawa/runner.rb

@@ -24,6 +24,7 @@ module Rukawa
       Rukawa.logger.info("=== Finish Rukawa ===")
 
       display_table unless batch_mode
+      puts "Finished #{@root_job_net.name} in #{@root_job_net.formatted_elapsed_time_from}"
 
       errors = futures.map(&:reason).compact
 
@@ -41,7 +42,7 @@ module Rukawa
     private
 
     def display_table
-      table = Terminal::Table.new headings: ["Job", "Status"] do |t|
+      table = Terminal::Table.new headings: ["Job", "Status", "Elapsed Time"] do |t|
         @root_job_net.each_with_index do |j|
           table_row(t, j)
         end
@@ -51,12 +52,12 @@ module Rukawa
 
     def table_row(table, job, level = 0)
       if job.is_a?(JobNet)
-        table << [Paint["#{"  " * level}#{job.class}", :bold, :underline], job.state.colored]
+        table << [Paint["#{"  " * level}#{job.class}", :bold, :underline], Paint[job.state.colored, :bold, :underline], Paint[job.formatted_elapsed_time_from, :bold, :underline]]
         job.each do |inner_j|
           table_row(table, inner_j, level + 1)
         end
       else
-        table << [Paint["#{"  " * level}#{job.class}", :bold], job.state.colored]
+        table << [Paint["#{"  " * level}#{job.class}", :bold], job.state.colored, job.formatted_elapsed_time_from]
       end
     end
   end

data/lib/rukawa/state.rb

@@ -1,6 +1,6 @@
 module Rukawa::State
   def self.get(name)
-    const_get(name.to_s.capitalize)
+    const_get(name.to_s.split("_").map(&:capitalize).join)
   end
 
   module BaseExt
@@ -15,6 +15,12 @@ module Rukawa::State
     def merge(other)
       other
     end
+
+    %i(running? skipped? bypassed? error? aborted? waiting? finished?).each do |sym|
+      define_method(sym) do
+        false
+      end
+    end
   end
 
   module Running
@@ -27,6 +33,10 @@ module Rukawa::State
     def self.merge(_other)
       self
     end
+
+    def self.running?
+      true
+    end
   end
 
   module Skipped
@@ -43,6 +53,22 @@ module Rukawa::State
         other
       end
     end
+
+    def self.skipped?
+      true
+    end
+  end
+
+  module Bypassed
+    extend BaseExt
+
+    def self.color
+      :yellow
+    end
+
+    def self.bypassed?
+      true
+    end
   end
 
   module Error
@@ -59,6 +85,38 @@ module Rukawa::State
         self
       end
     end
+
+    def self.error?
+      true
+    end
+  end
+
+  module Aborted
+    extend BaseExt
+
+    def name
+      "aborted"
+    end
+
+    def self.color
+      :magenta
+    end
+
+    def self.merge(other)
+      if other == Running || other == Error
+        other
+      else
+        self
+      end
+    end
+
+    def self.error?
+      true
+    end
+
+    def self.aborted?
+      true
+    end
   end
 
   module Waiting
@@ -67,6 +125,10 @@ module Rukawa::State
     def self.color
       :default
     end
+
+    def self.waiting?
+      true
+    end
   end
 
   module Finished
@@ -75,5 +137,9 @@ module Rukawa::State
     def self.color
       :green
     end
+
+    def self.finished?
+      true
+    end
   end
 end

data/lib/rukawa/version.rb

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

data/rukawa.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-power_assert"
 end

data/sample/result.dot

@@ -0,0 +1,86 @@
+digraph "SampleJobNet" {
+label = "SampleJobNet";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+Job1 [style = filled,fillcolor = green];
+Job2 [style = filled,fillcolor = green];
+Job3 [style = filled,fillcolor = green];
+Job4 [style = filled,fillcolor = green];
+subgraph "cluster_InnerJobNet" {
+label = "InnerJobNet";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+color = blue;
+InnerJob3 [style = filled,fillcolor = green];
+InnerJob1 [style = filled,fillcolor = green];
+InnerJob2 [style = filled,fillcolor = red];
+"InnerJob1" -> "InnerJob2";
+"InnerJob3" -> "InnerJob2";
+}
+Job8 [style = filled,fillcolor = magenta];
+Job5 [style = filled,fillcolor = red];
+Job6 [style = filled,fillcolor = magenta];
+Job7 [style = filled,fillcolor = magenta];
+subgraph "cluster_InnerJobNet2" {
+label = "InnerJobNet2";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+color = blue;
+InnerJob4 [style = filled,fillcolor = green];
+InnerJob5 [style = filled,fillcolor = yellow];
+InnerJob6 [style = filled,fillcolor = yellow];
+"InnerJob4" -> "InnerJob5";
+"InnerJob4" -> "InnerJob6";
+"InnerJob5" -> "InnerJob6";
+}
+subgraph "cluster_InnerJobNet3" {
+label = "InnerJobNet3";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+color = blue;
+InnerJob7 [style = filled,fillcolor = magenta];
+InnerJob8 [style = filled,fillcolor = magenta];
+InnerJob9 [style = filled,fillcolor = magenta];
+InnerJob10 [style = filled,fillcolor = magenta];
+"InnerJob7" -> "InnerJob9";
+"InnerJob8" -> "InnerJob9";
+"InnerJob7" -> "InnerJob10";
+"InnerJob8" -> "InnerJob10";
+}
+subgraph "cluster_InnerJobNet4" {
+label = "InnerJobNet4";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+color = blue;
+InnerJob11 [style = filled,fillcolor = magenta];
+InnerJob12 [style = filled,fillcolor = magenta];
+InnerJob13 [style = filled,fillcolor = magenta];
+subgraph "cluster_NestedJobNet" {
+label = "NestedJobNet";
+graph [rankdir = LR,nodesep = 0.8,concentrate = true];
+color = blue;
+NestedJob1 [style = filled,fillcolor = magenta];
+NestedJob2 [style = filled,fillcolor = magenta];
+"NestedJob1" -> "NestedJob2";
+}
+"InnerJob11" -> "NestedJob1";
+"InnerJob12" -> "NestedJob1";
+}
+"Job1" -> "Job2";
+"Job1" -> "Job3";
+"Job2" -> "Job4";
+"Job3" -> "Job4";
+"Job3" -> "InnerJob3";
+"Job3" -> "InnerJob1";
+"InnerJob2" -> "Job8";
+"Job3" -> "Job5";
+"Job4" -> "Job6";
+"Job5" -> "Job6";
+"Job6" -> "Job7";
+"Job4" -> "InnerJob4";
+"Job8" -> "InnerJob7";
+"Job8" -> "InnerJob8";
+"Job7" -> "InnerJob7";
+"Job7" -> "InnerJob8";
+"InnerJob9" -> "InnerJob11";
+"InnerJob9" -> "InnerJob12";
+"InnerJob9" -> "InnerJob13";
+"InnerJob10" -> "InnerJob11";
+"InnerJob10" -> "InnerJob12";
+"InnerJob10" -> "InnerJob13";
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-power_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hyper simple job workflow engine
 email:
 - kakyoin.hierophant@gmail.com
@@ -140,6 +154,7 @@ files:
 - sample/job_nets/sample_job_net.rb
 - sample/jobnet.png
 - sample/jobs/sample_job.rb
+- sample/result.dot
 - sample/result.png
 - sample/rukawa.rb
 homepage: https://github.com/joker1007/rukawa