cfhighlander 0.5.0.alpha.1535960611 → 0.5.0.alpha.1535961316
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/lib/cfhighlander.dsl.template.rb +2 -1
- data/lib/cfhighlander.model.component.rb +0 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5d3f2fc2c0753578e7d988f09119fc32dd44f898b8a73629730a09085f1fddc5
|
|
4
|
+
data.tar.gz: 006d4985a78560abaac2dbdbf751c6cc1a1f7ec46eb4852eca97698ca0b8d81a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 32c21c1e1b80b2cb54d2927ceed810835e6cb79cf89be3c79fa12957422717739cee583820da324d6e390dd9832a18564b536ef4ba2b08a8b9181ad5ca5e97f4
|
|
7
|
+
data.tar.gz: 5f97f28dc17688fd9565f9ef604fe9755db3d814b6907f3bf2ee858f265ed94b7b2667c63cacec8bf60e78371752c223de16fe7264e736d32f4b9a1880552696
|
|
@@ -499,7 +499,8 @@ def CfhighlanderTemplate(&block)
|
|
|
499
499
|
if config.key? 'components'
|
|
500
500
|
if config['components'].key? name
|
|
501
501
|
if config['components'][name].key? 'config'
|
|
502
|
-
|
|
502
|
+
# old legacy format takes priority, but these can be mixed
|
|
503
|
+
config.extend config['components'][name]['config']
|
|
503
504
|
end
|
|
504
505
|
end
|
|
505
506
|
end
|
|
@@ -127,7 +127,6 @@ module Cfhighlander
|
|
|
127
127
|
@config['template_name'] = @template.template_name
|
|
128
128
|
@config['template_version'] = @template.template_version
|
|
129
129
|
|
|
130
|
-
|
|
131
130
|
Dir[candidate_mappings_path].each do |mapping_file|
|
|
132
131
|
mappings = YAML.load(File.read(mapping_file))
|
|
133
132
|
@component_files << mapping_file
|