cloud_former 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af313fee26a4325d3c0477cfdeaef7fabe9ac73
-  data.tar.gz: 3b13f4e1c5c85399156a6690db4661e399205be5
+  metadata.gz: d18c4dc7c67ad9101295cb778dea8927aa3b726e
+  data.tar.gz: 26e157b3e3ac58cc30e75c4466f76792a6a908c6
 SHA512:
-  metadata.gz: 338c70d9134da57087c1791f580adbeb6909b8f2cf0747121ab676fbbe95043380c35bb17356f26fbf872befddd1831850bd2d5c76363c5284c97707e717f419
-  data.tar.gz: c63949f131be07add9fd826f0c41717e739a94a7fb2edcd65c287581044c8e7aa5ca808ddb346309f4ca3a2e0ffb2110fe27a86252bf00370c8c479188319586
+  metadata.gz: 0b713ab3240f3fb71c809247ed054f858fc12d329640bc69a985d6de6b490ae51fee400a1ea4b3566a82028245722bc9fb1a21f324dbb960a10a1c732f0b1b59
+  data.tar.gz: 042136f901246e7c593f589acb7e21aaec4120d46ee44d03abfcb9704f8605b960e494e5ea4b5ca2eed0811625020237b69dae92b4c2331b7fff968e8ffd9a7a

data/lib/cloud_former/has_properties_and_attributes.rb

@@ -5,6 +5,14 @@ module CloudFormer
       base.extend ClassMethods
     end
 
+    def nested_resources
+      @nested_resources ||= []
+    end
+
+    def resource_tree
+      [self, nested_resources.map(&:resource_tree)]
+    end
+
     module ClassMethods
 
       def aws_property(name, options={})
@@ -53,37 +61,60 @@ module CloudFormer
       end
 
       def make_aws_accessor(name, options)
-        define_method(name) do |val='!!!****noarggiven****!!!'|
-          if val != '!!!****noarggiven****!!!'
-            if options[:list] && !val.respond_to?(:each)
-              if (!val.respond_to?(:acts_as_list?) || !val.acts_as_list?) && options[:list] != :ok
-                raise ArgumentError.new(
-                  "A list is required for #{name} in #{self.class.name}, but a #{val.class.name} was given."
-                )
+        define_method(name) do |*args, &block|
+          if block
+            if options[:type] < CloudFormer::ResourceProperty || options[:type] < CloudFormer::Resource
+              value = if options[:list]
+                count = args.shift
+                count.times.map do |i|
+                  instance = options[:type].new(*args) { instance_exec(i, &block) }
+                  self.nested_resources << instance if instance.is_a?(CloudFormer::Resource)
+                  instance
+                end
+              else
+                instance = options[:type].new(*args, &block)
+                self.nested_resources << instance if instance.is_a?(CloudFormer::Resource)
+                instance
               end
+            else
+              raise ArgumentError, "Can't construct #{options[:type]} using block syntax."
             end
+            instance_variable_set("@#{name}", value)
+          else
+            if args.size == 1
+              val = args.first
+              if options[:list] && !val.respond_to?(:each)
+                if (!val.respond_to?(:acts_as_list?) || !val.acts_as_list?) && options[:list] != :ok
+                  raise ArgumentError.new(
+                    "A list is required for #{name} in #{self.class.name}, but a #{val.class.name} was given."
+                  )
+                end
+              end
 
-            if options[:list]
-              unless val.respond_to?(:acts_as_list?) && val.acts_as_list?
-                if options[:list] == :ok
-                  if val.respond_to?(:each)
+              if options[:list]
+                unless val.respond_to?(:acts_as_list?) && val.acts_as_list?
+                  if options[:list] == :ok
+                    if val.respond_to?(:each)
+                      val.each do |item|
+                        self.class.check_type_of_aws_value(name, item, options)
+                      end
+                    else
+                      self.class.check_type_of_aws_value(name, val, options)
+                    end
+                  else
                     val.each do |item|
                       self.class.check_type_of_aws_value(name, item, options)
                     end
-                  else
-                    self.class.check_type_of_aws_value(name, val, options)
-                  end
-                else
-                  val.each do |item|
-                    self.class.check_type_of_aws_value(name, item, options)
                   end
                 end
+              else
+                self.class.check_type_of_aws_value(name, val, options)
               end
-            else
-              self.class.check_type_of_aws_value(name, val, options)
-            end
 
-            instance_variable_set("@#{name}", val)
+              instance_variable_set("@#{name}", val)
+            elsif args.size > 1
+              raise ArgumentError, "wrong number of arguments (#{args.size} for 0..1)"
+            end
           end
 
           if instance_variable_defined?("@#{name}")

data/lib/cloud_former/resources/resource.rb

@@ -6,23 +6,27 @@ module CloudFormer
 
     json_attribute :aws_type, name: 'Type'
 
-    attr_reader :name
     attr_reader :aws_type
     attr_reader :metadata_items
 
     aws_attribute :depends_on, list: true, type: String
     aws_attribute :deletion_policy, type: String
 
-    def initialize(name, &block)
+    def initialize(name=nil, &block)
       @name = name
-      if name.nil? || name.empty?
-        raise ArgumentError.new("Attempting to create a resource of type #{self.class.name} with no name")
-      end
       @metadata_items = []
       @aws_type = self.class.name.sub('CloudFormer', 'AWS')
       if block_given?
         self.instance_eval(&block)
       end
+      if @name.nil? || @name.empty?
+        raise ArgumentError.new("Attempting to create a resource of type #{self.class.name} with no name")
+      end
+    end
+
+    def name(arg=nil)
+      @name = arg if arg
+      @name
     end
 
     def add_metadata(metadata)

data/lib/cloud_former/template.rb

@@ -33,7 +33,9 @@ module CloudFormer
       if @resources.any?
         resource_res = {}
         @resources.each do |resource|
-          resource_res[resource.name] = resource.dump_json
+          resource.resource_tree.flatten.each do |r|
+            resource_res[r.name] = r.dump_json
+          end
         end
         res['Resources'] = resource_res
       end

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

data/spec/has_properties_and_attributes_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe CloudFormer::HasPropertiesAndAttributes do
+  let(:template) { CloudFormer::Template.new }
+
+  it "builds simple resources correctly" do
+    instance = CloudFormer::EC2::Instance.new('myinstance') do
+      availability_zone 'us-east-1'
+      image_id 'ami-123456'
+    end
+    template.add_resource(instance)
+
+    expect(template.dump_json).to eq(
+      "AWSTemplateFormatVersion" => "2010-09-09",
+      "Resources" => {
+        "myinstance" => {
+          "Type" => "AWS::EC2::Instance",
+          "Properties" => {
+            "AvailabilityZone" => "us-east-1",
+            "ImageId" => "ami-123456",
+          },
+        },
+      },
+    )
+  end
+
+  it "supports builds nested resource lists via blocks" do
+    auto_scaling_group = CloudFormer::AutoScaling::LaunchConfiguration.new('myconfig') do
+      image_id 'ami-123456'
+      security_groups(2) do |i|
+        name "name #{i}"
+        group_description "security group #{i}"
+      end
+    end
+    template.add_resource(auto_scaling_group)
+
+    expect(template.dump_json).to eq(
+      "AWSTemplateFormatVersion" => "2010-09-09",
+      "Resources" => {
+        "myconfig" => {
+          "Type" => "AWS::AutoScaling::LaunchConfiguration",
+          "Properties" => {
+            "ImageId" => "ami-123456",
+            "SecurityGroups" => [
+              {"Ref" => "name 0"},
+              {"Ref" => "name 1"},
+            ],
+          },
+        },
+        "name 0" => {
+          "Type" => "AWS::EC2::SecurityGroup",
+          "Properties" => {
+            "GroupDescription" => "security group 0",
+          },
+        },
+        "name 1" => {
+          "Type" => "AWS::EC2::SecurityGroup",
+          "Properties" => {
+            "GroupDescription" => "security group 1",
+          },
+        },
+      },
+    )
+  end
+
+  it "supports builds nested resource properties via blocks" do
+    instance = CloudFormer::EC2::Instance.new('myinstance') do
+      # list
+      block_device_mappings(2) do |i|
+        device_name "/dev/sdf".tap { |s| i.times { s.succ! } }
+        # single
+        ebs do
+          volume_size 100
+          volume_type 'standard'
+        end
+      end
+    end
+    template.add_resource(instance)
+
+    expect(template.dump_json).to eq(
+      "AWSTemplateFormatVersion" => "2010-09-09",
+      "Resources" => {
+        "myinstance" => {
+          "Type" => "AWS::EC2::Instance",
+          "Properties" => {
+            "BlockDeviceMappings" => [
+              {
+                "DeviceName" => "/dev/sdf",
+                "Ebs" => {
+                  "VolumeSize" => 100,
+                  "VolumeType" => "standard",
+                },
+              },
+              {
+                "DeviceName" => "/dev/sdg",
+                "Ebs" => {
+                  "VolumeSize" => 100,
+                  "VolumeType" => "standard",
+                },
+              },
+            ],
+          },
+        },
+      },
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Aubrey Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,6 +244,7 @@ files:
 - lib/cloud_former/resources/sqs/queue_policy.rb
 - lib/cloud_former/template.rb
 - lib/cloud_former/version.rb
+- spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
 - spec/output_spec.rb
 - spec/parameter_spec.rb
@@ -281,6 +282,7 @@ signing_key:
 specification_version: 4
 summary: A Ruby DSL for creating CloudFormation templates
 test_files:
+- spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
 - spec/output_spec.rb
 - spec/parameter_spec.rb