cloud_shaped 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81578102167a9548f023eb99b7fe9d3302fced4e
-  data.tar.gz: 036c15cb87e71bf50808816ebfd4a406656e1f2e
+  metadata.gz: 267754ee0088b83995297f3751b2318b38c081d2
+  data.tar.gz: 5a66197c33f5dc4e1b116592c4a1f867e212e311
 SHA512:
-  metadata.gz: ba1bb9c3342bd70f0e32968ed64cbe0b9940aa47e0474c8f09dbfe4a98378543d9398f9001bc067b607d0bd0304b262484c7215bddaaa157d1883cfb71ea4011
-  data.tar.gz: b60601ccf0ace938272dbe70cae75abacd3ed60656cb13fcdf86629aff1f747f6b6bf1dbbd5bcd4bd317c7819fb6e3010707fcd9d67062fd19fc7db3805a4abf
+  metadata.gz: a9b79759612fa41c182b3bd3831dbc7e89278fd97438ef69831467882c5bcaf85c7c4be3644964110ba73ff2d533d0d6728087e107bcfd52e203457a29e16160
+  data.tar.gz: 40c8fc91d0edfe90a57e7ee568694982b6effb3e2de3604da5108fc0c8881c28c30918241261dc8ef60d9cd5fe0cc7051981f5c96aa44e1a2be8c29a635ec608

data/.rubocop.yml

@@ -0,0 +1,47 @@
+Eval:
+  Exclude:
+    - "Rakefile"
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 30
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  Exclude:
+    - "spec/**/*"
+
+Style/Documentation:
+  Exclude:
+    - "spec/**/*"
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+
+Style/FileName:
+  Exclude:
+    - "bin/*"
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/WordArray:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in cloud_shaped.gemspec
 gemspec

data/README.md

@@ -1,5 +1,8 @@
 # CloudShaped
 
+[![Gem Version](https://badge.fury.io/rb/cloud_shaped.png)](http://badge.fury.io/rb/cloud_shaped)
+[![Build Status](https://secure.travis-ci.org/mdub/cloud_shaped.png?branch=master)](http://travis-ci.org/mdub/cloud_shaped)
+
 Infrastructure as <del>data</del> code.
 
 [CloudFormation][cloud_formation] provides a nice way to provision AWS resources in a declarative way.  But, programming in JSON can be painful.
@@ -79,6 +82,48 @@ Typically, the "type" argument will be a string specifying a CloudFormation reso
 
     t.def_resource "adminEmail", :email_topic, "mdub@example.com"
 
+### Text interpolation
+
+Sometimes it's necessary to embed files or even scripts in a CloudFormation template, but include references to stack parameters or resources; the resulting mess of "Fn::Join" and "Fn::GetAtt" can be hard to follow.
+
+CloudShaped's `interpolate` function makes it easier; it detects references of the form `{{RESOURCE}}` or `{{RESOURCE.ATTRIBUTE}}` in a string, and generates "Ref" and "Fn::GetAtt" as appropriate, e.g.
+
+```ruby
+script = <<-'BASH'
+#!/bin/sh
+... stuff ...
+/usr/local/bin/cfn-signal -e 0 \
+  --stack {{AWS::StackName}} --region {{AWS::Region}} \
+  --resource thisHereInstance
+BASH
+
+t.interpolate(script) #=> ...
+{
+  "Fn::Join" =>
+  [
+    "\n",
+    [
+      "#!/bin/sh",
+      "... stuff ...",
+      "/usr/local/bin/cfn-signal -e 0 \\",
+      {
+        "Fn::Join" => [
+          "",
+          [
+            "  --stack ",
+            { "Ref" => "AWS::StackName" },
+            " --region ",
+            { "Ref" => "AWS::Region" },
+            " \\"
+          ]
+        ]
+      },
+      "  --resource thisHereInstance"
+    ]
+  ]
+}
+```
+
 ## Full documentation
 
 For more info on the DSL, see:

data/Rakefile

@@ -5,6 +5,6 @@ require "rspec/core/rake_task"
 task "default" => "spec"
 
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+  t.pattern = "spec/**/*_spec.rb"
   t.rspec_opts = ["--colour", "--format", "d"]
 end

data/cloud_shaped.gemspec

@@ -1,15 +1,14 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'cloud_shaped/version'
+require "cloud_shaped/version"
 
 Gem::Specification.new do |gem|
 
   gem.name          = "cloud_shaped"
   gem.version       = CloudShaped::VERSION
 
-  gem.summary       = %q{DSL for AWS CloudFormation templates.}
-  gem.description   = %q{CloudShaped makes it easier to generate CloudFormation templates, using a Builder-like DSL.}
+  gem.summary       = "DSL for AWS CloudFormation templates."
+  gem.description   = "CloudShaped makes it easier to generate CloudFormation templates, using a Builder-like DSL."
 
   gem.authors       = ["Mike Williams"]
   gem.email         = ["mdub@dogbiscuit.org"]
@@ -25,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", "~> 1.6"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rubocop", "~> 0.32"
 
 end

data/examples/buckets.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-require 'cloud_shaped'
-require 'yaml'
+require "cloud_shaped"
+require "yaml"
 
 class BucketMaker
 

data/examples/macro.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-require 'cloud_shaped'
-require 'yaml'
+require "cloud_shaped"
+require "yaml"
 
 module ScalingMacros
 

data/examples/simple.rb

@@ -1,13 +1,13 @@
 #! /usr/bin/env ruby
 
-require 'cloud_shaped'
-require 'yaml'
+require "cloud_shaped"
+require "yaml"
 
 template = CloudShaped.template do
 
   self.description = "Make a bucket"
 
-  self.metadata["foo"] = {
+  metadata["foo"] = {
     "bar" => "baz"
   }
 

data/lib/cloud_shaped/camelate.rb

@@ -1,7 +1,7 @@
 class Symbol
 
   def camelate
-    to_s.split('_').map(&:capitalize).join
+    to_s.split("_").map(&:capitalize).join
   end
 
 end

data/lib/cloud_shaped/core_methods.rb

@@ -20,7 +20,7 @@ module CloudShaped
     def resource(type, properties = {}, attributes = {})
       properties = properties.camelate_keys
       yield properties, attributes if block_given?
-      properties.select! { |k,v| v != nil }
+      properties.select! { |_k, v| !v.nil? }
       attributes.merge(
         "Type" => type,
         "Properties" => properties
@@ -77,7 +77,7 @@ module CloudShaped
     #   tags("application" => "atlas", "version" => "1.2.3")
     #
     def tags(tag_map, extra_properties = {})
-      tag_map.map { |k,v| tag(k,v, extra_properties) }
+      tag_map.map { |k, v| tag(k, v, extra_properties) }
     end
 
     # Returns a resource reference.

data/lib/cloud_shaped/dsl.rb

@@ -1,7 +1,7 @@
-require 'cloud_shaped/core_methods'
-require 'cloud_shaped/function_methods'
-require 'cloud_shaped/interpolation'
-require 'cloud_shaped/sns_methods'
+require "cloud_shaped/core_methods"
+require "cloud_shaped/function_methods"
+require "cloud_shaped/interpolation"
+require "cloud_shaped/sns_methods"
 
 module CloudShaped
   module DSL

data/lib/cloud_shaped/function_methods.rb

@@ -18,6 +18,46 @@ module CloudShaped
       }
     end
 
+    # Syntax sugar for Fn::And.
+    #
+    def fn_and(*conditions)
+      {
+        "Fn::And" => conditions
+      }
+    end
+
+    # Syntax sugar for Fn::Equals.
+    #
+    def fn_equals(v1, v2)
+      {
+        "Fn::Equals" => [v1, v2]
+      }
+    end
+
+    # Syntax sugar for Fn::If.
+    #
+    def fn_if(condition, when_true, when_false)
+      {
+        "Fn::If" => [condition, when_true, when_false]
+      }
+    end
+
+    # Syntax sugar for Fn::Not.
+    #
+    def fn_not(cond)
+      {
+        "Fn::Not" => [cond]
+      }
+    end
+
+    # Syntax sugar for Fn::Or.
+    #
+    def fn_or(*conditions)
+      {
+        "Fn::Or" => conditions
+      }
+    end
+
   end
 
 end

data/lib/cloud_shaped/interpolation.rb

@@ -1,5 +1,5 @@
-require 'cloud_shaped/core_methods'
-require 'cloud_shaped/function_methods'
+require "cloud_shaped/core_methods"
+require "cloud_shaped/function_methods"
 
 module CloudShaped
 
@@ -8,7 +8,7 @@ module CloudShaped
     include CoreMethods
     include FunctionMethods
 
-    DEFAULT_DELIMITERS =['{{','}}']
+    DEFAULT_DELIMITERS = ["{{", "}}"].freeze
 
     # Interpolates a String, inserting calls to "Ref" and "Fn::GetAtt".
     #
@@ -16,10 +16,10 @@ module CloudShaped
     # @param delimiters [Array] opening and closing delimter
     #
     def interpolate(string, delimiters = DEFAULT_DELIMITERS)
-      fragments = string.lines.map do |line|
+      interpolated_lines = string.split("\n", -1).map do |line|
         interpolate_line(line, delimiters)
-      end.flatten
-      fn_join('', fragments)
+      end
+      join("\n", interpolated_lines)
     end
 
     private
@@ -28,13 +28,20 @@ module CloudShaped
       open, close = delimiters
       tokens = line.split(/(#{Regexp.quote(open)}[\w:.]+#{Regexp.quote(close)})/)
       tokens.reject!(&:empty?)
-      tokens.map do |token|
+      fragments = tokens.map do |token|
         if token =~ /^#{Regexp.quote(open)}([\w:]+)(?:\.(\w+))?#{Regexp.quote(close)}$/
-          ref($1, $2)
+          ref(Regexp.last_match(1), Regexp.last_match(2))
         else
           token
         end
       end
+      join("", fragments)
+    end
+
+    def join(delimiter, parts)
+      return "" if parts.empty?
+      return parts.first if parts.one?
+      fn_join(delimiter, parts)
     end
 
   end

data/lib/cloud_shaped/sns_methods.rb

@@ -1,4 +1,4 @@
-require 'cloud_shaped/core_methods'
+require "cloud_shaped/core_methods"
 
 module CloudShaped
   # Methods to create sns topics
@@ -7,8 +7,8 @@ module CloudShaped
 
     def sns_topic(endpoint)
       proto, target = sns_proto_target(endpoint)
-      resource 'AWS::SNS::Topic', 'Subscription' => [
-        { 'Protocol' => proto, 'Endpoint' => target }
+      resource "AWS::SNS::Topic", "Subscription" => [
+        { "Protocol" => proto, "Endpoint" => target }
       ]
     end
 
@@ -19,10 +19,9 @@ module CloudShaped
       when /^(https?):/
         [Regexp.last_match[1].upcase, target]
       when /^(mailto):(.*)/
-        ['email', Regexp.last_match[2]]
-      else ['email', target]
+        ["email", Regexp.last_match[2]]
+      else ["email", target]
       end
     end
   end
 end
-

data/lib/cloud_shaped/template_builder.rb

@@ -1,4 +1,4 @@
-require 'cloud_shaped/dsl'
+require "cloud_shaped/dsl"
 
 module CloudShaped
 
@@ -10,6 +10,7 @@ module CloudShaped
       @metadata = {}
       @parameters = {}
       @mappings = {}
+      @conditions = {}
       @resources = {}
       @outputs = {}
     end
@@ -18,11 +19,12 @@ module CloudShaped
     #
     def template
       {}.tap do |template|
-        template["AWSTemplateFormatVersion"] = '2010-09-09'
+        template["AWSTemplateFormatVersion"] = "2010-09-09"
         template["Description"] = description if description
         template["Metadata"] = metadata unless metadata.empty?
         template["Parameters"] = parameters unless parameters.empty?
         template["Mappings"] = mappings unless mappings.empty?
+        template["Conditions"] = conditions unless conditions.empty?
         template["Resources"] = resources
         template["Outputs"] = outputs unless outputs.empty?
       end
@@ -42,6 +44,7 @@ module CloudShaped
     #   def_parameter "minInstances", :type => "Number"
     #
     def def_parameter(name, options = {})
+      yield options if block_given?
       parameters[name] = parameter(options)
     end
 
@@ -58,6 +61,18 @@ module CloudShaped
       mappings[name] = mapping
     end
 
+    # Declares a Condition.
+    #
+    # @param name [String] the condition name
+    # @param condition [Hash] the condition body
+    #
+    # @example
+    #   def_mapping "inProd", fn_equals(ref("Env"), "prod")
+    #
+    def def_condition(name, body)
+      conditions[name] = body
+    end
+
     # Declares a Resource.
     #
     # @param name [String] the resource name
@@ -66,10 +81,10 @@ module CloudShaped
     #
     def def_resource(name, type, *args, &block)
       definition = if type.is_a?(Symbol)
-        send(type, *args, &block)
-      else
-        resource(type, *args, &block)
-      end
+                     send(type, *args, &block)
+                   else
+                     resource(type, *args, &block)
+                   end
       resources[name] = definition if definition
     end
 
@@ -92,6 +107,7 @@ module CloudShaped
 
     attr_reader :parameters
     attr_reader :mappings
+    attr_reader :conditions
     attr_reader :resources
     attr_reader :outputs
 

data/lib/cloud_shaped/version.rb

@@ -1,3 +1,3 @@
 module CloudShaped
-  VERSION = "1.0.0"
+  VERSION = "1.1.0".freeze
 end

data/spec/cloud_shaped/camelate_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/camelate'
+require "cloud_shaped/camelate"
 
 describe String, "#camelate" do
   it "is a no-op" do

data/spec/cloud_shaped/core_methods_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/core_methods'
+require "cloud_shaped/core_methods"
 
 describe CloudShaped::CoreMethods do
 
@@ -58,7 +58,7 @@ describe CloudShaped::CoreMethods do
     context "with a block that sets attributes" do
 
       let(:result) do
-        resource("AWS::Thing") do |props, attrs|
+        resource("AWS::Thing") do |_props, attrs|
           attrs["DeletionPolicy"] = "Retain"
         end
       end
@@ -86,7 +86,7 @@ describe CloudShaped::CoreMethods do
     context "with no type" do
 
       it "defaults to 'String'" do
-        expect(parameter()).to eq(
+        expect(parameter).to eq(
           "Type" => "String"
         )
       end

data/spec/cloud_shaped/function_methods_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/function_methods'
+require "cloud_shaped/function_methods"
 
 describe CloudShaped::FunctionMethods do
 
@@ -11,9 +11,7 @@ describe CloudShaped::FunctionMethods do
     it "is sugar for Fn::Base64" do
       output = fn_base64("stuff")
       expect(output).to eq(
-        {
-          "Fn::Base64" => "stuff"
-        }
+        "Fn::Base64" => "stuff"
       )
     end
 
@@ -25,9 +23,62 @@ describe CloudShaped::FunctionMethods do
       lines = %w(a b c)
       output = fn_join(",", lines)
       expect(output).to eq(
-        {
-          "Fn::Join" => [",", lines]
-        }
+        "Fn::Join" => [",", lines]
+      )
+    end
+
+  end
+
+  describe "#fn_and" do
+
+    it "is sugar for Fn::And" do
+      output = fn_and("cond1", "cond2", "cond3")
+      expect(output).to eq(
+        "Fn::And" => ["cond1", "cond2", "cond3"]
+      )
+    end
+
+  end
+
+  describe "#fn_equals" do
+
+    it "is sugar for Fn::And" do
+      output = fn_equals("val1", "val2")
+      expect(output).to eq(
+        "Fn::Equals" => ["val1", "val2"]
+      )
+    end
+
+  end
+
+  describe "#fn_if" do
+
+    it "is sugar for Fn::If" do
+      output = fn_if("cond", "when_true", "when_false")
+      expect(output).to eq(
+        "Fn::If" => ["cond", "when_true", "when_false"]
+      )
+    end
+
+  end
+
+  describe "#fn_not" do
+
+    it "is sugar for Fn::Not" do
+      output = fn_not("cond")
+      expect(output).to eq(
+        "Fn::Not" => ["cond"]
+      )
+    end
+
+  end
+
+  describe "#fn_or" do
+
+    it "is sugar for Fn::Or" do
+      output = fn_or("cond1", "cond2", "cond3")
+      expect(output).to eq(
+        "Fn::Or" => ["cond1", "cond2", "cond3"]
       )
     end
 

data/spec/cloud_shaped/interpolation_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/interpolation'
+require "cloud_shaped/interpolation"
 
 describe CloudShaped::Interpolation do
 
@@ -16,15 +16,32 @@ describe CloudShaped::Interpolation do
 
       it "generates a Ref" do
         expect(output).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                "prefix-",
-                { "Ref" => "myResource" },
-                "-suffix"
-              ]
+          "Fn::Join" => [
+            "", [
+              "prefix-",
+              { "Ref" => "myResource" },
+              "-suffix"
             ]
-          }
+          ]
+        )
+      end
+
+    end
+
+    context "with multiple lines" do
+
+      let(:input) { "line1\nline2\nline3\n" }
+
+      it "uses Fn::Join to join lines" do
+        expect(output).to eq(
+          "Fn::Join" => [
+            "\n", [
+              "line1",
+              "line2",
+              "line3",
+              ""
+            ]
+          ]
         )
       end
 
@@ -36,13 +53,7 @@ describe CloudShaped::Interpolation do
 
       it "generates a Ref" do
         expect(output).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                { "Ref" => "AWS::StackName" }
-              ]
-            ]
-          }
+          "Ref" => "AWS::StackName"
         )
       end
 
@@ -54,15 +65,13 @@ describe CloudShaped::Interpolation do
 
       it "generates a Ref" do
         expect(output).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                "prefix-",
-                { "Ref" => "AWS::StackName" },
-                "-suffix"
-              ]
+          "Fn::Join" => [
+            "", [
+              "prefix-",
+              { "Ref" => "AWS::StackName" },
+              "-suffix"
             ]
-          }
+          ]
         )
       end
 
@@ -74,15 +83,13 @@ describe CloudShaped::Interpolation do
 
       it "generates an Fn::GetAtt" do
         expect(output).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                "prefix-",
-                { "Fn::GetAtt" => ["loadBalancer", "cname"] },
-                "-suffix"
-              ]
+          "Fn::Join" => [
+            "", [
+              "prefix-",
+              { "Fn::GetAtt" => ["loadBalancer", "cname"] },
+              "-suffix"
             ]
-          }
+          ]
         )
       end
 
@@ -90,15 +97,15 @@ describe CloudShaped::Interpolation do
 
     it "supports alternate delimiters" do
       double_square_brackets = ["[[", "]]"]
-      expect(interpolate("[[foo]]", double_square_brackets)).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                { "Ref" => "foo" }
-              ]
-            ]
-          }
-        )
+      expect(interpolate("blah[[foo]]blah", double_square_brackets)).to eq(
+        "Fn::Join" => [
+          "", [
+            "blah",
+            { "Ref" => "foo" },
+            "blah"
+          ]
+        ]
+      )
     end
 
     context "with a mix of stuff" do
@@ -107,17 +114,22 @@ describe CloudShaped::Interpolation do
 
       it "all just works" do
         expect(output).to eq(
-          {
-            "Fn::Join" => [
-              "", [
-                "#!/bin/foo\n",
-                "\n",
-                "prefix-",
-                { "Ref" => "myResource" },
-                "-suffix\n"
-              ]
+          "Fn::Join" => [
+            "\n", [
+              "#!/bin/foo",
+              "",
+              {
+                "Fn::Join" => [
+                  "", [
+                    "prefix-",
+                    { "Ref" => "myResource" },
+                    "-suffix"
+                  ]
+                ]
+              },
+              ""
             ]
-          }
+          ]
         )
       end
 

data/spec/cloud_shaped/sns_methods_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/sns_methods'
+require "cloud_shaped/sns_methods"
 
 describe CloudShaped::SnsMethods do
 
@@ -70,4 +70,3 @@ describe CloudShaped::SnsMethods do
 
   end
 end
-

data/spec/cloud_shaped/template_builder_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'cloud_shaped/template_builder'
+require "cloud_shaped/template_builder"
 
 describe CloudShaped::TemplateBuilder do
 
@@ -13,7 +13,7 @@ describe CloudShaped::TemplateBuilder do
     it "returns a CloudFormation template" do
 
       expect(template).to eq(
-        "AWSTemplateFormatVersion" => '2010-09-09',
+        "AWSTemplateFormatVersion" => "2010-09-09",
         "Resources" => {}
       )
 
@@ -23,7 +23,7 @@ describe CloudShaped::TemplateBuilder do
 
   describe "#description=" do
 
-    it "sets the Description"  do
+    it "sets the Description" do
       template_builder.description = "My awesome template"
       expect(template["Description"]).to eq("My awesome template")
     end
@@ -39,7 +39,7 @@ describe CloudShaped::TemplateBuilder do
       expect(template["Resources"]).to eq(
         "fooBar" => {
           "Type" => "AWS::Foo::Bar",
-          "Properties" => {"foo" => "bar"}
+          "Properties" => { "foo" => "bar" }
         }
       )
 
@@ -60,7 +60,7 @@ describe CloudShaped::TemplateBuilder do
         expect(template["Resources"]).to eq(
           "fooBar" => {
             "Type" => "AWS::Fnord::Fnord",
-            "Properties" => {"Size" => "3"}
+            "Properties" => { "Size" => "3" }
           }
         )
 
@@ -71,7 +71,7 @@ describe CloudShaped::TemplateBuilder do
     context "when resource macro-method returns nil" do
 
       before do
-        def template_builder.nada(*args)
+        def template_builder.nada(*_args)
           nil
         end
       end
@@ -130,11 +130,11 @@ describe CloudShaped::TemplateBuilder do
 
       let(:region_map) do
         {
-          "us-east-1"      => { "32" => "ami-6411e20d"},
-          "us-west-1"      => { "32" => "ami-c9c7978c"},
-          "eu-west-1"      => { "32" => "ami-37c2f643"},
-          "ap-southeast-1" => { "32" => "ami-66f28c34"},
-          "ap-northeast-1" => { "32" => "ami-9c03a89d"}
+          "us-east-1"      => { "32" => "ami-6411e20d" },
+          "us-west-1"      => { "32" => "ami-c9c7978c" },
+          "eu-west-1"      => { "32" => "ami-37c2f643" },
+          "ap-southeast-1" => { "32" => "ami-66f28c34" },
+          "ap-northeast-1" => { "32" => "ami-9c03a89d" }
         }
       end
 
@@ -169,6 +169,22 @@ describe CloudShaped::TemplateBuilder do
 
   end
 
+  describe "#def_condition" do
+
+    let(:condition_body) do
+      { "Fn::Equals" => [{ "Ref" => "Env" }, "prod"] }
+    end
+
+    before do
+      template_builder.def_condition("InProd", condition_body)
+    end
+
+    it "defines a Condition" do
+      expect(template["Conditions"]).to eq("InProd" => condition_body)
+    end
+
+  end
+
   describe "#metadata" do
 
     it "allows attachment of stack metadata" do

data/spec/cloud_shaped_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 require "cloud_shaped"
 
@@ -20,7 +20,7 @@ describe CloudShaped do
 
       it "declares a template using instance_eval" do
         expect(template).to eq(
-          "AWSTemplateFormatVersion" => '2010-09-09',
+          "AWSTemplateFormatVersion" => "2010-09-09",
           "Parameters" => {
             "appName" => {
               "Type" => "String"
@@ -60,7 +60,7 @@ describe CloudShaped do
 
       it "declares a template without instance_eval" do
         expect(template).to eq(
-          "AWSTemplateFormatVersion" => '2010-09-09',
+          "AWSTemplateFormatVersion" => "2010-09-09",
           "Parameters" => {
             "appName" => {
               "Type" => "String"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_shaped
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.32'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.32'
 description: CloudShaped makes it easier to generate CloudFormation templates, using
   a Builder-like DSL.
 email:
@@ -62,6 +76,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -107,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DSL for AWS CloudFormation templates.