cfhighlander 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57caba467898abb1f2370ae4e3ed592589fa49c1e341ce5d7f27c001d74a45ec
-  data.tar.gz: e3884a51f63a96bd71d024d76c2da44bf6c44400b95ac2a7d1296866f82e34e1
+  metadata.gz: 604f8f52d76f55b9bd84c22054f03298c4fe27a462843d4a24799bf2913ecf71
+  data.tar.gz: d5934fff23883b7f1726db24de1d62dc501d86e03e1748410bcb277881a27244
 SHA512:
-  metadata.gz: 8330318740b282f849ae825049cdea36ad410dd4098923e7985b1a63e99ea435270e871b4deca58b77b6a990cecc59e1b2b5ef26bf49fdc86f406201931d61be
-  data.tar.gz: 45ae9b3e757d3bea46ad464341b6f632a982f08e5136e88514dfb7f5e8ed19fb4fdd567df03653fdfc1dd47d6941271c16e43b29a0ab3158010cff9ac24403db
+  metadata.gz: 78787af0a8c18c824e9af82c29c1db585965246a8175438ff9f50242999bbe3ace19694f6c8f03995d87d62a414569263db06dac9b52ee5da8460afd817ebf22
+  data.tar.gz: be064150b8f28d1d13e79593ce8e5a268c1c7ea87a602906c2592c8fd1005097e63f3f48e4f0e0823c3c4879cfbaf33f1f34f9901babb70a418c148e7aa98985

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
+  version: 0.12.4
 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:
   - - ">="