aws-cfn-compiler 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640e002a656701661bb83c206787586544be8146
-  data.tar.gz: 5365902f02751c7043df5b3566d2f3332a8781a0
+  metadata.gz: b1362f3d59f71abf3917f519164e979f1bda688c
+  data.tar.gz: 6f6ead16051d565729413cb2be8eba9b3bbfa7ba
 SHA512:
-  metadata.gz: 24cf23031d4cf11fc27c85ab89a36bce568743e824ba02a1b04186596b8222acd789351d8bd9f67bebde4ffaacf32d23c45cf4c27a60103437e0773f7d4328ea
-  data.tar.gz: 36c7d203fabf3d67642ad8229d119e9e96e92993524f5d6c380658e41ccf66b5929fdc0c97f33eccd013568062b8bc2877e62318e82cefdb4956219429d19c44
+  metadata.gz: a7bc4db60ac6d41b7a2b640d9e4f2ec3720deec795fbee617091f52327146c3e2cdb3830fc2c4c1606c0407d6f0bc56d5f31f0ba981f610294c9ee474db20790
+  data.tar.gz: 212780a3f87a67f2dcea6a55bc2fced8ab5d58cc57d674468e9f80c0fa689be206d5b0251f1c5056f18c8111232f6bcc3ff20bef1b45bde82d0f861bcb3f330c

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

@@ -266,21 +266,21 @@ module Aws
           end
         end
 
-        def find_conditions(hash)
+        def find_conditions(hash,level=0)
           if hash.is_a? Hash
             hash.keys.collect do |key|
-              if 'Condition' == key
+              if 'Condition' == key and level <= 4
                 if hash[key].is_a?(Array)
                   hash[key].first
                 else
                   hash[key]
                 end
               else
-                find_conditions(hash[key])
+                find_conditions(hash[key],level+1)
               end
             end.flatten.compact.uniq
           elsif hash.is_a? Array
-            hash.collect{|a| find_conditions(a)}.flatten.compact.uniq
+            hash.collect{|a| find_conditions(a,level+1)}.flatten.compact.uniq
           end
         end
 

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

@@ -119,7 +119,12 @@ module Aws
                   elsif filename =~ /\.js(|on)\z/i
                     item[section].merge! JSON.parse(content)
                   elsif filename =~ /\.ya?ml\z/i
-                    item[section].merge! YAML.load(content)
+                    begin
+                      item[section].merge! YAML.load(content)
+                    rescue => e
+                      logger.fatal "YAML error: #{e.message}"
+                      raise e
+                    end
                   else
                     next
                   end

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.9.20'
+      VERSION = '0.9.21'
     end
   end
 end

metadata

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