skywriter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b6bcdd3dc26381dd3faf2f0d77d59796a1fba6e
-  data.tar.gz: c2cd5bb2a4bbdc44700a4a416becd8cc1b1e8b7b
+  metadata.gz: 21e9ce779f11dc3f1518c50799d1ad7889783be7
+  data.tar.gz: 8243e639f2e81b2199356555e4cb1fb2afc0f1c8
 SHA512:
-  metadata.gz: 0956c5fd85eca4883d6e707756e5c8be094132a7f9c3cde9a660272db1e92fab98dfe502b93f550a619f52dd3e8df1b1349b32ae11f03b6cb174ece6a8c23bf7
-  data.tar.gz: bdb99f0ea00674303d8763dd81c2728575d15b7914feb41c2a797cd90532f3245793276ae47b986bdb2d3d1c4d0cfbe29b0a2eb51c7078708447d2f0278f5628
+  metadata.gz: 41ad5d4b828fa5b40762ddb0b12a2a6183f40c5d33af1e55cf77b9c5a5e7b87cd87931b8506f5dd6730b7ce8cc1a0b2ca6c51602c82599b37acedffe2cd9e09a
+  data.tar.gz: 401a89ec7ac21a2c20026b94648e55894d2fed3cc01e4532808503ac69c0d910a0c260851bf64186da49caf6923792b5523733f52b55ca0d3ad29cb268d194da

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 1.0.1
+
+* Fix Security Group Rule resource versus resource property. - Peter Whiteside
+
 ## 1.0.0
 
 * Initial release. - Ben Hamill, Ryan Michael, Josh Smith, Peter Whiteside

data/README.md

@@ -11,6 +11,8 @@ runnable code provides some benefits like variable assignment, that make the
 need to use CloudFormation's build-in functions superfluous (of course,
 Skywriter still has helpers for those functions, if you need them).
 
+[RDoc](http://rubydoc.info/gems/skywriter/frames)
+
 
 ## Features
 
@@ -36,6 +38,47 @@ Resource.new(
 # }}
 ```
 
+### Template Merging
+
+`Template#merge` can be helpful for intelligently merging two CloudFormation
+templates.  If the same resource exists in both templates it will be included
+in the output, but if two different resources with the same logical name exist 
+and exception will be raised.  Otherwise the output will be the union of the
+two templates.
+
+``` ruby
+Template.new(
+  resources: [Resource.new('ResourceName', foo: 'bar')]
+).merge(
+  Template.new(
+    resources: [Resource.new('ResourceName', foo: 'bar')]
+  )
+).as_json['Resources']  # => {'Resource' => {'Foo' => 'bar'}}
+
+
+Template.new(
+  resources: [Resource.new('ResourceName', foo: 'bar')]
+).merge(
+  Template.new(
+    resources: [Resource.new('ResourceName', baz: 'qux')]
+  )
+).as_json               # => Skywriter::Template::MergeError raised
+```
+
+Note that you can create a `Template` instance from an existing 
+CloudFormation template.  This can be useful for making incremental
+changes to existing documents.
+
+``` ruby
+my_old_janky_cf_template = File.open('cf.json')
+
+Template.new(
+  JSON.load(my_old_janky_cf_template)
+).merge(
+  new_hotness
+)
+```
+
 See the example section below for some more concrete examples.
 
 
@@ -101,7 +144,7 @@ my_db = Skywriter::Resource::RDS::DBInstance.new(
   availability_zone: "us-east-1a",
   db_name: "my_db",
   engine: "MySQL",
-  db_security_groups: ["old_sg", my_db_sg.as_pointer]
+  db_security_groups: ["old_sg", my_db_sg.as_pointer(with: :logical_name)]
 )
 
 

data/lib/skywriter/resource/ec2/security_group_egress.rb

@@ -3,21 +3,16 @@ module Skywriter
     module EC2
       # AWS::EC2::SecurityGroupEgress Resource
       #
-      class SecurityGroupEgress < Skywriter::ResourceProperty::EC2::SecurityGroupRule
-        property :DestinationSecurityGroupId
+      class SecurityGroupEgress
+        include Skywriter::Resource
+
         property :GroupId
+        property :IpProtocol
+        property :CidrIp
+        property :DestinationSecurityGroupId
+        property :FromPort
+        property :ToPort
       end
     end
   end
-
-  # This is just for aliasing purposes. Despite the fact that Amazon documents
-  # this class as a resource, it is, in fact, a resource property in all ways.
-  # So, we put it in the place you'd expect if you were looking at the
-  # CloudFormation documentations. And we're aliasing it below in the place
-  # where you'd expect it if you have your head right about how this behaves.
-  class ResourceProperty
-    module EC2
-      SecurityGroupEgress = Skywriter::Resource::EC2::SecurityGroupEgress
-    end
-  end
 end

data/lib/skywriter/resource/ec2/security_group_ingress.rb

@@ -3,24 +3,19 @@ module Skywriter
     module EC2
       # AWS::EC2::SecurityGroupIngress Resource
       #
-      class SecurityGroupIngress < Skywriter::ResourceProperty::EC2::SecurityGroupRule
+      class SecurityGroupIngress
+        include Skywriter::Resource
+
         property :GroupName
         property :GroupId
+        property :IpProtocol
+        property :CidrIp
         property :SourceSecurityGroupName
         property :SourceSecurityGroupId
         property :SourceSecurityGroupOwnerId
+        property :FromPort
+        property :ToPort
       end
     end
   end
-
-  # This is just for aliasing purposes. Despite the fact that Amazon documents
-  # this class as a resource, it is, in fact, a resource property in all ways.
-  # So, we put it in the place you'd expect if you were looking at the
-  # CloudFormation documentations. And we're aliasing it below in the place
-  # where you'd expect it if you have your head right about how this behaves.
-  class ResourceProperty
-    module EC2
-      SecurityGroupIngress = Skywriter::Resource::EC2::SecurityGroupIngress
-    end
-  end
 end

data/lib/skywriter/resource_property/ec2/security_group_rule.rb

@@ -6,6 +6,10 @@ module Skywriter
         property :ToPort
         property :IpProtocol
         property :CidrIp
+        property :SourceSecurityGroupId
+        property :SourceSecurityGroupName
+        property :SourceSecurityGroupOwnerId
+        property :DestinationSecurityGroupId
       end
     end
   end

data/lib/skywriter/version.rb

@@ -1,3 +1,3 @@
 module Skywriter
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/skywriter/resource_property_spec.rb

@@ -124,8 +124,6 @@ describe "The implementation" do
     Skywriter::ResourceProperty::EC2::NetworkInterfacePrivateIPSpecification,
     Skywriter::ResourceProperty::EC2::PortRange,
     Skywriter::ResourceProperty::EC2::SecurityGroupRule,
-    Skywriter::Resource::EC2::SecurityGroupEgress,
-    Skywriter::Resource::EC2::SecurityGroupIngress,
     Skywriter::ResourceProperty::EC2::Tag,
     Skywriter::ResourceProperty::ElasticBeanstalk::EnvironmentTier,
     Skywriter::ResourceProperty::ElasticBeanstalk::OptionSetting,

data/spec/skywriter/resource_spec.rb

@@ -178,6 +178,8 @@ describe "The implementation" do
     Skywriter::Resource::EC2::Route,
     Skywriter::Resource::EC2::RouteTable,
     Skywriter::Resource::EC2::SecurityGroup,
+    Skywriter::Resource::EC2::SecurityGroupIngress,
+    Skywriter::Resource::EC2::SecurityGroupEgress,
     Skywriter::Resource::EC2::SubnetNetworkAclAssociation,
     Skywriter::Resource::EC2::SubnetRouteTableAssociation,
     Skywriter::Resource::EC2::Subnet,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skywriter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Michael
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Writes cloud formations