bricolage 5.10.0 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950cab4515b421cdfd9a29fba1fa7812d365647a
-  data.tar.gz: 93badbfd8528d66c97f2cdb5bda2217172386bd8
+  metadata.gz: 1ff4f8adcd84bf94e55cb1d285a3b5671210906e
+  data.tar.gz: b1f3f08b9c0e74a5e6d469ba197a29d08b51551f
 SHA512:
-  metadata.gz: 5bc1b110a47f6cf5f81a30595fe9b200b77a6b7918bf4b2f7a8064597b3af36e50cc73bf91d32e4def188c43dd2829a81a57184a87e3c82bcad054cdbf3da7a4
-  data.tar.gz: e9cba607a0436f613093ae654b347d69c04024a5ac97860fc113d61e6a34e3c7f9f55afa856c584442a07ed1a02781dc2634d1d9707df725ea9d0aa30c89d666
+  metadata.gz: aec57849ed95f3c50bd0befdcaf66ddad3f6ab2aeb241e139f51e996a64e18ae63023e624a13f44daa9a5330d75d2928cc0df447f4ecae3c9055934b519647c5
+  data.tar.gz: dab80eab00b0e147249fcf6f53a6a75314a0b2161991d46fc0ffe21cedbc29fae3a6e0f00c6d95c60f3ddc26a5438c7d93061ca132a3714d0192b02abc63c593

data/lib/bricolage/eventhandlers.rb

@@ -40,7 +40,12 @@ module Bricolage
     }
   end
 
-  BeforeAllJobsEvent = Struct.new(:flow_id, :queue)
+  BeforeAllJobsEvent = Struct.new(:jobnet_id, :queue)
+  class BeforeAllJobsEvent   # reopen
+    def flow_id
+      jobnet_id
+    end
+ end
   BeforeJobEvent = Struct.new(:job)
   AfterJobEvent = Struct.new(:result)
   AfterAllJobsEvent = Struct.new(:succeeded, :queue)

data/lib/bricolage/{jobflow.rb → jobnet.rb}

@@ -3,80 +3,100 @@ require 'tsort'
 
 module Bricolage
 
-  class JobFlow
-    def JobFlow.load(path)
-      File.open(path) {|f|
-        parse_stream(f, make_node_ref(path))
-      }
-    rescue SystemCallError => err
-      raise ParameterError, "could not load job flow: #{path} (#{err.message})"
+  # Represents "first" jobnet given by command line (e.g. bricolage-jobnet some.jobnet)
+  class RootJobNet
+    def RootJobNet.load(ctx, path)
+      root = new(JobNet::FileLoader.new(ctx), JobNet.load(path))
+      root.load_recursive
+      root.fix
+      root
     end
 
-    def JobFlow.make_node_ref(path)
-      subsys = path.parent.basename.to_s
-      name = path.basename('.jobnet').to_s
-      JobNetRef.new(subsys, name, Location.dummy)
+    def initialize(jobnet_loader, start_jobnet)
+      @jobnet_loader = jobnet_loader
+      @start_jobnet = start_jobnet
+      @jobnets = {start_jobnet.ref => start_jobnet}
+      @graph = nil
     end
 
-    def JobFlow.parse_stream(f, ref)
-      Parser.new(ref.subsystem).parse_stream(f, ref)
-    end
+    attr_reader :start_jobnet
 
-    def JobFlow.root
-      RootJobFlow.new
+    def each_jobnet(&block)
+      @jobnets.each_value(&block)
     end
 
-    ROOT_FLOW_NAME = '*'
-
-    def initialize(ref, location)
-      @ref = ref
-      @location = location
-      @flow = {}   # Ref => [Ref] (src->dest)
-      @deps = {}   # Ref => [Ref] (dest->src)
-      @subnets_resolved = false
+    def jobnets
+      @jobnets.values
     end
 
-    def inspect
-      "\#<#{self.class} #{ref}>"
+    def load_recursive
+      unresolved = [@start_jobnet]
+      until unresolved.empty?
+        loaded = []
+        unresolved.each do |net|
+          net.net_refs.each do |ref|
+            next if ref.jobnet
+            unless net = @jobnets[ref]
+              net = @jobnet_loader.load(ref)
+              @jobnets[ref] = net
+              loaded.push net
+            end
+            ref.jobnet = net
+          end
+        end
+        unresolved = loaded
+      end
     end
 
-    attr_reader :ref
-
-    def name
-      ref.to_s
+    def fix
+      each_jobnet do |net|
+        net.fix
+      end
+      @jobnets.freeze
+      @dag = JobDAG.build(jobnets)
     end
 
-    def add_edge(src, dest)
-      (@flow[src] ||= []).push dest unless dest.net?
-      (@deps[dest] ||= []).push src
+    def sequential_jobs
+      @dag.sequential_jobs
     end
+  end
 
-    def flow_tree
-      h = {}
-      @flow.each do |src, dests|
-        h[src.to_s] = dests.map {|d| d.to_s }
+  class JobDAG
+    def JobDAG.build(jobnets)
+      graph = new
+      jobnets.each do |net|
+        graph.merge! net
       end
-      h
+      graph.fix
+      graph
     end
 
-    def dependencies
+    def initialize
+      @deps = Hash.new { Array.new }   # {JobRef => [JobRef]} (dest->srcs)
+    end
+
+    def to_hash
       h = {}
-      @deps.each do |ref, deps|
-        h[ref.to_s] = deps.map(&:to_s)
+      @deps.each do |dest, srcs|
+        h[dest.to_s] = srcs.map(&:to_s)
       end
       h
     end
 
-    def dependent_flows
-      @deps.values.flatten.select {|ref| ref.net? }.uniq
+    def merge!(net)
+      net.each_dependencies do |ref, deps|
+        @deps[ref] |= deps
+      end
     end
 
-    def sequential_nodes
-      tsort.reject {|ref| ref.dummy? }
+    def fix
+      @deps.freeze
+      check_cycle
+      check_orphan
     end
 
     def sequential_jobs
-      sequential_nodes.reject {|ref| ref.net? }
+      tsort.reject {|ref| ref.dummy? }
     end
 
     include TSort
@@ -89,153 +109,185 @@ module Bricolage
       @deps.fetch(ref).each(&block)
     end
 
-    def fix_graph
-      close_graph
-      check_cycle
-      check_orphan
-    end
-
-    def resolve_subnets(root_flow)
-      @deps.each_key do |ref|
-        next unless ref.net?
-        ref.flow = root_flow.subnet(ref)
-      end
-      @subnets_resolved = true
-    end
-
-    def subnets_resolved?
-      @subnets_resolved
-    end
-
     private
 
-    def close_graph
-      @deps.values.flatten.uniq.each do |ref|
-        @deps[ref] ||= []
-      end
-    end
-
     def check_cycle
       each_strongly_connected_component do |refs|
         unless refs.size == 1
           cycle = (refs + [refs.first]).reverse.join(' -> ')
-          raise ParameterError, "found cycle in the flow: #{cycle}"
+          raise ParameterError, "found cycle in the jobnet: #{cycle}"
         end
       end
     end
 
     def check_orphan
       orphan_nodes.each do |ref|
-        raise ParameterError, "found orphan job in the flow: #{ref.location}: #{ref}"
+        raise ParameterError, "found orphan job in the jobnet: #{ref.location}: #{ref}"
       end
     end
 
     def orphan_nodes
-      @deps.to_a.select {|ref, deps| deps.empty? and not ref.dummy? and not ref.net? }.map {|ref, *| ref }
+      @deps.to_a.select {|ref, deps| deps.empty? and not ref.dummy? }.map {|ref, *| ref }
     end
   end
 
-  class RootJobFlow < JobFlow
-    def RootJobFlow.load(ctx, path)
-      flow = new(ctx)
-      flow.add_subnet JobFlow.load(path)
-      flow.fix
-      flow
+  class JobNet
+    def JobNet.load(path, ref = JobNetRef.for_path(path))
+      File.open(path) {|f|
+        Parser.new(ref).parse_stream(f)
+      }
+    rescue SystemCallError => err
+      raise ParameterError, "could not load jobnet: #{path} (#{err.message})"
     end
 
-    def initialize(ctx)
-      @ctx = ctx
-      super ROOT_FLOW_NAME, Location.dummy
-      @subnets = {}
+    def initialize(ref, location)
+      @ref = ref
+      @location = location
+      @flow = {}   # Ref => [Ref] (src->dest)
+      @deps = {}   # Ref => [Ref] (dest->src)
     end
 
-    def add_subnet(flow)
-      raise ParameterError, "duplicated subnet definition: #{flow.name}" if @subnets.key?(flow.name)
-      @subnets[flow.name] = flow
+    def inspect
+      "\#<#{self.class} #{ref}>"
     end
 
-    def subnet(ref)
-      if flow = @subnets[ref]
-        flow
-      else
-        flow = load_jobnet_auto(ref)
-        add_subnet flow
-        flow
-      end
+    attr_reader :ref
+
+    def start
+      @ref.start_ref
     end
 
-    def load_jobnet_auto(ref)
-      path = @ctx.root_relative_path(ref.relative_path)
-      raise ParameterError, "undefined subnet: #{ref}" unless path.file?
-      JobFlow.load(path)
+    def end
+      @ref.end_ref
     end
 
-    def each_subnet(&block)
-      @subnets.values.each(&block)
+    def name
+      @ref.to_s
     end
 
-    def each_flow(&block)
-      yield self
-      @subnets.each_value(&block)
+    def add_edge(src, dest)
+      (@flow[src] ||= []).push dest
+      (@deps[dest] ||= []).push src
     end
 
-    def each_subnet_sequence
-      sequential_nodes.each do |ref|
-        yield subnet(ref)
+    def to_hash
+      h = {}
+      @flow.each do |src, dests|
+        h[src.to_s] = dests.map(&:to_s)
       end
+      h
     end
 
-    def fix
-      resolve_subnet_references
-      each_subnet do |flow|
-        flow.fix_graph
+    def to_deps_hash
+      h = {}
+      @deps.each do |dest, srcs|
+        h[dest.to_s] = srcs.map(&:to_s)
       end
-      add_jobnet_dependency_edges
-      fix_graph
+      h
     end
 
-    private
+    def refs
+      @flow.keys | @flow.values.flatten
+    end
 
-    def resolve_subnet_references
-      unresolved = true
-      while unresolved
-        unresolved = false
-        ([self] + @subnets.values).each do |flow|
-          unless flow.subnets_resolved?
-            flow.resolve_subnets self
-            unresolved = true
-          end
-        end
-      end
+    def net_refs
+      @deps.keys.select {|ref| ref.net? }
     end
 
-    def add_jobnet_dependency_edges
-      each_subnet do |flow|
-        # dummy dependency to ensure to execute all subnets
-        add_edge Ref.dummy, flow.ref
-        # jobnet -> jobnet dependency
-        flow.dependent_flows.each do |dep_flow_ref|
-          add_edge dep_flow_ref, flow.ref
+    # Adds dummy dependencies (@start and @end) to fix up all jobs
+    # into one DAG beginning with @start and ending with @end
+    def fix
+      refs.each do |ref|
+        next if ref.dummy?
+        unless @deps[ref]
+          (@flow[self.start] ||= []).push ref
+          @deps[ref] = [self.start]
+        end
+        unless @flow[ref]
+          (@flow[ref] ||= []).push self.end
+          (@deps[self.end] ||= []).push ref
         end
       end
+      @deps[self.start] ||= []
+      @flow.freeze
+      @deps.freeze
     end
 
-    def check_orphan
-      # should not check orphan for root.
+    def each_dependencies
+      @deps.each do |ref, deps|
+        dest = (ref.net? ? ref.start : ref)
+        srcs = deps.map {|r| r.net? ? r.end : r }
+        yield dest, srcs
+      end
     end
   end
 
-  class JobFlow   # reopen as namespace
+  class JobNet   # reopen as namespace
 
-    class Ref
-      START_NAME = '@start'
+    class FileLoader
+      def initialize(ctx)
+        @context = ctx
+      end
+
+      def load(ref)
+        path = @context.root_relative_path(ref.relative_path)
+        raise ParameterError, "undefined subnet: #{ref}" unless path.file?
+        JobNet.load(path, ref)
+      end
+    end
+
+    class Parser
+      def initialize(jobnet_ref)
+        @jobnet_ref = jobnet_ref
+      end
+
+      def parse_stream(f)
+        net = JobNet.new(@jobnet_ref, Location.for_file(f))
+        foreach_edge(f) do |src, dest|
+          net.add_edge src, dest
+        end
+        net
+      end
+
+      private
+
+      name = /\w[\w\-]*/
+      node_ref = %r<[@*]?(?:#{name}/)?#{name}>
+      START_PATTERN = /\A(#{node_ref})\z/
+      DEPEND_PATTERN = /\A(#{node_ref})?\s*->\s*(#{node_ref})\z/
+
+      def foreach_edge(f)
+        default_src = nil
+        f.each do |line|
+          text = line.sub(/\#.*/, '').strip
+          next if text.empty?
+          loc = Location.for_file(f)
+
+          if m = DEPEND_PATTERN.match(text)
+            src = (m[1] ? ref(m[1], loc) : default_src) or
+                raise ParameterError, "syntax error at #{loc}: '->' must follow any job"
+            dest = ref(m[2], loc)
+            yield src, dest
+            default_src = dest
+
+          elsif m = START_PATTERN.match(text)
+            dest = ref(m[1], loc)
+            yield @jobnet_ref.start_ref, dest
+            default_src = dest
+
+          else
+            raise ParameterError, "syntax error at #{loc}: #{line.strip.inspect}"
+          end
+        end
+      end
 
-      def Ref.dummy
-        JobRef.new(nil, START_NAME, Location.dummy)
+      def ref(ref_str, location)
+        Ref.parse(ref_str, @jobnet_ref.subsystem, location)
       end
+    end
 
+    class Ref
       def Ref.parse(ref, curr_subsys = nil, location = Location.dummy)
-        return JobNetRef.new(nil, '', location) if ref == ROOT_FLOW_NAME
         m = %r<\A(\*)?(?:(\w[\w\-]*)/)?(@?\w[\w\-]*)\z>.match(ref) or
             raise ParameterError, "bad job name: #{ref.inspect}"
         is_net, subsys, name = m.captures
@@ -287,14 +339,18 @@ module Bricolage
     end
 
     class JobNetRef < Ref
+      def JobNetRef.for_path(path)
+        new(path.parent.basename, path.basename('.jobnet'), Location.dummy)
+      end
+
       def initialize(subsys, name, location)
         super
-        @flow = nil
+        @jobnet = nil
+        @start = nil
+        @end = nil
       end
 
-      def flow=(flow)
-        @flow = flow
-      end
+      attr_accessor :jobnet
 
       def net?
         true
@@ -307,6 +363,23 @@ module Bricolage
       def relative_path
         "#{subsystem}/#{name}.jobnet"
       end
+
+      def start_ref
+        @start ||= JobRef.new(subsystem, "@#{name}@start", location)
+      end
+
+      def end_ref
+        @end ||= JobRef.new(subsystem, "@#{name}@end", location)
+      end
+
+
+      def start
+        @jobnet.start
+      end
+
+      def end
+        @jobnet.end
+      end
     end
 
     class Location
@@ -335,55 +408,6 @@ module Bricolage
       end
     end
 
-    class Parser
-      def initialize(subsys)
-        @subsys = subsys
-      end
-
-      def parse_stream(f, ref)
-        flow = JobFlow.new(ref, Location.for_file(f))
-        foreach_edge(f) do |src, dest|
-          flow.add_edge src, dest
-        end
-        flow
-      end
-
-      private
-
-      name = /\w[\w\-]*/
-      node_ref = %r<[@*]?(?:#{name}/)?#{name}>
-      START_PATTERN = /\A(#{node_ref})\z/
-      DEPEND_PATTERN = /\A(#{node_ref})?\s*->\s*(#{node_ref})\z/
-
-      def foreach_edge(f)
-        default_src = Ref.dummy
-        f.each do |line|
-          text = line.sub(/\#.*/, '').strip
-          next if text.empty?
-          loc = Location.for_file(f)
-
-          if m = DEPEND_PATTERN.match(text)
-            src = m[1] ? ref(m[1], loc) : default_src
-            dest = ref(m[2], loc)
-            yield src, dest
-            default_src = dest
-
-          elsif m = START_PATTERN.match(text)
-            dest = ref(m[1], loc)
-            yield Ref.dummy, dest
-            default_src = dest
-
-          else
-            raise ParameterError, "syntax error at #{loc}: #{line.strip.inspect}"
-          end
-        end
-      end
-
-      def ref(ref_str, location)
-        Ref.parse(ref_str, @subsys, location)
-      end
-    end
-
   end
 
 end

data/lib/bricolage/jobnetrunner.rb

@@ -1,6 +1,6 @@
 require 'bricolage/application'
 require 'bricolage/context'
-require 'bricolage/jobflow'
+require 'bricolage/jobnet'
 require 'bricolage/taskqueue'
 require 'bricolage/job'
 require 'bricolage/jobresult'
@@ -23,8 +23,8 @@ module Bricolage
     def initialize
       Signal.trap('PIPE', 'IGNORE')
       @hooks = ::Bricolage
-      @flow_id = nil
-      @flow_start_time = Time.now
+      @jobnet_id = nil
+      @jobnet_start_time = Time.now
       @log_path = nil
     end
 
@@ -37,15 +37,15 @@ module Bricolage
       @hooks.run_before_option_parsing_hooks(opts)
       opts.parse ARGV
       @ctx = Context.for_application(nil, opts.jobnet_file, environment: opts.environment, global_variables: opts.global_variables)
-      @flow_id = "#{opts.jobnet_file.dirname.basename}/#{opts.jobnet_file.basename('.jobnet')}"
+      @jobnet_id = "#{opts.jobnet_file.dirname.basename}/#{opts.jobnet_file.basename('.jobnet')}"
       @log_path = opts.log_path
-      flow = RootJobFlow.load(@ctx, opts.jobnet_file)
+      jobnet = RootJobNet.load(@ctx, opts.jobnet_file)
       queue = get_queue(opts)
       if queue.locked?
         raise ParameterError, "Job queue is still locked. If you are sure to restart jobnet, #{queue.unlock_help}"
       end
       unless queue.queued?
-        enqueue_jobs flow, queue
+        enqueue_jobs jobnet, queue
         logger.info "jobs are queued." if opts.queue_exist?
       end
       if opts.list_jobs?
@@ -79,25 +79,18 @@ module Bricolage
       end
     end
 
-    def enqueue_jobs(flow, queue)
-      flow.each_subnet_sequence do |subnet|
-        seq = 1
-        subnet.sequential_jobs.each do |ref|
-          queue.enq JobTask.new(subnet.ref, seq, ref)
-          seq += 1
-        end
+    def enqueue_jobs(jobnet, queue)
+      seq = 1
+      jobnet.sequential_jobs.each do |ref|
+        queue.enq JobTask.new(ref)
+        seq += 1
       end
       queue.save
     end
 
     def list_jobs(queue)
-      prev = nil
       queue.each do |task|
-        if not prev or prev.jobnet != task.jobnet
-          puts "---- jobnet #{task.jobnet} ---"
-        end
         puts task.job
-        prev = task
       end
     end
 
@@ -108,18 +101,18 @@ module Bricolage
     end
 
     def run_queue(queue)
-      @hooks.run_before_all_jobs_hooks(BeforeAllJobsEvent.new(@flow_id, queue))
+      @hooks.run_before_all_jobs_hooks(BeforeAllJobsEvent.new(@jobnet_id, queue))
       queue.consume_each do |task|
         result = execute_job(task.job, queue)
         unless result.success?
-          logger.elapsed_time 'jobnet total: ', (Time.now - @flow_start_time)
+          logger.elapsed_time 'jobnet total: ', (Time.now - @jobnet_start_time)
           logger.error "[job #{task.job}] #{result.message}"
           @hooks.run_after_all_jobs_hooks(AfterAllJobsEvent.new(false, queue))
           exit result.status
         end
       end
       @hooks.run_after_all_jobs_hooks(AfterAllJobsEvent.new(true, queue))
-      logger.elapsed_time 'jobnet total: ', (Time.now - @flow_start_time)
+      logger.elapsed_time 'jobnet total: ', (Time.now - @jobnet_start_time)
       logger.info "status all green"
     end
 
@@ -142,11 +135,11 @@ module Bricolage
       start_time = Time.now
       @log_path.gsub(/%\{\w+\}/) {|var|
         case var
-        when '%{flow_start_date}' then @flow_start_time.strftime('%Y%m%d')
-        when '%{flow_start_time}' then @flow_start_time.strftime('%Y%m%d_%H%M%S%L')
+        when '%{jobnet_start_date}' then @jobnet_start_time.strftime('%Y%m%d')
+        when '%{jobnet_start_time}' then @jobnet_start_time.strftime('%Y%m%d_%H%M%S%L')
         when '%{job_start_date}' then start_time.strftime('%Y%m%d')
         when '%{job_start_time}' then start_time.strftime('%Y%m%d_%H%M%S%L')
-        when '%{flow}', '%{flow_id}' then @flow_id.gsub('/', '::')
+        when '%{jobnet}', '%{net}', '%{jobnet_id}', '%{net_id}', '%{flow}', '%{flow_id}' then @jobnet_id.gsub('/', '::')
         when '%{subsystem}' then job_ref.subsystem
         when '%{job}', '%{job_id}' then job_ref.name
         else

data/lib/bricolage/taskqueue.rb

@@ -1,4 +1,4 @@
-require 'bricolage/jobflow'
+require 'bricolage/jobnet'
 require 'bricolage/exception'
 require 'pathname'
 
@@ -133,23 +133,19 @@ module Bricolage
   end
 
   class JobTask
-    def initialize(jobnet, seq, job)
-      @jobnet = jobnet
-      @seq = seq
+    def initialize(job)
       @job = job
     end
 
-    attr_reader :jobnet
-    attr_reader :seq
     attr_reader :job
 
     def serialize
-      [@jobnet, @seq, @job].join("\t")
+      [@job].join("\t")
     end
 
     def JobTask.deserialize(str)
-      jobnet, seq, job = str.strip.split("\t", 3)
-      new(JobFlow::Ref.parse(jobnet), seq.to_i, JobFlow::Ref.parse(job))
+      job, * = str.strip.split("\t")
+      new(JobNet::Ref.parse(job))
     end
   end
 

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.10.0'
+  VERSION = '5.11.0'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.9.6)
+    bricolage (5.11.0)
       aws-sdk (< 2)
       mysql2
       pg
@@ -23,7 +23,7 @@ GEM
     json (1.8.3)
     mini_portile (0.6.2)
     msgpack (0.5.11)
-    mysql2 (0.4.0)
+    mysql2 (0.4.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     parallel (0.6.5)

data/test/home/jobnet-test.rb

@@ -0,0 +1,61 @@
+require 'bricolage/jobflow'
+require 'pathname'
+require 'stringio'
+require 'forwardable'
+require 'pp'
+
+class ConstantLoader
+  def initialize(subnets)
+    @subnets = subnets
+  end
+
+  def load(ref)
+    @subnets[ref.to_s]
+  end
+end
+
+def root_flow(subnets)
+  h = {}
+  subnets.each do |flow|
+    h[flow.name] = flow
+  end
+  root = Bricolage::RootJobFlow.new(ConstantLoader.new(h))
+  subnets.each do |flow|
+    root.add_subnet flow
+  end
+  root.fix
+  root
+end
+
+class StringFile
+  def initialize(str, path)
+    @f = StringIO.new(str)
+    @path = path
+  end
+
+  attr_reader :path
+
+  extend Forwardable
+  def_delegators '@f', :each, :lineno
+end
+
+def make_flow(src, name)
+  path = "test/#{name}.jobnet"
+  ref = Bricolage::JobFlow.make_node_ref(Pathname(path))
+  Bricolage::JobFlow.parse_stream(StringFile.new(src, path), ref)
+end
+
+net1 = make_flow(<<-End, 'net1')
+job1
+-> *net2
+-> job4
+End
+
+net2 = make_flow(<<-End, 'net2')
+job3
+-> job4
+End
+
+root_flow([net1, net2]).each_subnet do |flow|
+  pp flow.sequential_nodes
+end

data/test/home/subsys/job1.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job2.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job3.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job4.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job5.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job6.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/job7.job

@@ -0,0 +1 @@
+class: noop

data/test/home/subsys/net1.jobnet

@@ -0,0 +1,3 @@
+job1
+-> *net2
+-> job4

data/test/home/subsys/net2.jobnet

@@ -0,0 +1,2 @@
+job2
+-> job3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.11.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -137,7 +137,7 @@ files:
 - lib/bricolage/job.rb
 - lib/bricolage/jobclass.rb
 - lib/bricolage/jobfile.rb
-- lib/bricolage/jobflow.rb
+- lib/bricolage/jobnet.rb
 - lib/bricolage/jobnetrunner.rb
 - lib/bricolage/jobresult.rb
 - lib/bricolage/logger.rb
@@ -168,12 +168,22 @@ files:
 - test/home/data/20141002-1355_00.txt
 - test/home/data/20141002-1355_01.txt
 - test/home/data/20141002-1355_02.txt
+- test/home/jobnet-test.rb
 - test/home/put.sh
 - test/home/revert.sh
 - test/home/subsys/d.ct
+- test/home/subsys/job1.job
+- test/home/subsys/job2.job
+- test/home/subsys/job3.job
+- test/home/subsys/job4.job
+- test/home/subsys/job5.job
+- test/home/subsys/job6.job
+- test/home/subsys/job7.job
 - test/home/subsys/load_test.ct
 - test/home/subsys/load_test.job
 - test/home/subsys/migrate.job
+- test/home/subsys/net1.jobnet
+- test/home/subsys/net2.jobnet
 - test/home/subsys/raw-vacuum.sql.job
 - test/home/subsys/rebuild.sql.job
 - test/home/subsys/search_backends.ct