aws-cfn-compiler 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa67c6abac790de18d8b0e01297ca6f9190f58d
-  data.tar.gz: 3d35bcff65de84a375eeef9ddc206fdf91d99404
+  metadata.gz: c2105a3aa92d4cdb15dabc7291f32a9e713ed005
+  data.tar.gz: 272bb57033e267313b23d2c7a1994f3b2ae9c7fd
 SHA512:
-  metadata.gz: c416e8f8966bddeb7050927ab9091fd744d271702c4ebfcae19952ebe9cd95610fbc8006af7052e42e3c4fb6169cdc479ce6b46f75aad54a031a828edaf0a7e1
-  data.tar.gz: 6638aa837d9eeaecf4641422ec5eff9ad1f2b81038602c17240d22c0ea69c94ed6652a0c040d19b22e3549b1468be3647c9c3748e3ef8b2823bcf94b7779e935
+  metadata.gz: bd87a92ddf6f11014474efd1ed29c2437a120dc6124eb642f530c9cf08b4ac13ee9ec888d9aa311c945f65802e30ba6ad9f6d49fab38936f0d2b5c11d0f7252d
+  data.tar.gz: f9759dfd8f0705f55b10e24bb8ed221b97e6561ed86fe07a65a1e95b65a8af03499d77892aa632f7752d755a383e8af5846e22bd9c060cb2bfd70b7d640964e3

data/lib/aws/cfn/compiler/base.rb

@@ -21,6 +21,9 @@ module Aws
         end
 
         def dynamic_item(section,resource,hash)
+          unless @dynamic_items.has_key?(section)
+            @dynamic_items[section] ||= {}
+          end
           @dynamic_items[section][resource] = hash
         end
 

data/lib/aws/cfn/compiler/mixins/parse.rb

@@ -113,7 +113,26 @@ module Aws
                   next if content.size==0
 
                   if filename =~ /\.(rb|ruby)\z/i
-                    item.merge! parse_rb_file(base, section, filename)
+                    dict = parse_rb_file(base, section, filename)
+                    # Ruby bricks can now define resources across section boundaries!
+                    dict.each do |sect, itmh|
+                      # Simply merge all the items in the section we are working in as before
+                      if sect == section
+                        item.merge! itmh
+                      else
+                        # And for items in other sections define the section or check for dups
+                        if @items.has_key?(sect)
+                          itmh.each { |key|
+                            if @items[sect].has_key?(key)
+                              abort! "  !! error: Duplicate item: #{sect}/#{key}"
+                            end
+                          }
+                        else
+                          @items[sect] ||= {}
+                        end
+                        @items[sect].merge! itmh
+                      end
+                    end
                   elsif filename =~ /\.js(|on)\z/i
                     item.merge! JSON.parse(content)
                   elsif filename =~ /\.ya?ml\z/i
@@ -151,21 +170,28 @@ module Aws
             @items[section].merge! item
 
             unless @items[section].keys.count == (spec[section].count + @dynamic_items[section].keys.count)
-              abort! "  !! error: Suspect that a #{section} item was missed or not properly named (Brick name and file name mismatch?)! \nRequested: #{spec[section]}\n    Found: #{@items[section].keys}"
+              @logger.error "#{section} section check failed! \nRequested: #{spec[section]}\n    Found: #{@items[section].keys}\n  Dynamic: #{@dynamic_items[section].keys}\n"+
+                            "  !! Suspect that a #{section} item was missed, duplicated or not properly named (Brick name and file name mismatch?)!"
+              @dynamic_items[section].each do |k,_|
+                if @items.has_key?(k)
+                  @logger.error "Dynamic #{section}/#{k} duplicates a static resource!"
+                end
+              end
+              abort! 'Cannot continue'
             end
           end
 
         end
 
         def parse_rb_file(base, section, filename)
-          Aws::Cfn::Compiler.binding ||= {}
-          Aws::Cfn::Compiler.binding[section] ||= {}
+          Aws::Cfn::Compiler.binding                ||= {}
+          Aws::Cfn::Compiler.binding[section]       ||= {}
           Aws::Cfn::Compiler.binding[section][base] ||= {
-              brick_path:       @config[:brick_path],
-              brick_path_list:  @config[:brick_path_list],
-              template:         @dsl,
-              logger:           @logger,
-              compiler:         self
+              :brick_path      => @config[:brick_path],
+              :brick_path_list => @config[:brick_path_list],
+              :template        => @dsl,
+              :logger          => @logger,
+              :compiler        => self
           }
           source_file = File.expand_path(filename)
           begin
@@ -176,7 +202,7 @@ module Aws
           unless @dsl.dict[section.to_sym]
             abort! "Unable to compile/expand #{filename} for #{section}/#{base}"
           end
-          sym_to_s(@dsl.dict[section.to_sym])
+          sym_to_s(@dsl.dict)
         end
 
         def sym_to_s(hash)

data/lib/aws/cfn/compiler/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.9.16'
+      VERSION = '0.9.17'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print