chemtrail 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b457fc52081b5875c31d1d124429aa6d438b31a
-  data.tar.gz: 77706788871003cba5307760765b907f986a80e4
+  metadata.gz: 7c327599b79192343d3993d9b30c9a5535e711ff
+  data.tar.gz: 0f2e7925ba1bcb70e468e9059a004dc78325205c
 SHA512:
-  metadata.gz: cf6193b91a72aeafb284aa0c928c599a04796379af5d90005fa67caed9b5283f442eb076bf0dd22acbb4f773bb151f505975ac82e095ab7a9f39a3d9bfc8ff7b
-  data.tar.gz: d81f93f39b399601bfd3cb96f1bef9314df9e4360f327651a36b9baae7f4635ec11a6c5542fd68d890d88cd894823fad0e7d8d0ad9172d47c7dcb477c14e2a11
+  metadata.gz: fee99fa18b8a65a03fe64fdc5e1ba13a21a2e85628b1ede78a092e946dbe6a8c76ba268131184865d0d27187ab1bc8c019b48d1844ff53f1cb1f6dc9f8f7c6d9
+  data.tar.gz: 90fdf39a9da0d664ea6a7eb4f49a497fd7f31696a3ecf0fd2cd5a329f66e5f6f4aeab6df61dd4e69345e8cefd078f716ab593242dab53af38ce1176a80a62f79

data/examples/lib/templates/config/resources.yml

@@ -0,0 +1,27 @@
+VPC:
+  Tags:
+    - Key: Network
+      Value: Public
+
+PublicSubnet:
+  Tags:
+    - Key: Network
+      Value: Public
+
+InternetGateway:
+  Tags:
+    - Key: Network
+      Value: Public
+
+PublicRoute:
+  DestinationCidrBlock: 0.0.0.0/0
+
+InboundHTTPPublicNetworkAclEntry:
+  RuleNumber: "100"
+  Protocol: "6"
+  RuleAction: allow
+  Egress: false
+  CidrBlock: 0.0.0.0/0
+  PortRange:
+    From: "80"
+    To: "80"

data/examples/lib/templates/opsworks_vpc_template.rb

@@ -11,7 +11,7 @@ class OpsworksVpc < Chemtrail::Template
 
       You will be billed for the AWS resources used if you create a stack from
       this template.
-      DESCRIPTION
+    DESCRIPTION
   end
 
   def parameters
@@ -24,10 +24,55 @@ class OpsworksVpc < Chemtrail::Template
     [
       Chemtrail::Mapping.new("AWSNATAMI", mappings_config["AWSNATAMI"]),
       Chemtrail::Mapping.new("AWSInstanceType2Arch", mappings_config["AWSInstanceType2Arch"]),
-      Chemtrail::Mapping.new("SubnetConfig", mappings_config["SubnetConfig"])
+      subnet_config
     ]
   end
 
+  def resources
+    [
+      vpc,
+      public_subnet,
+      internet_gateway,
+      gateway_to_internet
+    ]
+  end
+
+  def subnet_config
+    @subnet_config ||= Chemtrail::Mapping.new("SubnetConfig", mappings_config["SubnetConfig"])
+  end
+
+  def vpc
+    @vpc ||= Chemtrail::Resource.new("VPC", "AWS::EC2::VPC", resources_config["VPC"]).tap do |config|
+      config.properties["CidrBlock"] = subnet_config.find("VPC", "CIDR")
+      config.properties["Tags"] << stack_name.as_tag("Application")
+    end
+  end
+
+  def public_subnet
+    @public_subnet ||= Chemtrail::Resource.new("PublicSubnet", "AWS::EC2::Subnet", resources_config["PublicSubnet"]).tap do |config|
+      config.properties["VpcId"] = vpc
+      config.properties["CidrBlock"] = subnet_config.find("VPC", "CIDR")
+      config.properties["Tags"] << stack_name.as_tag("Application")
+    end
+  end
+
+  def internet_gateway
+    @internet_gateway ||= Chemtrail::Resource.new("InternetGateway", "AWS::EC2::InternetGateway", resources_config["InternetGateway"]).tap do |config|
+      config.properties["Tags"] << stack_name.as_tag("Application")
+    end
+  end
+
+  def gateway_to_internet
+    @gateway_to_internet ||= Chemtrail::Resource.new("GatewayToInternet", "AWS::EC2::VPCGatewayAttachment", resources_config["GatewayToInternet"]).tap do |config|
+      config.properties["VpcId"] = vpc
+      config.properties["InternetGatewayId"] = internet_gateway
+    end
+  end
+
+  def stack_name
+    @stack_name ||= Chemtrail::Intrinsic.new("AWS::StackName")
+  end
+
   protected
 
   def parameters_config

data/examples/spec/lib/templates/opsworks_vpc_template_spec.rb

@@ -26,5 +26,34 @@ describe OpsworksVpc do
   end
 
   describe "#resources" do
+    describe "VPC" do
+      it { should have_resource("VPC").with_type("AWS::EC2::VPC") }
+
+      it { should have_property("CidrBlock").on("VPC") }
+      it { should have_tag("Application").with_reference("AWS::StackName").on("VPC") }
+      it { should have_tag("Network").with_value("Public").on("VPC") }
+    end
+
+    describe "PublicSubnet" do
+      it { should have_resource("PublicSubnet").with_type("AWS::EC2::Subnet") }
+
+      it { should have_property("CidrBlock").on("PublicSubnet") }
+      it { should have_tag("Application").with_reference("AWS::StackName").on("PublicSubnet") }
+      it { should have_tag("Network").with_value("Public").on("PublicSubnet") }
+    end
+
+    describe "InternetGateway" do
+      it { should have_resource("InternetGateway").with_type("AWS::EC2::InternetGateway") }
+
+      it { should have_tag("Application").with_reference("AWS::StackName").on("InternetGateway") }
+      it { should have_tag("Network").with_value("Public").on("InternetGateway") }
+    end
+
+    describe "GatewayToInternet" do
+      it { should have_resource("GatewayToInternet").with_type("AWS::EC2::VPCGatewayAttachment") }
+
+      it { should have_property("VpcId").with_reference("VPC").on("GatewayToInternet") }
+      it { should have_property("InternetGatewayId").with_reference("InternetGateway").on("GatewayToInternet") }
+    end
   end
 end

data/lib/chemtrail.rb

@@ -6,3 +6,4 @@ require "chemtrail/resource"
 require "chemtrail/output"
 require "chemtrail/property_list"
 require "chemtrail/function"
+require "chemtrail/intrinsic"

data/lib/chemtrail/intrinsic.rb

@@ -0,0 +1,17 @@
+class Chemtrail::Intrinsic
+  attr_reader :id
+
+  def initialize(id)
+    @id = id
+  end
+
+  def to_reference
+    {
+      "Ref" => id
+    }
+  end
+
+  def as_tag(key)
+    {"Key" => key, "Value" => self}
+  end
+end

data/lib/chemtrail/matchers/have_field.rb

@@ -0,0 +1,56 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_field do |field_name|
+    define_method :parameter_for do |actual|
+      actual.parameters.detect { |p| p.id == @parameter_id }
+    end
+
+    define_method :field_for do |parameter|
+      parameter.fields[field_name]
+    end
+
+    define_method :matches_value? do |field|
+      if @value
+        field == @value
+      elsif @included_value
+        field.include?(@included_value)
+      else
+        true
+      end
+    end
+
+    match do |actual|
+      parameter = parameter_for(actual)
+      field = field_for(parameter)
+      !parameter.nil? && !field.nil? && matches_value?(field)
+    end
+
+    chain :on do |parameter_id|
+      @parameter_id = parameter_id
+    end
+
+    chain :with_value do |value|
+      @value = value
+    end
+
+    chain :including do |value|
+      @included_value = value
+    end
+
+    failure_message_for_should do |actual|
+      if parameter = parameter_for(actual)
+        if field = field_for(parameter)
+          expected_field = @value || @included_value
+          %(expected parameter #{@parameter_id.inspect} field #{field_name.inspect} to have value #{expected_field.inspect}, but got #{field.inspect})
+        else
+          %(expected parameter #{@parameter_id.inspect} to have type #{field_name.inspect})
+        end
+      else
+        %(expected to find parameter #{@parameter_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/matchers/have_mapping.rb

@@ -0,0 +1,9 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_mapping do |expected|
+    match { |actual| actual.mappings.any? { |m| m.id == expected } }
+  end
+end

data/lib/chemtrail/matchers/have_mapping_key.rb

@@ -0,0 +1,49 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_mapping_key do |entry_name|
+    define_method :mapping_for do |actual|
+      actual.mappings.detect { |m| m.id == @mapping_id }
+    end
+
+    define_method :entry_for do |mapping|
+      mapping.entries[entry_name]
+    end
+
+    define_method :matches_value? do |entry|
+      if @included_value
+        entry.values_at(*@included_value.keys) == @included_value.values
+      else
+        true
+      end
+    end
+
+    match do |actual|
+      mapping = mapping_for(actual)
+      entry = entry_for(mapping)
+      !mapping.nil? && !entry.nil? && matches_value?(entry)
+    end
+
+    chain :on do |mapping_id|
+      @mapping_id = mapping_id
+    end
+
+    chain :including do |value|
+      @included_value = value
+    end
+
+    failure_message_for_should do |actual|
+      if mapping = mapping_for(actual)
+        if entry = entry_for(mapping)
+          %(expected mapping #{@mapping_id.inspect} field #{entry_name.inspect} to have value #{@included_value.inspect}, but got #{entry.inspect})
+        else
+          %(expected mapping #{@mapping_id.inspect} to have type #{entry_name.inspect})
+        end
+      else
+        %(expected to find mapping #{@mapping_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/matchers/have_parameter.rb

@@ -0,0 +1,31 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_parameter do |parameter_id|
+    define_method :parameter_for do |actual|
+      actual.parameters.detect { |param| param.id == parameter_id }
+    end
+
+    define_method :matches_type? do |actual|
+      @type.nil? || parameter_for(actual).type == @type
+    end
+
+    match do |actual|
+      !parameter_for(actual).nil? && matches_type?(actual)
+    end
+
+    chain :with_type do |type|
+      @type = type
+    end
+
+    failure_message_for_should do |actual|
+      if parameter = parameter_for(actual)
+        %(expected parameter #{parameter_id.inspect} to have type #{@type.inspect}, but got #{parameter.type.inspect})
+      else
+        %(expected to find parameter #{parameter_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/matchers/have_property.rb

@@ -0,0 +1,59 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_property do |property_name|
+    define_method :resource_for do |actual|
+      actual.resources.detect { |resource| resource.id == @resource_id }
+    end
+
+    define_method :property_for do |resource|
+      resource.properties[property_name]
+    end
+
+    define_method :matches_value? do |property|
+      if @value
+        property == @value
+      elsif @reference
+        property.id == @reference
+      else
+        true
+      end
+    end
+
+    match do |actual|
+      resource = resource_for(actual)
+      property = property_for(resource)
+      !resource.nil? && !property.nil? && matches_value?(property)
+    end
+
+    chain :on do |resource_id|
+      @resource_id = resource_id
+    end
+
+    chain :with_value do |value|
+      @value = value
+    end
+
+    chain :with_reference do |reference|
+      @reference = reference
+    end
+
+    failure_message_for_should do |actual|
+      if resource = resource_for(actual)
+        if property = property_for(resource)
+          if @value
+            %(expected resource #{@resource_id.inspect} property #{property_name.inspect} to have value #{@value.inspect}, but got #{property.inspect})
+          else
+            %(expected resource #{@resource_id.inspect} property #{property_name.inspect} to refer to #{@reference.inspect}, but got #{property.id.inspect})
+          end
+        else
+          %(expected resource #{@resource_id.inspect} to have property #{property_name.inspect})
+        end
+      else
+        %(expected to find resource #{@resource_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/matchers/have_resource.rb

@@ -0,0 +1,31 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_resource do |resource_id|
+    define_method :resource_for do |actual|
+      actual.resources.detect { |resource| resource.id == resource_id }
+    end
+
+    define_method :matches_type? do |actual|
+      @type.nil? || resource_for(actual).type == @type
+    end
+
+    match do |actual|
+      !resource_for(actual).nil? && matches_type?(actual)
+    end
+
+    chain :with_type do |type|
+      @type = type
+    end
+
+    failure_message_for_should do |actual|
+      if resource = resource_for(actual)
+        %(expected resource #{resource_id.inspect} to have type #{@type.inspect}, but got #{resource.type.inspect})
+      else
+        %(expected to find resource #{resource_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/matchers/have_tag.rb

@@ -0,0 +1,60 @@
+require "rspec/expectations"
+
+module Chemtrail::RSpec
+  extend RSpec::Matchers::DSL
+
+  matcher :have_tag do |key_name|
+    define_method :resource_for do |actual|
+      actual.resources.detect { |resource| resource.id == @resource_id }
+    end
+
+    define_method :tag_for do |resource|
+      tags = resource.properties["Tags"] || []
+      tags.detect { |tag| tag["Key"] == key_name }
+    end
+
+    define_method :matches_value? do |tag|
+      if @value
+        tag["Value"] == @value
+      elsif @reference
+        tag["Value"].id == @reference
+      else
+        true
+      end
+    end
+
+    match do |actual|
+      resource = resource_for(actual)
+      tag = tag_for(resource)
+      !resource.nil? && !tag.nil? && matches_value?(tag)
+    end
+
+    chain :on do |resource_id|
+      @resource_id = resource_id
+    end
+
+    chain :with_value do |value|
+      @value = value
+    end
+
+    chain :with_reference do |reference|
+      @reference = reference
+    end
+
+    failure_message_for_should do |actual|
+      if resource = resource_for(actual)
+        if tag = tag_for(resource)
+          if @value
+            %(expected resource #{@resource_id.inspect} tag #{key_name.inspect} to have value #{@value.inspect}, but got #{tag["Value"].inspect})
+          else
+            %(expected resource #{@resource_id.inspect} tag #{key_name.inspect} to refer to #{@reference.inspect}, but got #{tag["Value"].id.inspect})
+          end
+        else
+          %(expected resource #{@resource_id.inspect} to have tag #{key_name.inspect})
+        end
+      else
+        %(expected to find resource #{@resource_id.inspect}, but got nothing)
+      end
+    end
+  end
+end

data/lib/chemtrail/resource.rb

@@ -1,9 +1,10 @@
 class Chemtrail::Resource
   attr_reader :id, :type
 
-  def initialize(id, type)
+  def initialize(id, type, properties = nil)
     @id = id
     @type = type
+    @properties = Chemtrail::PropertyList.new.merge(properties) if properties
   end
 
   def to_reference

data/lib/chemtrail/rspec.rb

@@ -1,131 +1,8 @@
 require "chemtrail"
-require "rspec/expectations"
-
-module Chemtrail::RSpec
-  extend RSpec::Matchers::DSL
-
-  matcher :have_parameter do |parameter_id|
-    define_method :parameter_for do |actual|
-      actual.parameters.detect { |param| param.id == parameter_id }
-    end
-
-    define_method :matches_type? do |actual|
-      @type.nil? || parameter_for(actual).type == @type
-    end
-
-    match do |actual|
-      !parameter_for(actual).nil? && matches_type?(actual)
-    end
-
-    chain :with_type do |type|
-      @type = type
-    end
-
-    failure_message_for_should do |actual|
-      if parameter = parameter_for(actual)
-        %(expected parameter #{parameter_id.inspect} to have type #{@type.inspect}, but got #{parameter.type.inspect})
-      else
-        %(expected to find parameter #{parameter_id.inspect}, but got nothing)
-      end
-    end
-  end
-
-  matcher :have_field do |field_name|
-    define_method :parameter_for do |actual|
-      actual.parameters.detect { |p| p.id == @parameter_id }
-    end
-
-    define_method :field_for do |parameter|
-      parameter.fields[field_name]
-    end
-
-    define_method :matches_value? do |field|
-      if @value
-        field == @value
-      elsif @included_value
-        field.include?(@included_value)
-      else
-        true
-      end
-    end
-
-    match do |actual|
-      parameter = parameter_for(actual)
-      field = field_for(parameter)
-      !parameter.nil? && !field.nil? && matches_value?(field)
-    end
-
-    chain :on do |parameter_id|
-      @parameter_id = parameter_id
-    end
-
-    chain :with_value do |value|
-      @value = value
-    end
-
-    chain :including do |value|
-      @included_value = value
-    end
-
-    failure_message_for_should do |actual|
-      if parameter = parameter_for(actual)
-        if field = field_for(parameter)
-          expected_field = @value || @included_value
-          %(expected parameter #{@parameter_id.inspect} field #{field_name.inspect} to have value #{expected_field.inspect}, but got #{field.inspect})
-        else
-          %(expected parameter #{@parameter_id.inspect} to have type #{field_name.inspect})
-        end
-      else
-        %(expected to find parameter #{@parameter_id.inspect}, but got nothing)
-      end
-    end
-  end
-
-  matcher :have_mapping do |expected|
-    match { |actual| actual.mappings.any? { |m| m.id == expected } }
-  end
-
-  matcher :have_mapping_key do |entry_name|
-    define_method :mapping_for do |actual|
-      actual.mappings.detect { |m| m.id == @mapping_id }
-    end
-
-    define_method :entry_for do |mapping|
-      mapping.entries[entry_name]
-    end
-
-    define_method :matches_value? do |entry|
-      if @included_value
-        entry.values_at(*@included_value.keys) == @included_value.values
-      else
-        true
-      end
-    end
-
-    match do |actual|
-      mapping = mapping_for(actual)
-      entry = entry_for(mapping)
-      !mapping.nil? && !entry.nil? && matches_value?(entry)
-    end
-
-    chain :on do |mapping_id|
-      @mapping_id = mapping_id
-    end
-
-    chain :including do |value|
-      @included_value = value
-    end
-
-    failure_message_for_should do |actual|
-      if mapping = mapping_for(actual)
-        if entry = entry_for(mapping)
-          %(expected mapping #{@mapping_id.inspect} field #{entry_name.inspect} to have value #{@included_value.inspect}, but got #{entry.inspect})
-        else
-          %(expected mapping #{@mapping_id.inspect} to have type #{entry_name.inspect})
-        end
-      else
-        %(expected to find mapping #{@mapping_id.inspect}, but got nothing)
-      end
-    end
-  end
-end
+require "chemtrail/matchers/have_field"
+require "chemtrail/matchers/have_mapping"
+require "chemtrail/matchers/have_mapping_key"
+require "chemtrail/matchers/have_parameter"
+require "chemtrail/matchers/have_property"
+require "chemtrail/matchers/have_resource"
+require "chemtrail/matchers/have_tag"

data/lib/chemtrail/version.rb

@@ -1,3 +1,3 @@
 module Chemtrail
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/lib/chemtrail/intrinsic_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe Chemtrail::Intrinsic do
+  subject(:intrinsic) { Chemtrail::Intrinsic.new("Tacos") }
+
+  its(:id) { should == "Tacos" }
+  its(:to_reference) { should == {"Ref" => "Tacos"} }
+
+  describe "#as_tag" do
+    it "creates a tag with the given name" do
+      intrinsic.as_tag("Great").should == {"Key"=>"Great", "Value"=>intrinsic}
+    end
+  end
+end

data/spec/lib/chemtrail/resource_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe Chemtrail::Resource do
   subject(:resource) { Chemtrail::Resource.new("toenails", "Gross") }
+  let(:hash) { resource.to_hash["toenails"] }
 
   its(:id) { should == "toenails" }
   its(:type) { should == "Gross" }
@@ -14,10 +15,14 @@ describe Chemtrail::Resource do
   end
 
   context "when there is a property" do
-    let(:hash) { resource.to_hash["toenails"] }
-
     before { resource.properties["UserDingus"] = "whatever" }
 
     specify { hash["Properties"].should include("UserDingus" => "whatever") }
   end
+
+  context "when a property is configured through the initializer" do
+    subject(:resource) { Chemtrail::Resource.new("toenails", "Gross", clipping: "great") }
+
+    specify { hash["Properties"].should include(clipping: "great") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chemtrail
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Doc Ritezel
@@ -103,6 +103,7 @@ files:
 - examples/Guardfile
 - examples/lib/templates/config/mappings.yml
 - examples/lib/templates/config/parameters.yml
+- examples/lib/templates/config/resources.yml
 - examples/lib/templates/opsworks_vpc_template.rb
 - examples/spec/lib/templates/opsworks_vpc_template_spec.rb
 - examples/spec/spec_helper.rb
@@ -110,7 +111,15 @@ files:
 - lib/chemtrail/class_name_inflector.rb
 - lib/chemtrail/cli.rb
 - lib/chemtrail/function.rb
+- lib/chemtrail/intrinsic.rb
 - lib/chemtrail/mapping.rb
+- lib/chemtrail/matchers/have_field.rb
+- lib/chemtrail/matchers/have_mapping.rb
+- lib/chemtrail/matchers/have_mapping_key.rb
+- lib/chemtrail/matchers/have_parameter.rb
+- lib/chemtrail/matchers/have_property.rb
+- lib/chemtrail/matchers/have_resource.rb
+- lib/chemtrail/matchers/have_tag.rb
 - lib/chemtrail/output.rb
 - lib/chemtrail/parameter.rb
 - lib/chemtrail/property_list.rb
@@ -124,6 +133,7 @@ files:
 - spec/lib/chemtrail/class_name_inflector_spec.rb
 - spec/lib/chemtrail/cli_spec.rb
 - spec/lib/chemtrail/function_spec.rb
+- spec/lib/chemtrail/intrinsic_spec.rb
 - spec/lib/chemtrail/mapping_spec.rb
 - spec/lib/chemtrail/output_spec.rb
 - spec/lib/chemtrail/parameter_spec.rb
@@ -162,6 +172,7 @@ test_files:
 - spec/lib/chemtrail/class_name_inflector_spec.rb
 - spec/lib/chemtrail/cli_spec.rb
 - spec/lib/chemtrail/function_spec.rb
+- spec/lib/chemtrail/intrinsic_spec.rb
 - spec/lib/chemtrail/mapping_spec.rb
 - spec/lib/chemtrail/output_spec.rb
 - spec/lib/chemtrail/parameter_spec.rb