bricolage 5.28.0 → 5.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d6d789d6f3c437f1e3e9df962f92db5c7aac168952d633b72be38023d875c1
-  data.tar.gz: adbca861a3b9f811a22338422167f8945ba3d3894bfde294875ccb22c38e1a80
+  metadata.gz: 02cd3cdb2d65b2d74f5f1c2a59afa40cae3ee0ba439f7dad10328ce2f59327be
+  data.tar.gz: b849c08932d338e64b6fcd815b02280ba2032488db5681ef1b9a60edb758d5a3
 SHA512:
-  metadata.gz: 88a618757a3747efc8e846bb217c382044348b56f64e7f02c67f0e9e64c08fe56534ed4b282542a6639b07417dad40ac4c0a0afe78b14a273944c12d15ec1abf
-  data.tar.gz: a2ee05a0200bd069ff057b98d2bac2640d2dc9f2a984f90f50f844ebab07097961877038c3a7627f8d2adf641ca5b75c24ede6c5f024e959980782e8b7ebc63e
+  metadata.gz: 7d1d85abad9d1a5eac78c30aa0bf8225cea5af3f8f7d2a53ae5640ef44765c023ca2dc02357d4d847be810d52be54e07742e57a1c45ee1027d7efb3a4327ea9b
+  data.tar.gz: 9adf944eb2605b6a3c5f2980fd04c7a9a8a0493657a644e348138f424f59f22afb549fc607c716175af10306b18ad98d38477173c7238705cd902554303caeed

data/RELEASE.md

@@ -1,5 +1,10 @@
 # Bricolage Release Note
 
+## version 5.28.1
+
+- [new] new environment BRICOLAGE_DISABLE_QUEUE to disable jobnet queue.
+- [fix] Do not hide true ParameterError thrown by datasource.yml processing.
+
 ## version 5.28.0
 
 - [new] bricolage command now accepts .rb.job, .py.job, .sh.job as a script-embedded job.

data/lib/bricolage/datasource.rb

@@ -4,6 +4,8 @@ require 'bricolage/exception'
 
 module Bricolage
 
+  class DataSourceFileNotExist < ParameterError; end
+
   class DataSourceFactory
     DATA_SOURCE_FILE_NAME_1 = 'datasource.yml'
     DATA_SOURCE_FILE_NAME_2 = 'database.yml'
@@ -14,7 +16,7 @@ module Bricolage
       loader.load_passwords(PASSWORD_FILE_NAME)
       begin
         return loader.load(DATA_SOURCE_FILE_NAME_1)
-      rescue ParameterError
+      rescue DataSourceFileNotExist
         return loader.load(DATA_SOURCE_FILE_NAME_2)
       end
     end
@@ -38,7 +40,7 @@ module Bricolage
 
       def load(basename)
         yml_path = @context.config_pathes(basename).detect(&:exist?)
-        raise ParameterError, "database.yml does not exist" unless yml_path
+        raise DataSourceFileNotExist, "database.yml does not exist" unless yml_path
         @config_dir = yml_path.parent
         DataSourceFactory.new(load_yaml(yml_path), @context, @logger)
       end

data/lib/bricolage/jobnetrunner.rb

@@ -236,6 +236,9 @@ module Bricolage
         if ENV['BRICOLAGE_ENABLE_QUEUE']
           env['enable-queue'] = OptionValue.new('env BRICOLAGE_ENABLE_QUEUE', true)
         end
+        if ENV['BRICOLAGE_DISABLE_QUEUE']
+          env['enable-queue'] = OptionValue.new('env BRICOLAGE_DISABLE_QUEUE', false)
+        end
         if path = ENV['BRICOLAGE_QUEUE_PATH']
           env['queue-path'] = OptionValue.new('env BRICOLAGE_QUEUE_PATH', path)
         end

data/lib/bricolage/version.rb

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

metadata

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