cfhighlander 0.12.2.alpha.1603236787 → 0.12.4.alpha.1616763884

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d160b0c44c1e25a1fbcd9525a23fb48380035ec2f3567af0c4470088ef6ec8d6
-  data.tar.gz: '083bf6f5eeefc20d94ba90c1de9fb4162fd71c16ac0d24dea11830149da118db'
+  metadata.gz: 971fd05e850846f424be114850c75274e7476eab5c6b5dc3e8f78579174e9b25
+  data.tar.gz: c936f08a81eab73aaedc8b152d4179c977cbaea2f39773581c9a1a910fb8fdef
 SHA512:
-  metadata.gz: 037d811aef701656f57aa102d77d18e6729eb434ac53fa63f59dd280a4047c39594ae3914ec51facb6760d004d52b2d7e4ee7fcf354ad1ceac8535055c7732a2
-  data.tar.gz: cf3348f683377b133a362d1b4e19ee349aeeea8ebdf46368cd195569c79c705b5f10f794004428b7e1c95423340d646f7a241ff37e201fb3e95b92a54b4bb784
+  metadata.gz: 3f21780ef6a21d184b8cbee2ebbc31b64d85921fcb3e3f31b9f0e8ca0cad30803b5a93d0269eeb407e71fa67d7972bd0acc894839ef0057372c0a097e29bc723
+  data.tar.gz: 747e582672f985bb7259c3d9e14125750430f11f94aa52848c48e96b0037db16276dc10918b050d619a137fce919fe750c4056940b6c18c2f43adbe0be478566

data/lib/cfhighlander.model.component.rb

@@ -133,6 +133,8 @@ module Cfhighlander
         @config['template_name'] = @template.template_name
         @config['template_version'] = @template.template_version
         @config['template_dir'] = @template.template_location
+        @config['distribution_bucket'] = @distribution_bucket
+        @config['distribution_prefix'] = @distribution_prefix
 
         Dir[candidate_mappings_path].each do |mapping_file|
           mappings = YAML.load(File.read(mapping_file))

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.12.2".freeze
+  VERSION="0.12.4".freeze
 end

data/lib/util/cloudformation.util.rb

@@ -110,8 +110,13 @@ module Cfhighlander
           model = sub_component.component_loaded.cfn_model_raw
           model[element_name].each do |resource, value|
             # effective extraction of child resource into parent
-            parent_model[element_name] = {} unless parent_model.key? element_name
-            parent_model[element_name][resource] = value
+            # allows for line components to use - or _ in the component name
+            # and still generate valid references
+            safe_resource_name = resource.gsub('-','').gsub('_','')
+            unless element_name == 'Outputs' && resource.end_with?('CfTemplateUrl')
+              parent_model[element_name] = {} unless parent_model.key? element_name
+              parent_model[element_name][safe_resource_name] = value
+            end
           end if model.key? element_name
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.12.2.alpha.1603236787
+  version: 0.12.4.alpha.1616763884
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.3'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -274,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"