kitchenplan 2.1.14 → 2.1.15
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 +0 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 241fc7b6df322d1f4cdacbf6d8f9149e13942b75
|
|
4
|
+
data.tar.gz: fe1d35bcfe77e2a3bd0f8ed93fc594b08fea701e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f209cb1806385beb7e7bbab7bf388fcc2eacc1b2ebcc1937923abfc2793cf220e761040005edfccbb1968d34429fa4948307dd0f9775f501a1fb6b7a29ea2458
|
|
7
|
+
data.tar.gz: 3bdbc83d8e8d96814c4cd3b699cb4f74bbfa361ef5f75a9a7814bbb41ea2aad7256c389a1514db00878b3c365c76637df30e1dca99a58e9fd1f636351aacee05
|
data/lib/kitchenplan/config.rb
CHANGED
|
@@ -98,7 +98,6 @@ module Kitchenplan
|
|
|
98
98
|
system_recipes = @system_config['recipes'] || {}
|
|
99
99
|
config['recipes'] |= system_recipes['global'] || []
|
|
100
100
|
config['recipes'] |= system_recipes[@platform] || []
|
|
101
|
-
config['attributes'] = {}
|
|
102
101
|
config['attributes'].deep_merge!(@default_config['attributes'] || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
|
|
103
102
|
@group_configs.each do |group_name, group_config|
|
|
104
103
|
config['attributes'].deep_merge!(group_config['attributes']) { |key, old, new| Array.wrap(old) + Array.wrap(new) } unless group_config['attributes'].nil?
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchenplan
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.15
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Roderik van der Veer
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-10-
|
|
11
|
+
date: 2014-10-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: thor
|