bricolage 5.28.0 → 5.28.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/RELEASE.md +5 -0
- data/lib/bricolage/datasource.rb +4 -2
- data/lib/bricolage/jobnetrunner.rb +3 -0
- data/lib/bricolage/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 02cd3cdb2d65b2d74f5f1c2a59afa40cae3ee0ba439f7dad10328ce2f59327be
|
|
4
|
+
data.tar.gz: b849c08932d338e64b6fcd815b02280ba2032488db5681ef1b9a60edb758d5a3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7d1d85abad9d1a5eac78c30aa0bf8225cea5af3f8f7d2a53ae5640ef44765c023ca2dc02357d4d847be810d52be54e07742e57a1c45ee1027d7efb3a4327ea9b
|
|
7
|
+
data.tar.gz: 9adf944eb2605b6a3c5f2980fd04c7a9a8a0493657a644e348138f424f59f22afb549fc607c716175af10306b18ad98d38477173c7238705cd902554303caeed
|
data/RELEASE.md
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# Bricolage Release Note
|
|
2
2
|
|
|
3
|
+
## version 5.28.1
|
|
4
|
+
|
|
5
|
+
- [new] new environment BRICOLAGE_DISABLE_QUEUE to disable jobnet queue.
|
|
6
|
+
- [fix] Do not hide true ParameterError thrown by datasource.yml processing.
|
|
7
|
+
|
|
3
8
|
## version 5.28.0
|
|
4
9
|
|
|
5
10
|
- [new] bricolage command now accepts .rb.job, .py.job, .sh.job as a script-embedded job.
|
data/lib/bricolage/datasource.rb
CHANGED
|
@@ -4,6 +4,8 @@ require 'bricolage/exception'
|
|
|
4
4
|
|
|
5
5
|
module Bricolage
|
|
6
6
|
|
|
7
|
+
class DataSourceFileNotExist < ParameterError; end
|
|
8
|
+
|
|
7
9
|
class DataSourceFactory
|
|
8
10
|
DATA_SOURCE_FILE_NAME_1 = 'datasource.yml'
|
|
9
11
|
DATA_SOURCE_FILE_NAME_2 = 'database.yml'
|
|
@@ -14,7 +16,7 @@ module Bricolage
|
|
|
14
16
|
loader.load_passwords(PASSWORD_FILE_NAME)
|
|
15
17
|
begin
|
|
16
18
|
return loader.load(DATA_SOURCE_FILE_NAME_1)
|
|
17
|
-
rescue
|
|
19
|
+
rescue DataSourceFileNotExist
|
|
18
20
|
return loader.load(DATA_SOURCE_FILE_NAME_2)
|
|
19
21
|
end
|
|
20
22
|
end
|
|
@@ -38,7 +40,7 @@ module Bricolage
|
|
|
38
40
|
|
|
39
41
|
def load(basename)
|
|
40
42
|
yml_path = @context.config_pathes(basename).detect(&:exist?)
|
|
41
|
-
raise
|
|
43
|
+
raise DataSourceFileNotExist, "database.yml does not exist" unless yml_path
|
|
42
44
|
@config_dir = yml_path.parent
|
|
43
45
|
DataSourceFactory.new(load_yaml(yml_path), @context, @logger)
|
|
44
46
|
end
|
|
@@ -236,6 +236,9 @@ module Bricolage
|
|
|
236
236
|
if ENV['BRICOLAGE_ENABLE_QUEUE']
|
|
237
237
|
env['enable-queue'] = OptionValue.new('env BRICOLAGE_ENABLE_QUEUE', true)
|
|
238
238
|
end
|
|
239
|
+
if ENV['BRICOLAGE_DISABLE_QUEUE']
|
|
240
|
+
env['enable-queue'] = OptionValue.new('env BRICOLAGE_DISABLE_QUEUE', false)
|
|
241
|
+
end
|
|
239
242
|
if path = ENV['BRICOLAGE_QUEUE_PATH']
|
|
240
243
|
env['queue-path'] = OptionValue.new('env BRICOLAGE_QUEUE_PATH', path)
|
|
241
244
|
end
|
data/lib/bricolage/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bricolage
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.28.
|
|
4
|
+
version: 5.28.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Minero Aoki
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-07-
|
|
11
|
+
date: 2018-07-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: pg
|