bricolage 5.28.1 → 5.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02cd3cdb2d65b2d74f5f1c2a59afa40cae3ee0ba439f7dad10328ce2f59327be
-  data.tar.gz: b849c08932d338e64b6fcd815b02280ba2032488db5681ef1b9a60edb758d5a3
+  metadata.gz: 937a773a3be70440b08a33edea44480af5b5b4e9857081e5e9dfafeff7298cf0
+  data.tar.gz: 373f091f9ce32ade9862e6c9d114c0ed760166a050ba67b3fa25d29fa42183b2
 SHA512:
-  metadata.gz: 7d1d85abad9d1a5eac78c30aa0bf8225cea5af3f8f7d2a53ae5640ef44765c023ca2dc02357d4d847be810d52be54e07742e57a1c45ee1027d7efb3a4327ea9b
-  data.tar.gz: 9adf944eb2605b6a3c5f2980fd04c7a9a8a0493657a644e348138f424f59f22afb549fc607c716175af10306b18ad98d38477173c7238705cd902554303caeed
+  metadata.gz: 338d2113c8fc175a15f57fcaae506f83da82c60179bdbcf828fb68da45545f2988afec5eed0a70a79292030d93cb97d68862da2e716f6c409f80eb1cf1d0874f
+  data.tar.gz: afa065e5b744ae159a018a050a9e2bb693fce818bc799e85c762b42291597ab96e64223d8569d0c17559ed96e16fe8771b342f2b632f490a43e93e902dcd58aa

data/RELEASE.md

@@ -1,5 +1,9 @@
 # Bricolage Release Note
 
+## version 5.29.0
+
+- [new] bricolage-jobnet command accepts multiple jobs/jobnets and executes them sequencially.
+
 ## version 5.28.1
 
 - [new] new environment BRICOLAGE_DISABLE_QUEUE to disable jobnet queue.

data/lib/bricolage/jobnet.rb

@@ -5,11 +5,12 @@ module Bricolage
 
   # Represents "first" jobnet given by command line (e.g. bricolage-jobnet some.jobnet)
   class RootJobNet
-    def RootJobNet.load_auto(ctx, path)
-      if path.extname == '.job'
-        load_single_job(ctx, path)
+    def RootJobNet.load_auto(ctx, pathes)
+      pathes = Array(pathes)
+      if pathes.size == 1 and pathes.first.extname == '.jobnet'
+        load(ctx, pathes.first)
       else
-        load(ctx, path)
+        load_multiple_jobs(ctx, pathes)
       end
     end
 
@@ -21,7 +22,11 @@ module Bricolage
     end
 
     def RootJobNet.load_single_job(ctx, path)
-      root = new(JobNet::FileLoader.new(ctx), JobNet.load_single_job(path), path)
+      load_multiple_jobs(ctx, [path])
+    end
+
+    def RootJobNet.load_multiple_jobs(ctx, pathes)
+      root = new(JobNet::FileLoader.new(ctx), JobNet.load_multiple_jobs(pathes), pathes.first)
       root.load_recursive
       root.fix
       root
@@ -166,9 +171,28 @@ module Bricolage
     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)
+      load_multiple_jobs([path], ref)
+    end
+
+    def JobNet.load_multiple_jobs(pathes, ref = JobNetRef.for_job_path(pathes.first))
+      jobnet_script = StringIO.new
+      prev = nil
+      pathes.each do |path|
+        jobnet_script.print '-> ' if prev
+        case path.extname
+        when '.job'
+          r = JobRef.for_path(path)
+          jobnet_script.puts r.to_s
+        when '.jobnet'
+          r = JobNetRef.for_job_path(path)
+          jobnet_script.puts r.to_s
+        else
+          raise ParameterError, "is not a job nor a jobnet: #{path}"
+        end
+        prev = r
+      end
+      jobnet_script.rewind
+      Parser.new(ref).parse_stream(jobnet_script)
     end
 
     def initialize(ref, location)
@@ -364,6 +388,19 @@ module Bricolage
     end
 
     class JobRef < Ref
+      def JobRef.for_path(path)
+        new(path.parent.basename, JobRef.strip_exts(path), Location.dummy)
+      end
+
+      def JobRef.strip_exts(path)
+        basename = path
+        # remove all extnames
+        until (ext = basename.extname).empty?
+          basename = basename.basename(ext)
+        end
+        basename
+      end
+
       def net?
         false
       end
@@ -375,12 +412,7 @@ module Bricolage
       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)
+        new(path.parent.basename, JobRef.strip_exts(path), Location.dummy)
       end
 
       def initialize(subsys, name, location)

data/lib/bricolage/jobnetrunner.rb

@@ -39,15 +39,15 @@ module Bricolage
       @hooks.run_before_option_parsing_hooks(opts)
       opts.parse!(ARGV)
 
-      @ctx = Context.for_application(job_path: opts.jobnet_file, environment: opts.environment, global_variables: opts.global_variables)
+      @ctx = Context.for_application(job_path: opts.jobnet_files.first, environment: opts.environment, global_variables: opts.global_variables)
       opts.merge_saved_options(@ctx.load_system_options)
 
-      jobnet = RootJobNet.load_auto(@ctx, opts.jobnet_file)
+      jobnet = RootJobNet.load_auto(@ctx, opts.jobnet_files)
       @jobnet_id = jobnet.id
 
       if opts.dump_options?
         puts "jobnet-id=#{@jobnet_id}"
-        puts "jobnet-file=#{opts.jobnet_file}"
+        puts "jobnet-file=#{opts.jobnet_files.first}"
         opts.option_pairs.each do |key, value|
           puts "#{key}=#{value.inspect}"
         end
@@ -307,15 +307,15 @@ Options:
       def parse!(argv)
         @parser.parse!(argv)
         raise OptionError, "missing jobnet file" if argv.empty?
-        raise OptionError, "too many jobnet file" if argv.size > 1
-        @jobnet_file = Pathname(argv.first)
+        @jobnet_files = argv.map {|path| Pathname(path) }
         build_common_options!
       rescue OptionParser::ParseError => ex
         raise OptionError, ex.message
       end
 
       attr_reader :environment
-      attr_reader :jobnet_file
+
+      attr_reader :jobnet_files
 
       attr_reader :global_variables
 

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.28.1'
+  VERSION = '5.29.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.28.1
+  version: 5.29.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg