cfhighlander 0.12.1 → 0.12.3.alpha.1616763759

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f2a474754f86155edd6a16c4fe94900d7cc33c1b38f339a409b73c18c5eb3b
-  data.tar.gz: fdba45406b6ebba85846ec5000845f21e5e3e0d098307ecccf8ea850b5730524
+  metadata.gz: 05fe31ed9c6e37265bcea110b6722160922d9a499c8e6d7895e7d6ca74643e50
+  data.tar.gz: 365024110ee40f76afe96eb337f53111866b58cb9eb7d9e524615c70d9d4686f
 SHA512:
-  metadata.gz: 8b22f33ba15d51b73eecc54632de3c3b2149d20624ef9657cf05a891d74622eb3523b1d01d1842adc3d1c49639d2f6a5d757a6e31a00cfb625f3c5cfcd2bd61f
-  data.tar.gz: 3c394dc8e5694ef55218c708cbe2f53ad4372bac9e8bb0a6af544ab5cc38b07ebbe7f8f508337c7d6c91c358393735c3f7c0b4357876e19c3da379528872367d
+  metadata.gz: c20826deb51168c566c70a09205f38775fdfe01e937917ebfc56653346ce5dfd4df0eff4717847e7afe558528010f00d49c9e039016bd43bfc1e0faefa8c278b
+  data.tar.gz: 9ea39ee3a9c9ad3ab88c62d4a89e10de4c59248ac9bac6cb544ed6b80194d8502be6c80683a4c803591cba09c705ce124c01c096b9b3fb84eece618d5a326c96

data/lib/cfhighlander.dsl.subcomponent.rb

@@ -154,13 +154,12 @@ module Cfhighlander
           param_ovr[:maxValue] = maxValue unless maxValue.nil?
           param_ovr[:minLength] = minLength unless minLength.nil?
           param_ovr[:minValue] = minValue unless minValue.nil?
-          
           @component_loaded.highlander_dsl.Parameters do
             ComponentParam name, value, param_ovr
           end
         else
           parameter.default_value = defaultValue unless defaultValue.nil?
-          parameter.type unless type.nil?
+          parameter.type = type unless type.nil?
           parameter.no_echo = noEcho unless noEcho.nil?
           parameter.allowed_values = allowedValues unless allowedValues.nil?
           parameter.allowed_pattern = allowedPattern unless allowedPattern.nil?

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.1".freeze
+  VERSION="0.12.3".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.1
+  version: 0.12.3.alpha.1616763759
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 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,15 +274,14 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components