aws-cfn-compiler 0.9.3 → 0.9.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTk3ODBmY2U3YTQzODI2YTBmNDQ5NDIwYTcxNjQxNzQ0YmVkZTZkYw==
+    NWQ2NjYyYzZmNmE5ZmU1ODhiYTU3YzA0NDhlOWEzNDY0YzU3NTM1Yg==
   data.tar.gz: !binary |-
-    MzUxNDNkOWU4ZDRjZTI4OWFmNzc1OWVhYmM5MjVmYThlNjI4MTcyNA==
+    MzY4NzNlMzk3MjFmYzJhM2QwYTQxMDcxZTU1ZmFjZjdkYjE0OGQyYw==
 SHA512:
   metadata.gz: !binary |-
-    YjNjNDU4NjEyYWVlZDhhNTA1NDM2ODkyYmQ4MWE3NWNjNWQzMGViMDMxYmRk
-    OTExOGMzN2Q5MGI4ODkyNmI4NDg5MWI4OWZhMTU1MGE2ODQ2MDU1ZmI4N2Q5
-    YzZiNDMwMjM2MGQ1YmZkZjUyZjM3YTY4YmJkZDE2MDNmZTY2YTQ=
+    MmIwZGVkN2RjZDU1NDVjZGQ0MjA2YWU2ZWFjOWEwYzk3MzEzM2EzMWJkM2I1
+    OGM3ZjYzZGJmOWIxZTY4MmU3Mjk3YTFhZjRjMzQxN2EwMzI0MmVhMjlhYTFk
+    ZTM0MTEzYTY3ZGI1OGRjN2I2MzdhZmNlZTNkYjRhZDQxYmZjYWQ=
   data.tar.gz: !binary |-
-    MWIwYTZkMGQwZjAyMGIxZmM2OThjM2NiMzQ4YTM3ZTAxN2I5YmU3ZTQ3MmMw
-    N2RhZmI0MzdhNzk0MTNkYzBmNmY3NjM1NjY2Yjk0NGQyYzdiN2M2NDFhODk2
-    MGJhZDFlMmY3ZDRiNjZmOWY0YjAyODkzOGMwNzk2ZjA4ZDVlNjg=
+    NGJiYjQyYjgzYTczYjZiNDVkOWY0ZDZlNTVhYWMwMjQ0YTMxMzIyZGZiYmYx
+    ZGY2NTgxZjkyMDk1M2VhYTkyNDZkNDg0OWEwMjJiZjZiMzBmZmM3YmYzZjg4
+    NzIwOTllMTc4MzRmZDI5NGU2ZGIxMDhjMmU1ZTdlNDk4YWQzNTE=

data/aws-cfn-compiler.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'slop'
   spec.add_dependency 'inifile'
+  spec.add_dependency 'semverse', '>= 1.1.0'
   spec.add_dependency 'aws-cfn-dsl', '>= 0.9.2'
   spec.add_dependency 'dldinternet-mixlib-cli', '>= 0.2.0'
   spec.add_dependency 'dldinternet-mixlib-logging', '>= 0.4.0'

data/aws-cfn-compiler.iml

@@ -6,7 +6,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p547 [aws-cfn-compile]" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p547 [aws-cfn-yats]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="aws-cfn-dsl" />
     <orderEntry type="module-library">
@@ -28,18 +28,19 @@
     </orderEntry>
     <orderEntry type="module" module-name="dldinternet-mixlib-cli" />
     <orderEntry type="module" module-name="dldinternet-mixlib-logging" />
-    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="detabulator (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.3, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="logging (v1.8.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mixlib-cli (v1.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="detabulator (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="inifile (v2.0.2, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.3, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="logging (v1.8.2, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mixlib-cli (v1.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="semverse (v1.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="slop (v3.5.0, RVM: ruby-1.9.3-p547 [aws-cfn-yats]) [gem]" level="application" />
   </component>
 </module>
 

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

@@ -23,6 +23,36 @@ module Aws
           abort! 'No Resources!?' unless compiled['Resources']
           logStep 'Validating template'
 
+          prms  = compiled['Parameters'].keys rescue []
+          compiled['Parameters'].each do |name,hash|
+            abort! "Parameter #{name} has an invalid compiled block!\n#{hash.ai}" unless hash.is_a?(Hash)
+            if hash['Type']
+              unless %w(String Number CommaDelimitedList).include?(hash['Type'])
+                abort! "Parameter #{name} has an invalid type: #{hash['Type']}"
+              end
+            end
+            if hash['Default']
+              unless hash['Default'].is_a?(String)
+                abort! "Parameter #{name} has an invalid default (Must be string): #{hash['Default']}"
+              end
+            end
+          end
+          @logger.info '  Parameters validated'
+
+          # Mappings => Resources
+          funs  = find_fns(compiled) #.select { |a| !(a =~ /^AWS::/) }
+
+          bad = []
+          funs.each do |fn|
+            unless @valid_functions.include?(fn)
+              bad << fn
+            end
+          end
+          if bad.size > 0
+            abort! "Encountered unsupported function(s) ...\n#{bad.ai}\nSupported functions are:\n#{@valid_functions.ai}"
+          end
+          @logger.info '  Functions validated'
+
           # Mappings => Resources
           maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
           mpgs  = compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys
@@ -46,10 +76,10 @@ module Aws
 
           # Parameters => Resources => Outputs
           refs  = find_refs(compiled).select { |a,_| !(a =~ /^AWS::/) }
-          prms  = compiled['Parameters'].keys rescue []
           rscs  = compiled['Resources'].keys
+          cnds  = compiled['Conditions'].keys rescue []
           # outs  = compiled['Outputs'].keys rescue []
-          names = rscs+prms
+          names = rscs+prms+cnds
 
           net = (refs.keys-names)
           unless net.empty?

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

@@ -26,14 +26,33 @@ module Aws
                       'Name'    => ::Aws::Cfn::Compiler.name,
                       'Version' => ::Aws::Cfn::Compiler::VERSION,
                   }
+                when :Specification
+                  File.basename(@config[:specification])
+                when :Template
+                  File.basename(@config[:template])
                 when :DescriptionString
-                  "#{meta(:Description)} - #{meta(:Name)} v#{meta(:Version)}; Parents: #{meta(:DependsOn)} [Compiled with #{meta(:Compiler,:Name)} v#{meta(:Compiler,:Version)}]"
+                  v = nil
+                  begin
+                    parents = "Parents: #{meta(:DependsOn)} "
+                  rescue
+                    parents = ''
+                  end
+                  # noinspection RubyExpressionInStringInspection
+                  template = '#{meta(:Project,:Description)}(#{meta(:Project,:Name)}) - #{meta(:Name)} v#{meta(:Version)}; #{parents} [Compiled with #{meta(:Compiler,:Name)} v#{meta(:Compiler,:Version)}]'
+                  begin
+                    eval %(v = "#{template}" )
+                  rescue Exception => e
+                    raise e.message + "\nIn:\n" + template
+                  end
+                  v
                 else
                   get_meta(spec, args.to_s)
               end
             elsif args.is_a?(String)
               if spec[args]
                 spec[args]
+              else
+                raise "Meta:'#{args}' not set"
               end
             else
               nil
@@ -46,6 +65,8 @@ module Aws
         def meta(*args)
           if @spec['Meta']
             get_meta(@spec['Meta'],args)
+          else
+            raise "Specification contained no metadata while expanding #{args}"
           end
         end
 
@@ -60,17 +81,6 @@ module Aws
                     'compiled template'
                   end
 
-          begin
-            if desc.match(%r'#\{.+?\}')
-              eval %(desc = "#{desc}")
-            end
-          rescue
-            # noop
-          end
-          # ap meta(:Version)
-          # ap meta(:Compiler,:Name)
-          # ap meta(:Compiler,:Version)
-
           vers =  if @config[:formatversion]
                     @config[:formatversion]
                   else
@@ -80,17 +90,63 @@ module Aws
                       '2010-09-09'
                     end
                   end
+
+          desc = compile_value(desc)
+
           # [2014-06-29 Christo] IIRC it is important that the section names be strings instead of symbols ...
           # noinspection RubyStringKeysInHashInspection
           compiled =
-          {
-              'AWSTemplateFormatVersion' => vers,
-              'Description'              => desc,
-              'Mappings'                 => @items['Mappings'],
-              'Parameters'               => @items['Parameters'],
-              'Resources'                => @items['Resources'],
-              'Outputs'                  => @items['Outputs'],
-          }
+              {
+                  'AWSTemplateFormatVersion' => vers,
+                  'Description'              => desc,
+                  'Mappings'                 => @items['Mappings'],
+                  'Parameters'               => @items['Parameters'],
+                  'Conditions'               => @items['Conditions'],
+                  'Resources'                => @items['Resources'],
+                  'Outputs'                  => @items['Outputs'],
+              }
+
+          @all_sections.each do |section|
+            value = compile_value(@items[section])
+            compiled[section] = value if value
+          end
+          compiled
+        end
+
+        def compile_value(expr)
+          begin
+            if expr.is_a?(Hash)
+              val = expr
+              expr.each do |k,v|
+                val[k] = compile_value(v)
+              end
+              val
+            elsif expr.is_a?(Array)
+              expr.map{ |e|
+                compile_value(e)
+              }
+            elsif expr.is_a?(Symbol)
+              expr
+            elsif expr.is_a?(NilClass)
+              expr
+            elsif expr.is_a?(TrueClass)
+              expr
+            elsif expr.is_a?(FalseClass)
+              expr
+            elsif expr.is_a?(Fixnum)
+              expr
+            elsif expr.is_a?(String)
+              val = expr
+              if expr.match(%r'#\{.+?\}')
+                eval %(val = "#{expr}")
+              end
+              val
+            else
+              raise "The expression type #{expr.class.name} cannot be compiled!\n#{expr}"
+            end
+          rescue Exception => e
+            abort! "Specification expression error: #{e.message} on '#{expr}'"
+          end
         end
 
         def find_refs(hash, type='Reference', parent='')
@@ -98,19 +154,25 @@ module Aws
           newparent = parent
           if hash.is_a? Hash
             hash.keys.collect do |key|
-              if %w{Mappings Parameters Resources Outputs}.include? key
+              if @all_sections.include? key
                 type = key#.gsub(/s$/, '')
                 newparent = key
-              elsif %w{Mappings Parameters Resources Outputs}.include? parent
+              elsif @all_sections.include? parent
                 newparent = key
               end
               if %w{Ref}.include? key
                 h = { hash[key] => [type,newparent] }
               elsif 'Fn::GetAtt' == key
                 h = { hash[key].first => [type,newparent] }
-                # elsif %w{SourceSecurityGroupName CacheSecurityGroupNames SecurityGroupNames}.include? key
-                #   a = find_refs(hash[key],type,newparent)
-                #   h = merge(h, a, *[type,newparent])
+              elsif 'DependsOn' == key
+                if hash[key].is_a?(Array)
+                  h = {}
+                  hash[key].map { |dep|
+                    h[dep] = [type,newparent]
+                  }
+                else
+                  h = { hash[key] => [type,newparent] }
+                end
               else
                 a = find_refs(hash[key],type,newparent)
                 h = merge(h, a, *[type,newparent])
@@ -143,9 +205,26 @@ module Aws
           h
         end
 
+        def find_fns(hash)
+          a = []
+          if hash.is_a? Hash
+            hash.each do |key,val|
+              if key.match %r'^Fn::'
+                a << key
+              end
+              a << find_fns(val)
+            end
+          elsif hash.is_a? Array
+            hash.collect{|e|
+              a << find_fns(e)
+            }
+          end
+          r = a.flatten.compact.uniq
+          r
+        end
+
         def find_maps(hash)
           if hash.is_a? Hash
-            tr = []
             hash.keys.collect do |key|
               if 'Fn::FindInMap' == key
                 hash[key].first
@@ -192,20 +271,33 @@ module Aws
             ref = match[2]
             # noinspection RubyParenthesesAroundConditionInspection
             if (subm = match[1].match(%r'^(.+?)/(.+)$'))
+              # Stack referenced with a path
               @config[:brick_path_list].each do |p|
                 path = File.join(p,subm[1]) # File.dirname(@config[:directory])
-                unless File.directory?(path)
+                if File.directory?(path)
+                  break
+                else
                   path = nil
                 end
               end
               sub = subm[2]
             else
-              # sub = nil
-              # path = File.join(File.dirname(@config[:directory]),match[1])
-              @config[:brick_path_list].each do |p|
-                path = File.join(p,match[1]) # File.dirname(@config[:directory])
-                unless File.directory?(path)
-                  path = nil
+              # Stack referenced on stack_path ...
+              pstk = @config[:stack_path_list].map{ |p|
+                if File.basename(p) == match[1]
+                  p
+                else
+                  []
+                end
+              }.flatten.shift
+              if pstk
+                parseList(@config[:brick_path],':').each do |p|
+                  path = File.join(pstk,p) # File.dirname(@config[:directory])
+                  if File.directory?(path)
+                    break
+                  else
+                    path = nil
+                  end
                 end
               end
             end

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

@@ -54,14 +54,19 @@ module Aws
           res
         end
 
-        def vet_path(dir,base=nil,rel=false)
+        def get_brick_path(dir,rsrc,start=nil,rel=false)
+          File.join(get_brick_dirname(dir,rsrc,start,rel),rsrc)
+        end
+
+        def get_brick_dirname(dir,rsrc,start=nil,rel=false)
           path = nil
+          base = nil
           @config[:brick_path_list].each do |p|
             if rel
               # base = File.realpath(File.expand_path(File.join(@config[:directory], base)))
               base = File.realpath(File.expand_path(File.join(p, base)))
             else
-              base = p unless base
+              base = start || p
             end
             [dir, dir.downcase].each do |d|
               path = File.join(base, dir)
@@ -69,13 +74,26 @@ module Aws
                 break
               end
             end
-            if File.directory?(path)
+            fileglob = File.join(path,rsrc)
+            if File.exists?(fileglob)
+              candidates = [fileglob]
+            else
+              fileglob += ".*"
+              candidates = Dir.glob(fileglob).map{ |e|
+                if e.match(%r'\.#{@format_regex}$')
+                  e
+                else
+                  []
+                end
+              }.flatten
+            end
+            if File.directory?(path) and candidates.size > 0
               break
             end
           end
           patn = path
           unless @config[:expandedpaths]
-            patn = short_path(path)
+            patn = short_path(path,3)
           end
 
           unless File.directory?(path)

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

@@ -9,6 +9,7 @@ module Aws
           setup_options
 
           @opts.on :b, :brick_path=,    'A list of paths to template components (bricks). May also set as the BRICK_PATH environment variable.', as: String
+          @opts.on :S, :stack_path=,    'A list of paths to stacks. May also set as the STACK_PATH environment variable.', as: String
           @opts.on :F, :format=,        'The output format of the components. [JSON|YAML|Ruby]', { as: String, match: @format_regex, default: 'yaml' }
           @opts.on :s, :specification=, 'The specification to use when selecting components. A JSON or YAML file', { as: String
           }
@@ -44,35 +45,70 @@ module Aws
           @optional[:directory]   = true
           setup_config
 
-          if @config[:brick_path]
-            brick_path = @config[:brick_path]
-          elsif ENV['BRICK_PATH']
-            brick_path = ENV['BRICK_PATH']
+          set_config_path_option(@config[:stack_path],'STACK_PATH',@config[:directory]  || '.',:stack_path_list,'stack path')
+          set_config_path_option(@config[:brick_path],'BRICK_PATH',@config[:directory],:brick_path_list,'brick path',:stack_path_list)
+
+        end
+
+        def set_config_path_option(value,envstr,default,listsym,type,relto=nil)
+          if value
+            path = value
+          elsif ENV[envstr]
+            path = ENV[envstr]
           else
-            brick_path = @config[:directory]
+            path = default
           end
-          if brick_path
-            @config[:brick_path_list] = parseList(brick_path,':','parsePath')
-
-            mia = []
-            @config[:brick_path_list].each do |path|
-              unless File.directory? path
-                mia << path
+          if path
+            @config[listsym] = parseList(path, ':')
+            newlist = @config[listsym].map{ |r|
+              if relto
+                if r.match(%r'^/')
+                  # Absolute paths not relative to stacks
+                  r
+                else
+                  a = []
+                  @config[relto].each{|b|
+                    # noinspection RubyAssignmentExpressionInConditionalInspection
+                    if File.directory?(p=File.expand_path(File.join(b,r)))
+                      a << File.realpath(p)
+                    end
+                  }
+                  a
+                end
+              else
+                File.expand_path(r)
               end
-            end
+            }
+            @config[listsym] = newlist.flatten.uniq
+
+            mia = find_mia(@config[listsym])
 
             if mia.size > 0
-              hints = []
-              mia.each do |p|
-                hints << hint_paths(p,Dir.pwd)
-              end
-              hints.flatten!
-              abort! "Invalid brick path: #{brick_path}! #{mia.size > 1 ? 'These' : 'This'} path#{mia.size > 1 ? 's' : ''} does not exist or cannot be read!\n #{mia.join("\n\t")}
-Did you mean one of these? #{@config[:expandedpaths] ? "(Above #{Dir.pwd})" : ""}
-\t#{hints.join("\n\t")}\n"
+              report_mia(path, mia, type)
             end
           end
+        end
 
+        def report_mia(path, mia, type)
+          hints = []
+          mia.each do |p|
+            hints << hint_paths(p, Dir.pwd)
+          end
+          hints.flatten!
+          abort! "Invalid #{type}: #{path}!
+              #{mia.size > 1 ? 'These' : 'This'} path#{mia.size > 1 ? 's' : ''} does not exist or cannot be read!\n #{mia.join("\n\t")}
+              Did you mean one of these? #{@config[:expandedpaths] ? "(Above #{Dir.pwd})" : ""}
+                 \t#{hints.join("\n\t")}\n"
+        end
+
+        def find_mia(list)
+          mia = []
+          list.each do |path|
+            unless File.directory? path
+              mia << path
+            end
+          end
+          mia
         end
 
         def hint_paths(p,pwd,n=0,rel='',f=nil)

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

@@ -1,15 +1,59 @@
+require 'rubygems/dependency'
+require 'semverse'
+require 'awesome_print'
+
 module Aws
   module Cfn
     module Compiler
       module Parse
 
         def parse
+          parse_meta(@spec)
           @dsl ||= Aws::Cfn::Dsl::Template.new(@config[:directory])
-          %w( Mappings Parameters Resources Outputs ).each do |section|
+          @all_sections.each do |section|
             parse_section(section,@spec)
           end
         end
 
+        def parse_meta(spec)
+          begin
+            reqs = meta(:Require)
+            if reqs
+              reqs.each do |name,args|
+                requirement(name,args)
+              end
+            end
+          rescue Exception => e
+            # pass ... abort! e
+          end
+        end
+
+        def requirement(name, *args)
+
+          #options = args.last.is_a?(Hash) ? args.pop.dup : {}
+          constraint = case args.class.name
+                         when /Array/
+                           args.shift
+                         when /Symbol/
+                           args.to_s
+                         when /String/
+                           args
+                         else
+                           raise "Unsupported class #{args.class.name} for #{args.ai}"
+                       end
+          version,constraint = case name
+            when /Compiler/
+              [Aws::Cfn::Compiler::VERSION,constraint]
+            # when /MinVersion/
+            #   [Aws::Cfn::Compiler::VERSION,">= #{constraint}"]
+            else
+              raise "#{name} constraint not supported"
+          end
+
+          raise "The constraint failed: #{name} #{constraint}" unless ::Semverse::Constraint.new(constraint).satisfies?(::Semverse::Version.new(version))
+
+        end
+
         # noinspection RubyGlobalVariableNamingConvention
         def parse_section(section,spec=nil)
           logStep "Parsing #{section}..."
@@ -23,9 +67,9 @@ module Aws
               @logger.debug "\tUsing #{section}::#{rsrc}"
               refp,sub,base,rel = map_resource_reference(rsrc)
               if refp.nil?
-                path = vet_path(section)
+                path = get_brick_dirname(section, rsrc)
               else
-                path = vet_path(sub ? sub : section, refp, rel)
+                path = get_brick_dirname(sub ? sub : section, rsrc, refp, rel)
               end
               abort! "No such directory: #{path} (I am here: #{Dir.pwd})" unless File.directory?(path)
               unless get[path]
@@ -74,7 +118,7 @@ module Aws
             @items[section].merge! item
 
             unless @items[section].keys.count == spec[section].count
-              abort! "  !! error: Suspect that a #{section} item was missed! \nRequested: #{spec[section]}\n    Found: #{@items[section].keys}"
+              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}"
             end
           end
 

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.9.3'
+      VERSION = '0.9.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -86,6 +86,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semverse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: aws-cfn-dsl
   requirement: !ruby/object:Gem::Requirement