sparkle_formation 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629f237b850e9be0623bc58499ee7576018730a4
-  data.tar.gz: 9b602ddb998707e16a1c45ff08e12b5a175a485c
+  metadata.gz: 606dadd19767aa72a3e8a3efeb079d060146d7bc
+  data.tar.gz: b2364fa255d7fa852edcb43fe803814c1892f909
 SHA512:
-  metadata.gz: d527b10cca86fb282187e4e9c6672dd89957b00b8ffa6b8c7ace56b6ab3c67e639f425a89cd9091798c0073d9a1495ed4d75b17bed50026ec78c2f9298df14ae
-  data.tar.gz: d4c775dcd1114e10d3c707ce863c836125ee035bc4bfbd2122261340c330844fec335ba6ca8b28b7e497b25ae914d2bb7e7b0f4b298c6a771b2130d250f90c28
+  metadata.gz: 2485a030c1069bf8bbcd39b8ef8f320e4bc6c9e2ac696cdb78acb24be19f1ad4df96c6a7c5f93c196793f76d8eb5134fc456a981fffa96642ce23fdeb495a7d3
+  data.tar.gz: 37f0b4351f4e3b5072a8f4c73cd03393abd710e64751ff31e03a98812d7fa23b4dad491cd798c167b28ae67a01bc0708ca03ad54d75ecf4a78bd23c41b55f613

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.2.8
+* Relax isolated nesting check (resources only)
+* Include condition within generated hash within `if!` helper (#32)
+* Auto process String arguments provided to `if!`
+* Fix array nesting within `or!`
+
 ## v0.2.6
 * Add initial nested stack implementation
 * Update user docs generation

data/README.md

@@ -26,9 +26,9 @@ we can just convert it into a single file (ec2_example.rb):
 SparkleFormation.new('ec2_example') do
   description "AWS CloudFormation Sample Template ..."
 
-  parameters.keyname do
+  parameters.key_name do
     description 'Name of EC2 key pair'
-    type 'string'
+    type 'String'
   end
 
   mappings.region_map do
@@ -100,7 +100,7 @@ make this easier to maintain.
 
 # Components
 
-Lets say we have a handful of CF templates we want to maintain, and all of those
+Lets say we have a handful of CFN templates we want to maintain, and all of those
 templates use the same AMI. Instead of copying that information into all the
 templates, lets create an AMI component instead, and then load it into the actual
 templates.
@@ -127,13 +127,13 @@ end
 Now, we can modify our initial example to use this component (ec2_example.rb):
 
 ```ruby
-SparkleFormation.new('ec2_example').load(:ami) do
+SparkleFormation.new('ec2_example').load(:ami).overrides do
 
   description "AWS CloudFormation Sample Template ..."
 
-  parameters.keyname do
+  parameters.key_name do
     description 'Name of EC2 key pair'
-    type 'string'
+    type 'String'
   end
 
   dynamic!(:ec2_instance, :foobar) do
@@ -203,15 +203,15 @@ SparkleFormation.dynamic(:node,
 ) do |_name, _config|
 
   if(_config[:key_name])
-    parameters.keyname do
+    parameters.set!("#{_name}_key_name".to_sym) do
       description 'Name of EC2 key pair'
-      type 'string'
+      type 'String'
     end
   end
 
   dynamic!(:ec2_instance, _name) do
     properties do
-      key_name _config.fetch(:key_name, ref!(:key_name))
+      key_name _config.fetch(:key_name, ref!("#{_name}_key_name".to_sym))
       image_id map!(:region_map, 'AWS::Region', :ami)
       user_data baes64!('80')
     end

data/lib/sparkle_formation/sparkle_attribute.rb

@@ -156,8 +156,8 @@ class SparkleFormation
     # @param false_value [Object]
     # @return [Hash]
     def _if(cond, true_value, false_value)
-      cond = cond.is_a?(Symbol) ? _condition(cond) : cond
-      {'Fn::If' => _array(true_value, false_value)}
+      cond = cond.is_a?(Symbol) || cond.is_a?(String) ? _condition(cond) : cond
+      {'Fn::If' => _array(cond, true_value, false_value)}
     end
     alias_method :if!, :_if
 
@@ -214,7 +214,7 @@ class SparkleFormation
     def _or(v1, v2)
       {
         'Fn::Or' => _array(
-          [v1,v2].map{|v|
+          *[v1,v2].map{|v|
             if(v.is_a?(Symbol) || v.is_a?(String))
               _condition(v)
             else

data/lib/sparkle_formation/sparkle_formation.rb

@@ -416,8 +416,9 @@ class SparkleFormation
   # @return [TrueClass, FalseClass] includes _only_ nested stacks
   def isolated_nests?
     hash = compile.dump!
-    (hash.keys == ['Resources'] || hash.keys == ['Resources', 'AWSTemplateFormatVersion']) &&
-      !hash['Resources'].detect{|_, r| r['Type'] != 'AWS::CloudFormation::Stack'}
+    hash.fetch('Resources', {}).all? do |name, resource|
+      resource['Type'] == 'AWS::CloudFormation::Stack'
+    end
   end
 
   # Apply stack nesting logic. Will extract unique parameters from

data/lib/sparkle_formation/version.rb

@@ -18,5 +18,5 @@
 
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new('0.2.6')
+  VERSION = Gem::Version.new('0.2.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct