cfndsl 0.0.11 → 0.0.12

data/lib/cfndsl/CloudFormationTemplate.rb

@@ -1,4 +1,5 @@
 require 'cfndsl/JSONable'
+require 'cfndsl/names'
 
 module CfnDsl  
   class CloudFormationTemplate < JSONable 
@@ -75,15 +76,18 @@ module CfnDsl
       type["Properties"].each_pair do |pname, ptype|
         if( ptype.instance_of? String )
           create_klass = CfnDsl::Types.const_get( ptype );
+
           klass.class_eval do 
-            define_method(pname) do |*values, &block|
-              if( values.length <1 ) then
-                values.push create_klass.new 
+            CfnDsl::methodNames(pname) do |method|
+              define_method(method) do |*values, &block|
+                if( values.length <1 ) then
+                  values.push create_klass.new 
+                end
+                @Properties ||= {}
+                @Properties[pname] ||= CfnDsl::PropertyDefinition.new( *values )
+                @Properties[pname].value.instance_eval &block if block
+                @Properties[pname].value
               end
-              @Properties ||= {}
-              @Properties[pname] ||= CfnDsl::PropertyDefinition.new( *values )
-              @Properties[pname].value.instance_eval &block if block
-              @Properties[pname].value
             end
           end
         else
@@ -91,27 +95,30 @@ module CfnDsl
           sing_name = CfnDsl::Plurals.singularize( pname )
           create_klass = CfnDsl::Types.const_get( ptype[0] )
           klass.class_eval do
-            define_method(pname) do |*values, &block|
-              if( values.length < 1 ) then
-                values.push []
+            CfnDsl::methodNames(pname) do |method|
+              define_method(method) do |*values, &block|
+                if( values.length < 1 ) then
+                  values.push []
+                end
+                @Properties ||= {}
+                @Properties[pname] ||= PropertyDefinition.new( *values )
+                @Properties[pname].value.instance_eval &block if block
+                @Properties[pname].value
               end
-              @Properties ||= {}
-              @Properties[pname] ||= PropertyDefinition.new( *values )
-              @Properties[pname].value.instance_eval &block if block
-              @Properties[pname].value
             end
 
-            define_method(sing_name) do |value=nil, &block|
-              @Properties ||= {}
-              @Properties[pname] ||= PropertyDefinition.new( [] )
-              if( !value ) then
-                value = create_klass.new
+            CfnDsl::methodNames(sing_name) do |method|
+              define_method(method) do |value=nil, &block|
+                @Properties ||= {}
+                @Properties[pname] ||= PropertyDefinition.new( [] )
+                if( !value ) then
+                  value = create_klass.new
+                end
+                @Properties[pname].value.push value
+                value.instance_eval &block if block
+                value
               end
-              @Properties[pname].value.push value
-              value.instance_eval &block if block
-              value
             end
-
           end
         end
 
@@ -136,13 +143,15 @@ module CfnDsl
     names.each_pair do |typename,type|
       if(type) then
         class_eval do
-          define_method( typename) do |name,*values,&block|
-            name = name.to_s
-            @Resources ||= {}
-            resource = @Resources[name] ||= type.new(*values)
-            resource.instance_eval &block if block
-            resource.instance_variable_set( "@Type", nametypes[typename] )
-            resource
+          CfnDsl::methodNames(typename) do |method|
+            define_method(method) do |name,*values,&block|
+              name = name.to_s
+              @Resources ||= {}
+              resource = @Resources[name] ||= type.new(*values)
+              resource.instance_eval &block if block
+              resource.instance_variable_set( "@Type", nametypes[typename] )
+              resource
+            end
           end
         end
       end

data/lib/cfndsl/JSONable.rb

@@ -2,15 +2,10 @@ require 'cfndsl/Errors'
 require 'cfndsl/RefCheck'
 
 module CfnDsl
-  module Functions  
-
-    def Tag(key, value)
-      ##
-      # Equivalent to the CloudFormation template built in tag object
-      TagDefinition.new(key, value)
-    end
-
-
+  module Functions
+    ##
+    # These functions are available anywhere inside
+    # a block for a JSONable object.
     def Ref(value) 
       ##
       # Equivalent to the CloudFormation template built in function Ref
@@ -174,7 +169,6 @@ module CfnDsl
     end
   end
 
-
   class RefDefinition < JSONable
     ##
     # Handles the Ref objects
@@ -186,14 +180,5 @@ module CfnDsl
       [@Ref]
     end
   end
-
-  class TagDefinition < JSONable
-    #
-    # Handles the Tag objects  
-    def initialize( key, value )
-      @Key = key
-      @Value = value
-    end
-  end
   
 end

data/lib/cfndsl/Resources.rb

@@ -9,6 +9,14 @@ module CfnDsl
     dsl_attr_setter :Type, :DependsOn, :DeletionPolicy
     dsl_content_object :Property, :Metadata
 
+    def addTag(name, value, propagate=nil)
+      self.send(:Tag) {
+        Key name
+        Value value
+        PropagateAtLaunch propagate unless propagate.nil?
+      }
+    end
+
     def get_references()
       refs = []
       if @DependsOn then

data/lib/cfndsl/Types.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'cfndsl/JSONable'
 require 'cfndsl/Plurals'
+require 'cfndsl/names'
 
 module CfnDsl
   module Types
@@ -63,23 +64,25 @@ module CfnDsl
           if( attr_type.kind_of? Array ) then
             klass = CfnDsl::Types.const_get( attr_type[0] )
             variable = "@#{attr_name}".to_sym
+            
             method = CfnDsl::Plurals::singularize(attr_name)
             methods = attr_name
             
             type.class_eval do
-              define_method(method) do | value=nil, *rest, &block|
-                value ||= klass.new
-                x = instance_variable_get( variable )
-                if( !x ) then
+              CfnDsl::methodNames(method) do |method_name|
+                define_method(method_name) do | value=nil, *rest, &block|
+                  value ||= klass.new
+                  x = instance_variable_get( variable )
+                  if( !x ) then
                     x = instance_variable_set( variable, [] )
+                  end
+                  x.push value
+                  value.instance_eval &block if block
+                  value
                 end
-                x.push value
-                value.instance_eval &block if block
-                value
               end
-
-              type.class_eval do
-                define_method(methods) do | value, &block |
+              CfnDsl::methodNames(methods) do |methods_name|
+                define_method(methods_name) do | value, &block |
                   x = instance_variable_get( variable )
                   if( !x ) then
                     x = instance_variable_set( variable, [] )
@@ -98,13 +101,15 @@ module CfnDsl
           else
             klass = CfnDsl::Types.const_get( attr_type );
             variable = "@#{attr_name}".to_sym
-            
+
             type.class_eval do 
-              define_method(attr_name) do | value=nil, *rest, &block |
-                value ||= klass.new
-                instance_variable_set( variable, value )
-                value.instance_eval &block if block
-                value
+              CfnDsl::methodNames(attr_name) do |method|
+                define_method(method) do | value=nil, *rest, &block |
+                  value ||= klass.new
+                  instance_variable_set( variable, value )
+                  value.instance_eval &block if block
+                  value
+                end
               end
             end  
           end

data/lib/cfndsl/module.rb

@@ -1,4 +1,5 @@
 require 'cfndsl/Plurals'
+require 'cfndsl/names'
 class Module
   private
   def dsl_attr_setter(*symbols)
@@ -18,8 +19,10 @@ class Module
     #
     symbols.each do |symbol|
       class_eval do 
-        define_method(symbol) do |value|
-          instance_variable_set( "@#{symbol}", value)
+        CfnDsl::methodNames(symbol) do |method|
+          define_method(method) do |value|
+            instance_variable_set( "@#{symbol}", value)
+          end
         end
       end	
     end
@@ -53,17 +56,19 @@ class Module
       pluralvar = "@#{plural}".to_sym
       definition_class = CfnDsl.const_get( "#{symbol}Definition" )
       class_eval do
-        define_method(symbol) do |name,*values,&block|
-          name = name.to_s
-          hash = instance_variable_get( pluralvar )  
-          if( ! hash ) then
-            hash = {}
-            instance_variable_set( pluralvar, hash )
-          end
-          hash[name] ||= definition_class.new(*values)
-          hash[name].instance_eval &block if block 
-          return hash[name]
-        end 
+        CfnDsl::methodNames(symbol) do |method|
+          define_method(method) do |name,*values,&block|
+            name = name.to_s
+            hash = instance_variable_get( pluralvar )  
+            if( ! hash ) then
+              hash = {}
+              instance_variable_set( pluralvar, hash )
+            end
+            hash[name] ||= definition_class.new(*values)
+            hash[name].instance_eval &block if block 
+            return hash[name]
+          end 
+        end
       end
     end
   end

data/lib/cfndsl/names.rb

@@ -0,0 +1,12 @@
+module CfnDsl
+  ##
+  # iterates through the the valid case-insensitive names
+  # for "name". 
+  def self.methodNames(name)
+    name_str = name.to_s
+    yield name_str.to_sym
+    n = name_str.dup
+    n[0] = n[0].swapcase
+    yield n.to_sym
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -32,6 +32,7 @@ files:
 - lib/cfndsl/Outputs.rb
 - lib/cfndsl/Errors.rb
 - lib/cfndsl/Plurals.rb
+- lib/cfndsl/names.rb
 - lib/cfndsl/CloudFormationTemplate.rb
 - bin/cfndsl
 homepage: https://github.com/howech/cfndsl
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: AWS Cloudformation DSL