aws-cfn-compiler 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2105a3aa92d4cdb15dabc7291f32a9e713ed005
-  data.tar.gz: 272bb57033e267313b23d2c7a1994f3b2ae9c7fd
+  metadata.gz: 019dafeae443d80e16ceb89976cf30631d604549
+  data.tar.gz: b1084eebc7b900226f28cf1e8495f907a8557ad5
 SHA512:
-  metadata.gz: bd87a92ddf6f11014474efd1ed29c2437a120dc6124eb642f530c9cf08b4ac13ee9ec888d9aa311c945f65802e30ba6ad9f6d49fab38936f0d2b5c11d0f7252d
-  data.tar.gz: f9759dfd8f0705f55b10e24bb8ed221b97e6561ed86fe07a65a1e95b65a8af03499d77892aa632f7752d755a383e8af5846e22bd9c060cb2bfd70b7d640964e3
+  metadata.gz: 4a5a32097b35d96fcc853affbce36e3ac03a516ad443a8742e78b38cd309f99831b3e1d0e5b8c49a90f9faa8aeaeca0cd79d78ef3a7de6e1ccea891c5a509598
+  data.tar.gz: 5f55f0c6564dd2a5f74f2c64a7fb27d8a6e8a04e8b167e062f12628dcaf5ea3a6aa76cea3be6b498586187b46e833d38ae5b6d5b389cbe1c2a28664f57cc6ab2

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

@@ -21,6 +21,7 @@ module Aws
         end
 
         def dynamic_item(section,resource,hash)
+          abort! "Invalid section '#{section}'\nValid sections are: #{@all_sections.join(',')}" unless @all_sections.include?(section)
           unless @dynamic_items.has_key?(section)
             @dynamic_items[section] ||= {}
           end

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

@@ -81,8 +81,9 @@ module Aws
             @items[section] ||= {}
             @dynamic_items[section] ||= {}
             get  = {}
-            item = {}
             spec[section].each do |rsrc|
+              item = {}
+              item[section] ||= {}
               @logger.debug "\tUsing #{section}::#{rsrc}"
               refp,sub,base,rel = map_resource_reference(rsrc)
               if refp.nil?
@@ -96,7 +97,7 @@ module Aws
               end
               set = get[path]
               if set[base]
-                if item.has_key?(base)
+                if item[section].has_key?(base)
                   @logger.error "  !! error: Duplicate item: #{section}/#{base}"
                   abort!
                 end
@@ -113,46 +114,40 @@ module Aws
                   next if content.size==0
 
                   if filename =~ /\.(rb|ruby)\z/i
-                    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
+                    item = parse_rb_file(base, section, filename)
                   elsif filename =~ /\.js(|on)\z/i
-                    item.merge! JSON.parse(content)
+                    item[section].merge! JSON.parse(content)
                   elsif filename =~ /\.ya?ml\z/i
-                    item.merge! YAML.load(content)
+                    item[section].merge! YAML.load(content)
                   else
                     next
                   end
 
-                  unless item.has_key?(base)
+                  unless item[section].has_key?(base)
                     filn = if @config[:expandedpaths]
                              filename
                            else
                              short_path(filename,2)
                            end
-                    @logger.error "  !! error: Brick in #{filn} does not define #{section}/#{base}!?\nIt defines these: #{item.keys}"
+                    @logger.error "  !! error: Brick in #{filn} does not define #{section}/#{base}!?\nIt defines these: #{item[section].keys}"
                     abort!
                   end
                 rescue
                   abort! "  !! error: #{$!}"
                 end
+                item.each { |sect,hash|
+                  hash.keys.each do |key|
+                    if @items.has_key?(sect)
+                      if @items[sect].has_key?(key)
+                        abort! "  !! error: Duplicate item: #{sect}/#{key}"
+                      end
+                    else
+                      @items[sect] ||= {}
+                    end
+                  end
+                  @items[sect].merge! hash
+                }
               else
                 pm = []
                 set.map { |r,f|
@@ -162,12 +157,6 @@ module Aws
                 abort! "  !! error: #{section}/#{base} not found! Possible matches: #{pm}"
               end
             end
-            item.keys.each { |key|
-              if @items[section].has_key?(key)
-                abort! "  !! error: Duplicate item: #{section}/#{key}"
-              end
-            }
-            @items[section].merge! item
 
             unless @items[section].keys.count == (spec[section].count + @dynamic_items[section].keys.count)
               @logger.error "#{section} section check failed! \nRequested: #{spec[section]}\n    Found: #{@items[section].keys}\n  Dynamic: #{@dynamic_items[section].keys}\n"+
@@ -200,9 +189,11 @@ module Aws
             abort! "Cannot compile #{source_file}\n\n" + e.message + "\n\n" + e.backtrace.to_s
           end
           unless @dsl.dict[section.to_sym]
-            abort! "Unable to compile/expand #{filename} for #{section}/#{base}"
+            abort! "Unable to compile/expand #{filename} for #{section}/#{base}.\n(No #{section} were created?!)"
           end
-          sym_to_s(@dsl.dict)
+          dict = sym_to_s(@dsl.dict)
+          @dsl = Aws::Cfn::Dsl::Template.new(@config[:directory])
+          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.17'
+      VERSION = '0.9.18'
     end
   end
 end

metadata

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