bricolage 5.22.0 → 5.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6894dfe2fad736476fc5c77d3e9f271d211e9e7
-  data.tar.gz: 7121e86bc937c14b91cbcfe3035dcde4e08aa027
+  metadata.gz: d23da6e1aee97530773a60aafdb8f521b5b59685
+  data.tar.gz: d2558688f61f529f8ea19e0a5d902e0e6d558bf6
 SHA512:
-  metadata.gz: 46411897c454153c4dd2b726a6d9427fe49b3ab8eb4157e2d3054ba09e623709727ddec5124be46ae02777b0c7da3c037b2a2d253dec7a68680ced7dadf96c3b
-  data.tar.gz: 4fe3715fee1220d98eecab7cbe1e3cdd1fe89ee14f19008017dc1f8aea0ad1ca81507f25c8026551098246fce31ddd4a8af720cc9bab2de94ce8ad5c9e7ff231
+  metadata.gz: ff04d18f0ae2d91cf6b79811e1390848ddf3ba070a459b924a2e93766bcbd460ddb49520a0fa0d51a3a2f9486f581d04bc560c1dbd4397ebbd4e4617b8371982
+  data.tar.gz: da630e751c5a614bf13a70f992d4025782741a80db0e7c0ba5ade16ea62ea5c131709fc4aa1e20084dcc6bc9a380b331c8dff16c70014c223bfc1bdfefed8f70

data/lib/bricolage/jobnetrunner.rb

@@ -38,7 +38,7 @@ module Bricolage
       opts = Options.new(self)
       @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)
+      @ctx = Context.for_application(job_path: 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 =
@@ -53,7 +53,7 @@ module Bricolage
       end
       unless queue.queued?
         enqueue_jobs jobnet, queue
-        logger.info "jobs are queued." if opts.queue_exist?
+        logger.info "jobs are queued."
       end
       if opts.list_jobs?
         list_jobs queue
@@ -79,13 +79,32 @@ module Bricolage
     end
 
     def get_queue(opts)
-      if opts.queue_path
-        FileTaskQueue.restore_if_exist(opts.queue_path)
+      if path = get_queue_file_path(opts)
+        logger.info "queue path: #{path}"
+        FileTaskQueue.restore_if_exist(path)
       else
         TaskQueue.new
       end
     end
 
+    def get_queue_file_path(opts)
+      if opts.queue_path
+        opts.queue_path
+      elsif opts.enable_queue?
+        opts.local_state_dir + 'queue' + "#{app_name}.#{@jobnet_id.tr('/', '.')}"
+      else
+        nil
+      end
+    end
+
+    def app_name
+      path = @ctx.home_path.realpath
+      while /\A(?:\d+|current|releases)\z/ =~ path.basename.to_s   # is Capistrano dirs
+        path = path.dirname
+      end
+      path.basename.to_s
+    end
+
     def enqueue_jobs(jobnet, queue)
       seq = 1
       jobnet.sequential_jobs.each do |ref|
@@ -176,7 +195,17 @@ module Bricolage
         @environment = nil
         @jobnet_files = nil
         @log_path = LogFilePath.default
-        @queue_path = nil
+        @local_state_dir = Pathname('/tmp/bricolage')
+        if path = ENV['BRICOLAGE_QUEUE_PATH']
+          @enable_queue = true
+          @queue_path = Pathname(path)
+        elsif ENV['BRICOLAGE_ENABLE_QUEUE']
+          @enable_queue = true
+          @queue_path = nil
+        else
+          @enable_queue = false
+          @queue_path = nil
+        end
         @check_only = false
         @list_jobs = false
         @global_variables = Variables.new
@@ -186,13 +215,16 @@ module Bricolage
 
       attr_reader :environment
       attr_reader :jobnet_file
-      attr_reader :queue_path
       attr_reader :log_path
 
-      def queue_exist?
-        !!@queue_path
+      attr_reader :local_state_dir
+
+      def enable_queue?
+        @enable_queue
       end
 
+      attr_reader :queue_path
+
       def check_only?
         @check_only
       end
@@ -222,7 +254,13 @@ Options:
         parser.on('--log-path=PATH', 'Log file path template.') {|path|
           @log_path = LogFilePath.new(path)
         }
-        parser.on('--queue=PATH', 'Use job queue.') {|path|
+        parser.on('--local-state-dir=PATH', 'Stores local state in this path.') {|path|
+          @local_state_dir = Pathname(path)
+        }
+        parser.on('--enable-queue', 'Enables job queue.') {
+          @enable_queue = true
+        }
+        parser.on('--queue-path=PATH', 'Enables job queue with this path.') {|path|
           @queue_path = Pathname(path)
         }
         parser.on('-c', '--check-only', 'Checks job parameters and quit without executing.') {

data/lib/bricolage/taskqueue.rb

@@ -1,5 +1,6 @@
 require 'bricolage/jobnet'
 require 'bricolage/exception'
+require 'fileutils'
 require 'pathname'
 
 module Bricolage
@@ -92,6 +93,7 @@ module Bricolage
         @path.unlink if @path.exist?
         return
       end
+      FileUtils.mkdir_p @path.dirname
       tmpname = "#{@path}.tmp.#{Process.pid}"
       begin
         File.open(tmpname, 'w') {|f|

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.22.0'
+  VERSION = '5.22.1'
 end

data/test/home/Gemfile.lock

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.22.0
+  version: 5.22.1
 platform: ruby
 authors:
 - Minero Aoki