cloud_shaped 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21a359b972abb22fad3f55b1be73a5bf6f77659
-  data.tar.gz: 69029374c81f2afe26925332398a5c1bddbc0490
+  metadata.gz: 0fdc611b70fc3544aade1219d677b5048d4c53af
+  data.tar.gz: b0d8936622fdf2cf4b18767aa15c53c3c3a433c2
 SHA512:
-  metadata.gz: ac6dbf62ac5e9c3b939fc920b9fd125792ea9e7e54be79496bc94886de35c0cbb292fcb16f57bd7820633aa8d63957c2644187caece0a4ef731a3ecad1e7e95a
-  data.tar.gz: 2deb1051579c6ca6fa00809c72156c75ea48a2a3fa3bd27c385b7bc6b5a6472685a6138017599e2fcd712d731a8f7d3af669a7eac2881458daf3d2fdf0e3c63d
+  metadata.gz: b9b0676e9f7c504de7195197eadd4388eb9dc152a718c06b0b7e983086319148527abe29da03b9f4717b2c4783d9b5fb04d4952e6709e993e978ab46e52ac046
+  data.tar.gz: b9a67eb5d1a5c1c943fd0874d24822c26123b6a3d870a87420063fba10336e326a34df5a58ba63ca6c517651c332093e27a378c714d5b634d9d7b923ea69dc78

data/lib/cloud_shaped/dsl.rb

@@ -1,5 +1,6 @@
 require 'cloud_shaped/core_methods'
 require 'cloud_shaped/function_methods'
+require 'cloud_shaped/interpolation'
 require 'cloud_shaped/sns_methods'
 
 module CloudShaped
@@ -7,6 +8,7 @@ module CloudShaped
 
     include CoreMethods
     include FunctionMethods
+    include Interpolation
     include SnsMethods
 
     extend self

data/lib/cloud_shaped/interpolation.rb

@@ -0,0 +1,42 @@
+require 'cloud_shaped/core_methods'
+require 'cloud_shaped/function_methods'
+
+module CloudShaped
+
+  module Interpolation
+
+    include CoreMethods
+    include FunctionMethods
+
+    DEFAULT_DELIMITERS =['{{','}}']
+
+    # Interpolates a String, inserting calls to "Ref" and "Fn::GetAtt".
+    #
+    # @param string [String] input string
+    # @param delimiters [Array] opening and closing delimter
+    #
+    def interpolate(string, delimiters = DEFAULT_DELIMITERS)
+      fragments = string.lines.map do |line|
+        interpolate_line(line, delimiters)
+      end.flatten
+      fn_join('', fragments)
+    end
+
+    private
+
+    def interpolate_line(line, delimiters)
+      open, close = delimiters
+      tokens = line.split(/(#{Regexp.quote(open)}[\w:.]+#{Regexp.quote(close)})/)
+      tokens.reject!(&:empty?)
+      tokens.map do |token|
+        if token =~ /^#{Regexp.quote(open)}([\w:]+)(?:\.(\w+))?#{Regexp.quote(close)}$/
+          ref($1, $2)
+        else
+          token
+        end
+      end
+    end
+
+  end
+
+end

data/lib/cloud_shaped/sns_methods.rb

@@ -1,27 +1,28 @@
 require 'cloud_shaped/core_methods'
 
 module CloudShaped
-
+  # Methods to create sns topics
   module SnsMethods
-
     include CoreMethods
 
-    def sns_topic(target)
-      resource "AWS::SNS::Topic", "Subscription" => [
-        { "Protocol" => sns_protocol(target), "Endpoint" => target }
+    def sns_topic(endpoint)
+      proto, target = sns_proto_target(endpoint)
+      resource 'AWS::SNS::Topic', 'Subscription' => [
+        { 'Protocol' => proto, 'Endpoint' => target }
       ]
     end
 
     private
 
-    def sns_protocol(target)
+    def sns_proto_target(target)
       case target
       when /^(https?):/
-        $1.upcase
-      else "email"
+        [Regexp.last_match[1].upcase, target]
+      when /^(mailto):(.*)/
+        ['email', Regexp.last_match[2]]
+      else ['email', target]
       end
     end
-
   end
-
 end
+

data/lib/cloud_shaped/template_builder.rb

@@ -8,6 +8,7 @@ module CloudShaped
 
     def initialize(settings = {})
       @parameters = {}
+      @mappings = {}
       @resources = {}
       @outputs = {}
     end
@@ -15,12 +16,13 @@ module CloudShaped
     # @return [Hash] a CloudFormation template as Ruby data
     #
     def template
-      {
-        "AWSTemplateFormatVersion" => '2010-09-09',
-        "Parameters" => parameters,
-        "Resources" => resources,
-        "Outputs" => outputs
-      }
+      {}.tap do |template|
+        template["AWSTemplateFormatVersion"] = '2010-09-09'
+        template["Parameters"] = parameters unless parameters.empty?
+        template["Mappings"] = mappings unless mappings.empty?
+        template["Resources"] = resources
+        template["Outputs"] = outputs unless outputs.empty?
+      end
     end
 
     include CloudShaped::DSL
@@ -40,6 +42,19 @@ module CloudShaped
       parameters[name] = parameter(options)
     end
 
+    # Declares a Mappping.
+    #
+    # @param name [String] the mapping name
+    # @param mapping [Hash] the mapping
+    #
+    # @example
+    #   def_mapping "regionMap", "us-east-1" => { "32" => "ami-6411e20d" }
+    #
+    def def_mapping(name, mapping = {})
+      yield mapping if block_given?
+      mappings[name] = mapping
+    end
+
     # Declares a Resource.
     #
     # @param name [String] the resource name
@@ -70,6 +85,7 @@ module CloudShaped
     protected
 
     attr_reader :parameters
+    attr_reader :mappings
     attr_reader :resources
     attr_reader :outputs
 

data/lib/cloud_shaped/version.rb

@@ -1,3 +1,3 @@
 module CloudShaped
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/cloud_shaped/interpolation_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+
+require 'cloud_shaped/interpolation'
+
+describe CloudShaped::Interpolation do
+
+  include described_class
+
+  describe "#interpolate" do
+
+    let(:output) { interpolate(input) }
+
+    context "with a resource or parameter name" do
+
+      let(:input) { "prefix-{{myResource}}-suffix" }
+
+      it "generates a Ref" do
+        expect(output).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                "prefix-",
+                { "Ref" => "myResource" },
+                "-suffix"
+              ]
+            ]
+          }
+        )
+      end
+
+    end
+
+    context "with a built-in CloudFormation resource" do
+
+      let(:input) { "{{AWS::StackName}}" }
+
+      it "generates a Ref" do
+        expect(output).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                { "Ref" => "AWS::StackName" }
+              ]
+            ]
+          }
+        )
+      end
+
+    end
+
+    context "with a built-in CloudFormation resource surrounded by other stuff" do
+
+      let(:input) { "prefix-{{AWS::StackName}}-suffix" }
+
+      it "generates a Ref" do
+        expect(output).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                "prefix-",
+                { "Ref" => "AWS::StackName" },
+                "-suffix"
+              ]
+            ]
+          }
+        )
+      end
+
+    end
+
+    context "with a resource name and attribute" do
+
+      let(:input) { "prefix-{{loadBalancer.cname}}-suffix" }
+
+      it "generates an Fn::GetAtt" do
+        expect(output).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                "prefix-",
+                { "Fn::GetAtt" => ["loadBalancer", "cname"] },
+                "-suffix"
+              ]
+            ]
+          }
+        )
+      end
+
+    end
+
+    it "supports alternate delimiters" do
+      double_square_brackets = ["[[", "]]"]
+      expect(interpolate("[[foo]]", double_square_brackets)).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                { "Ref" => "foo" }
+              ]
+            ]
+          }
+        )
+    end
+
+    context "with a mix of stuff" do
+
+      let(:input) { "#!/bin/foo\n\nprefix-{{myResource}}-suffix\n" }
+
+      it "all just works" do
+        expect(output).to eq(
+          {
+            "Fn::Join" => [
+              "", [
+                "#!/bin/foo\n",
+                "\n",
+                "prefix-",
+                { "Ref" => "myResource" },
+                "-suffix\n"
+              ]
+            ]
+          }
+        )
+      end
+
+    end
+
+  end
+
+end

data/spec/cloud_shaped/sns_methods_spec.rb

@@ -22,6 +22,18 @@ describe CloudShaped::SnsMethods do
         )
       end
 
+      it "generates an email resource after stripping mailto:" do
+        output = sns_topic("mailto:root@example.com")
+        expect(output).to eq(
+          "Type" => "AWS::SNS::Topic",
+          "Properties" => {
+            "Subscription" => [
+              { "Protocol" => "email", "Endpoint" => "root@example.com" }
+            ]
+          }
+        )
+      end
+
     end
 
     context "with an HTTP URL" do
@@ -58,3 +70,4 @@ describe CloudShaped::SnsMethods do
 
   end
 end
+

data/spec/cloud_shaped/template_builder_spec.rb

@@ -14,9 +14,7 @@ describe CloudShaped::TemplateBuilder do
 
       expect(template).to eq(
         "AWSTemplateFormatVersion" => '2010-09-09',
-        "Parameters" => {},
-        "Resources" => {},
-        "Outputs" => {}
+        "Resources" => {}
       )
 
     end
@@ -117,4 +115,49 @@ describe CloudShaped::TemplateBuilder do
 
   end
 
+  describe "#def_mapping" do
+
+    context "with a Hash" 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"}
+        }
+      end
+
+      before do
+        template_builder.def_mapping("RegionMap", region_map)
+      end
+
+      it "defines a Mapping" do
+        expect(template["Mappings"]).to eq("RegionMap" => region_map)
+      end
+
+    end
+
+    context "with a block" do
+
+      before do
+        template_builder.def_mapping("RegionMap") do |map|
+          map["ap-southeast-2"] = "foo"
+          map["us-east-1"] = "bar"
+        end
+      end
+
+      it "defines a Mapping" do
+        expected_mapping = {
+          "ap-southeast-2" => "foo",
+          "us-east-1" => "bar"
+        }
+        expect(template["Mappings"]).to eq("RegionMap" => expected_mapping)
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: cloud_shaped
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: CloudShaped makes it easier to generate CloudFormation templates, using
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,12 +74,14 @@ files:
 - lib/cloud_shaped/core_methods.rb
 - lib/cloud_shaped/dsl.rb
 - lib/cloud_shaped/function_methods.rb
+- lib/cloud_shaped/interpolation.rb
 - lib/cloud_shaped/sns_methods.rb
 - lib/cloud_shaped/template_builder.rb
 - lib/cloud_shaped/version.rb
 - spec/cloud_shaped/camelate_spec.rb
 - spec/cloud_shaped/core_methods_spec.rb
 - spec/cloud_shaped/function_methods_spec.rb
+- spec/cloud_shaped/interpolation_spec.rb
 - spec/cloud_shaped/sns_methods_spec.rb
 - spec/cloud_shaped/template_builder_spec.rb
 - spec/cloud_shaped_spec.rb
@@ -94,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DSL for AWS CloudFormation templates.
@@ -112,6 +114,7 @@ test_files:
 - spec/cloud_shaped/camelate_spec.rb
 - spec/cloud_shaped/core_methods_spec.rb
 - spec/cloud_shaped/function_methods_spec.rb
+- spec/cloud_shaped/interpolation_spec.rb
 - spec/cloud_shaped/sns_methods_spec.rb
 - spec/cloud_shaped/template_builder_spec.rb
 - spec/cloud_shaped_spec.rb