cfhighlander 0.6.1 → 0.7.0.alpha.1539253803

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 878654061b345c872f208ac64e71b82b07980ab6a7a3473461d8cfc5f11a3a92
-  data.tar.gz: 2ae505090ea7955520aafedac10869a34a2d402662f923ab578e027ddc3a4c18
+  metadata.gz: 229b8189ae6e94ec037ab24a56f7f5a08db541774838874933b7ceab055ca1be
+  data.tar.gz: 1a3a2fb4be02415c2b946607174e5f568d6679b8946e5a85460bc5a2a0487fc0
 SHA512:
-  metadata.gz: 22bdf404a1aee8d76972ff692fb7e9566a32d9601aa971ccbaf38b278f6e630050bc8e1df2f02a26a951abaece69bac647d1d4dff4d7e8a3dec49cad1a4defff
-  data.tar.gz: 15d767b1e46d63db01a949d7dc729cdcbf7285c35351c29798c76b1bbd5ea6a4b9d76e26692c56dd379146d79f1d3dcf2400f8aa31777ae2eabc04b9e9e1680a
+  metadata.gz: 211adccc53e6b274c4e9975d9cd3dbe04c459a6fd973c0c4307028dc8af9cd587aac8eabdbf4c68334d00af47b24ffff62599da280a97797ccb493ef32cec31b
+  data.tar.gz: 3590228746dfd1e8318b846891049eb364d4505196987bcc746231994ca75802767fb7511ccde02b942b1938bcc199e66b883f4e2aab44e828631cbe298c5430

data/lib/cfhighlander.compiler.rb

@@ -171,7 +171,8 @@ module Cfhighlander
         # `cfndsl #{@cfndsl_compiled_path} -p -f #{format} -o #{output_path} --disable-binding`
         puts "CloudFormation #{format.upcase} template for #{dsl.name} written to #{output_path}"
 
-        return JSON.parse(model.to_json)
+
+
 
       end
 

data/lib/util/cloudformation.util.rb

@@ -44,7 +44,7 @@ module Cfhighlander
         model = component.cfn_model_raw
         template.subcomponents.each do |sub_component|
           next unless sub_component.inlined
-          model['Resources'].delete(sub_component.cfn_name)
+          model['Resources'].delete(sub_component.component_loaded.name)
         end
       end
 
@@ -94,12 +94,6 @@ module Cfhighlander
         inline_elements('Conditions', component, template)
         inline_elements('Mappings', component, template)
         inline_elements('Resources', component, template)
-
-        # outputs are renamed AFTER all of the other processing
-        # has been done, as outputs are referenced. Only
-        # outputs of inlined components are renamed
-        flatten_namespace('Outputs', component, template)
-        Debug.debug_dump_cfn(template, 'flat.outputs')
         inline_elements('Outputs', component, template)
       end
 
@@ -370,7 +364,7 @@ module Cfhighlander
       def self.rename_mapping(tree, search, replacement)
         tree.keys.each do |k|
           v = tree[k]
-          if k == 'Fn::FindInMap' and v[0] == search
+          if k == 'Fn::FindInMap' and v[0] = search
             tree[k] = [replacement, v[1], v[2]]
           end
 
@@ -446,6 +440,9 @@ module Cfhighlander
 
         flatten_namespace('Resources', component, template)
         Debug.debug_dump_cfn(template, 'flat.resources')
+
+        flatten_namespace('Outputs', component, template)
+        Debug.debug_dump_cfn(template, 'flat.outputs')
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.alpha.1539253803
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -293,12 +293,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 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.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components