bucky-core 0.9.4 → 0.9.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +8 -9
- data/lib/bucky/utils/config.rb +5 -2
- data/lib/bucky/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 536f7acfa4c1369457b108064c8cbd444826474d
|
|
4
|
+
data.tar.gz: 89bbbb4d16a9a936e1d5c477716e2689e20efce9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9a40ce3b626ef266f6d70fd6ca362c8d8a429575f5a5096abdf8e37491edcacd58921cd9bc892ad7038ef265247f58c31e2077e74e11248ceaf8e0d0a384056d
|
|
7
|
+
data.tar.gz: e9b288f27576402d4ff035e743ca6dbc4926f1a197663e0f6ee501b3daf9713005c400fad4443c4ad6ebea5a4e517316947a2c90aef6ea4f11ade80c711bf694
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
bucky-core (0.9.
|
|
4
|
+
bucky-core (0.9.4)
|
|
5
5
|
color_echo (~> 3.1)
|
|
6
6
|
json (~> 2.1)
|
|
7
7
|
nokogiri (~> 1.8)
|
|
@@ -20,25 +20,24 @@ GEM
|
|
|
20
20
|
binding_of_caller (0.8.0)
|
|
21
21
|
debug_inspector (>= 0.0.1)
|
|
22
22
|
byebug (9.1.0)
|
|
23
|
-
childprocess (0.
|
|
24
|
-
|
|
23
|
+
childprocess (1.0.1)
|
|
24
|
+
rake (< 13.0)
|
|
25
25
|
coderay (1.1.2)
|
|
26
26
|
color_echo (3.1.1)
|
|
27
27
|
debug_inspector (0.0.3)
|
|
28
28
|
diff-lcs (1.3)
|
|
29
29
|
docile (1.1.5)
|
|
30
|
-
ffi (1.10.0)
|
|
31
30
|
hirb (0.7.3)
|
|
32
31
|
jaro_winkler (1.5.2)
|
|
33
32
|
json (2.1.0)
|
|
34
33
|
method_source (0.9.0)
|
|
35
34
|
mini_portile2 (2.4.0)
|
|
36
|
-
nokogiri (1.10.
|
|
35
|
+
nokogiri (1.10.3)
|
|
37
36
|
mini_portile2 (~> 2.4.0)
|
|
38
37
|
parallel (1.12.1)
|
|
39
38
|
parser (2.6.3.0)
|
|
40
39
|
ast (~> 2.4.0)
|
|
41
|
-
power_assert (1.1.
|
|
40
|
+
power_assert (1.1.4)
|
|
42
41
|
pry (0.11.3)
|
|
43
42
|
coderay (~> 1.1.0)
|
|
44
43
|
method_source (~> 0.9.0)
|
|
@@ -75,8 +74,8 @@ GEM
|
|
|
75
74
|
ruby-mysql (2.9.14)
|
|
76
75
|
ruby-progressbar (1.10.0)
|
|
77
76
|
rubyzip (1.2.2)
|
|
78
|
-
selenium-webdriver (3.
|
|
79
|
-
childprocess (
|
|
77
|
+
selenium-webdriver (3.142.2)
|
|
78
|
+
childprocess (>= 0.5, < 2.0)
|
|
80
79
|
rubyzip (~> 1.2, >= 1.2.2)
|
|
81
80
|
sequel (4.49.0)
|
|
82
81
|
simplecov (0.15.1)
|
|
@@ -88,7 +87,7 @@ GEM
|
|
|
88
87
|
hirb
|
|
89
88
|
simplecov
|
|
90
89
|
simplecov-html (0.10.2)
|
|
91
|
-
test-unit (3.3.
|
|
90
|
+
test-unit (3.3.3)
|
|
92
91
|
power_assert
|
|
93
92
|
unicode-display_width (1.5.0)
|
|
94
93
|
|
data/lib/bucky/utils/config.rb
CHANGED
|
@@ -20,11 +20,14 @@ module Bucky
|
|
|
20
20
|
# Read from a file of shallow hierarchy, then overwrite it if there is same key in deep hierarchy
|
|
21
21
|
file_sort_hierarchy(@@dir).each do |file|
|
|
22
22
|
file_name = file.split('/').last
|
|
23
|
+
default_config_file = @default_config_dir + '/' + file_name
|
|
23
24
|
data = load_yaml(file)
|
|
24
|
-
default_config_data = load_yaml(@default_config_dir + '/' + file_name)
|
|
25
25
|
next if data.empty?
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
if File.exist?(default_config_file)
|
|
28
|
+
default_config_data = load_yaml(default_config_file)
|
|
29
|
+
data = default_config_data.merge(data)
|
|
30
|
+
end
|
|
28
31
|
@data = @data.merge(data)
|
|
29
32
|
@resources << file
|
|
30
33
|
end
|
data/lib/bucky/version.rb
CHANGED