convection 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6c1a790e3d66d1a1a1907e2543e339a5f39227
-  data.tar.gz: b21f7e968d922e636e1bbd780d4e1080de55e7f1
+  metadata.gz: e2fbb9d3617f0fdc56557348bff6af6e9fea02d5
+  data.tar.gz: 72b2294473548ecf3dca76447cc1d3856ba10562
 SHA512:
-  metadata.gz: 1026937d7b8a85c2396e6b741ce25db204a17be364a3250e8a7af982aac83496c768f30be8616f4c2406d3aa5223350f2d27ac312c8b0d6e933df71d9ee592c7
-  data.tar.gz: 6a71da2ecd5bdbc36072ea60adad59cfbb48f43c58f72cd3159146735dd7dcf3b6ded426cafcdf72cb23b427cee153660e60787e779b6c467004a7c6c2be4197
+  metadata.gz: a04248baa397f71147b9ad7f3f1988c7187948eddce4719d6653b8f35e15bb25905fd5e432db4a6816d0869da7170b0e044122266e519c645d600cdfcb1b6c17
+  data.tar.gz: 2abc3d4166c8b06c27bab845ff8116c6826c5e395546f169d6b83a7af3eeb4873274bacf9d95810300a0a200f1158afd59605e9d4e283e1fb365c77bcf1614b5

data/docs/getting-started.md

@@ -423,7 +423,7 @@ do this with a security group.
 Convection provides an `ec2_security_group` method for creating security groups.
 The [AWS::EC2::SecurityGroup][cf-security-group] resource requires a description
 and a reference to our VPC. We can add the `ec2_security_group` method to our
-Cloudfile with a `description` and `vpc` attribute to create a default security
+vpc template with a `description` and `vpc` attribute to create a default security
 group for our NAT router.
 
 Add the below block to your vpc.rb template

data/lib/convection/control/cloud.rb

@@ -100,7 +100,7 @@ module Convection
             next
           end
 
-          block.call(Model::Event.new(:deleted, "Delete remote stack #{ stack.cloud_name }", :info)) if block
+          block.call(Model::Event.new(:delete, "Delete remote stack #{ stack.cloud_name }", :info)) if block
           stack.delete(&block)
 
           if stack.error?

data/lib/convection/model/mixin/policy.rb

@@ -41,10 +41,12 @@ module Convection
         end
 
         def document
-          {
+          doc = {
             'Version' => version,
             'Statement' => statement.map(&:render)
           }
+          doc['Id'] = id if id
+          doc
         end
 
         def render(parent = {})

data/lib/convection/model/template/resource_property/aws_ec2_block_device_mapping.rb

@@ -16,7 +16,7 @@ module Convection
           def ebs(&block)
             ebs = ResourceProperty::EC2BlockStoreBlockDevice.new(self)
             ebs.instance_exec(&block) if block
-            properties['Ebs'].set(config)
+            properties['Ebs'].set(ebs)
           end
         end
       end

data/spec/convection/model/template/resource/policy_document_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+module Convection::Model::Mixin
+  describe Policy do
+    let(:template) { double(:template) }
+    subject { described_class.new(name: 'test-policy', template: template) }
+
+    it 'does not set Id on #document if absent' do
+      expect(subject.document['Id']).to be_nil
+    end
+
+    it 'sets Id on #document if provided' do
+      subject.id('MyDocumentId')
+      expect(subject.document['Id']).to eq('MyDocumentId')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -293,6 +293,7 @@ files:
 - spec/convection/model/template/resource/lambdas_spec.rb
 - spec/convection/model/template/resource/loggroups_spec.rb
 - spec/convection/model/template/resource/permission_spec.rb
+- spec/convection/model/template/resource/policy_document_spec.rb
 - spec/convection/model/template/resource/rds_security_groups_spec.rb
 - spec/convection/model/template/resource/vpc_endpoints_spec.rb
 - spec/convection/model/template/resource_attribute/update_policies_spec.rb
@@ -362,6 +363,7 @@ test_files:
 - spec/convection/model/template/resource/lambdas_spec.rb
 - spec/convection/model/template/resource/loggroups_spec.rb
 - spec/convection/model/template/resource/permission_spec.rb
+- spec/convection/model/template/resource/policy_document_spec.rb
 - spec/convection/model/template/resource/rds_security_groups_spec.rb
 - spec/convection/model/template/resource/vpc_endpoints_spec.rb
 - spec/convection/model/template/resource_attribute/update_policies_spec.rb