bricolage 5.20.5 → 5.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54eb8ff011e173d9091a2945ef189097c5fc055e
-  data.tar.gz: c68f93bf30468fdcb221c09d0c81e43d8f9a58be
+  metadata.gz: 38fa88f0cfbee0ae3d6cca03c6a50d9b148c2e3b
+  data.tar.gz: 29c84154960c9a298bb0966beaf5b37586a09636
 SHA512:
-  metadata.gz: aa8293db93a8df5d17dc69827d6ad4f18638e6dfb0e79af33a40f26cebced6d4b682f83078df8105f512909d58f10513f292f2e1197940b25244dcbee975691a
-  data.tar.gz: 3f2ddade13d2cb6662624c91fde4fb1223eeeeba084256c5008084867577e4ef7c04f5e628c66a98200c92c907ddb0565207a9b0f3224bf55338a55012d00b54
+  metadata.gz: 6fa588561652d3108036557074222f77f8ea21e88141cfd9fa6d3cfcf6a81a32f0ec068cc05fb78eb8014ec8c925daf20b04818ff9c4ba0da42117f9d6db734e
+  data.tar.gz: 20c5afefe133f3f49da1e3bb9b9d5f31aaa86c90fa1ef190fb6cdec31926d5366da10bd0c8959bea21c94a7aaf7cbffd77028d85ae03194ae69f76171d5da1ca

data/lib/bricolage/jobnet.rb

@@ -12,6 +12,13 @@ module Bricolage
       root
     end
 
+    def RootJobNet.load_single_job(ctx, path)
+      root = new(JobNet::FileLoader.new(ctx), JobNet.load_single_job(path))
+      root.load_recursive
+      root.fix
+      root
+    end
+
     def initialize(jobnet_loader, start_jobnet)
       @jobnet_loader = jobnet_loader
       @start_jobnet = start_jobnet
@@ -140,6 +147,12 @@ module Bricolage
       raise ParameterError, "could not load jobnet: #{path} (#{err.message})"
     end
 
+    def JobNet.load_single_job(path, ref = JobNetRef.for_job_path(path))
+      jobnet_script = ref.name.to_s
+      script_io = StringIO.new(jobnet_script)
+      Parser.new(ref).parse_stream(script_io)
+    end
+
     def initialize(ref, location)
       @ref = ref
       @location = location
@@ -241,9 +254,9 @@ module Bricolage
         @jobnet_ref = jobnet_ref
       end
 
-      def parse_stream(f)
-        net = JobNet.new(@jobnet_ref, Location.for_file(f))
-        foreach_edge(f) do |src, dest|
+      def parse_stream(io)
+        net = JobNet.new(@jobnet_ref, Location.for_io(io))
+        foreach_edge(io) do |src, dest|
           net.add_edge src, dest
         end
         net
@@ -261,7 +274,7 @@ module Bricolage
         f.each do |line|
           text = line.sub(/\#.*/, '').strip
           next if text.empty?
-          loc = Location.for_file(f)
+          loc = Location.for_io(f)
 
           if m = DEPEND_PATTERN.match(text)
             src = (m[1] ? ref(m[1], loc) : default_src) or
@@ -343,6 +356,15 @@ module Bricolage
         new(path.parent.basename, path.basename('.jobnet'), Location.dummy)
       end
 
+      def JobNetRef.for_job_path(path)
+        basename = path
+        # remove all extnames
+        until (ext = basename.extname).empty?
+          basename = basename.basename(ext)
+        end
+        new(path.parent.basename, basename, Location.dummy)
+      end
+
       def initialize(subsys, name, location)
         super
         @jobnet = nil
@@ -391,6 +413,18 @@ module Bricolage
         new(f.path, f.lineno)
       end
 
+      def Location.for_non_file(io)
+        new(io.inspect, io.lineno)
+      end
+
+      def Location.for_io(io)
+        if io.respond_to?(:path)
+          for_file(io)
+        else
+          for_non_file(io)
+        end
+      end
+
       def initialize(file, lineno)
         @file = file
         @lineno = lineno

data/lib/bricolage/jobnetrunner.rb

@@ -39,7 +39,12 @@ module Bricolage
       @ctx = Context.for_application(nil, opts.jobnet_file, environment: opts.environment, global_variables: opts.global_variables)
       @jobnet_id = "#{opts.jobnet_file.dirname.basename}/#{opts.jobnet_file.basename('.jobnet')}"
       @log_path = opts.log_path
-      jobnet = RootJobNet.load(@ctx, opts.jobnet_file)
+      jobnet =
+        if opts.jobnet_file.extname == '.job'
+          RootJobNet.load_single_job(@ctx, opts.jobnet_file)
+        else
+          RootJobNet.load(@ctx, opts.jobnet_file)
+        end
       queue = get_queue(opts)
       if queue.locked?
         raise ParameterError, "Job queue is still locked. If you are sure to restart jobnet, #{queue.unlock_help}"

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.20.5'
+  VERSION = '5.21.0'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.20.5)
+    bricolage (5.21.0)
       aws-sdk (~> 2)
       mysql2
       pg (~> 0.18.0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.20.5
+  version: 5.21.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg