kitchenplan 2.1.15 → 2.1.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kitchenplan/config.rb +4 -7
- 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: d46b1bd5831d618ca09aa815b29efd483e2def87
|
|
4
|
+
data.tar.gz: e95a103eece0602bb829a96f8d66283af0404eb8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e6e4a94c91c3e314dd38f665892996ac2295ab868731420183863c0d0dd397c74e4d7780cc8297c5cf393ca43ab9269caaa48b544686ead38e017c17c96cfb4a
|
|
7
|
+
data.tar.gz: 03fcd97fb043eda7a87c438a5e4663771acccebf5c2996e3c9acc03d03bfc5748fa9198b2ae708bba475d3043628751b5d8fc8860931e6e6f5ebcff4d71b184d
|
data/lib/kitchenplan/config.rb
CHANGED
|
@@ -80,6 +80,10 @@ module Kitchenplan
|
|
|
80
80
|
people_recipes = @people_config['recipes'] || {}
|
|
81
81
|
config['recipes'] |= people_recipes['global'] || []
|
|
82
82
|
config['recipes'] |= people_recipes[@platform] || []
|
|
83
|
+
|
|
84
|
+
system_recipes = @system_config['recipes'] || {}
|
|
85
|
+
config['recipes'] |= system_recipes['global'] || []
|
|
86
|
+
config['recipes'] |= system_recipes[@platform] || []
|
|
83
87
|
|
|
84
88
|
# First take the attributes from default.yml
|
|
85
89
|
config['attributes'] = {}
|
|
@@ -95,13 +99,6 @@ module Kitchenplan
|
|
|
95
99
|
config['attributes'].deep_merge!(people_attributes) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
|
|
96
100
|
|
|
97
101
|
# lastly override from the system files
|
|
98
|
-
system_recipes = @system_config['recipes'] || {}
|
|
99
|
-
config['recipes'] |= system_recipes['global'] || []
|
|
100
|
-
config['recipes'] |= system_recipes[@platform] || []
|
|
101
|
-
config['attributes'].deep_merge!(@default_config['attributes'] || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
|
|
102
|
-
@group_configs.each do |group_name, group_config|
|
|
103
|
-
config['attributes'].deep_merge!(group_config['attributes']) { |key, old, new| Array.wrap(old) + Array.wrap(new) } unless group_config['attributes'].nil?
|
|
104
|
-
end
|
|
105
102
|
system_attributes = @system_config['attributes'] || {}
|
|
106
103
|
config['attributes'].deep_merge!(system_attributes) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
|
|
107
104
|
|