kumogata 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dba7edb943ddc60c3ba51b2280ab75963303884
-  data.tar.gz: 71da06088335d8104b011df5771a380a6de9f1b0
+  metadata.gz: d994503ecb53c0aa9e0a0d7317a3f6b6cc8b2b39
+  data.tar.gz: cd96c9f28fdc83ba2025828f9ef5b305a3d5a313
 SHA512:
-  metadata.gz: 2f37f6ebd3c5ff220a829e48b99eb1f5c8b506879449876dcbcf9f961324b41dedc3b1f4c925b4fe672469f98bb568d04341c6367d66dea1d1e33a72e46fe781
-  data.tar.gz: c1d201f490a069ff328464f796cce66516b8e2159027248dbff67c2942033522108b22c21601523bc757c588a4ae1d044e463040a30449bed78648f458b16964
+  metadata.gz: 8392415cc172bc02adc1fb976316dfd7b7e4bdd4cde81cf6aca088a0af13480f5da9517461da3d1e8c530c1ce6a78662057a04e300706f2dda5695e046ccc621
+  data.tar.gz: 14a7759b1a3acfc951f3cc20ab317180972c9fe147b2f4fc7d1920cefda4b2c5d43c0f96c3e86499501404c66dec2855f279e4a6b7c4661a1e6b4aabb642ceec

data/README.md

@@ -5,12 +5,19 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403050111)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403050111)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403050220)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403050220)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
 ```ruby
+AWSTemplateFormatVersion "2010-09-09"
+
+Description (<<-EOS).undent
+  Kumogata Sample Template
+  You can use Here document!
+EOS
+
 Parameters do
   InstanceType do
     Default "t1.micro"
@@ -123,7 +130,7 @@ JSON template can be converted to Ruby template.
 
 ### String#fn_joine()
 
-Ruby templates will be converted as follows by `_join()`:
+Ruby templates will be converted as follows by `String#fn_join()`:
 
 ```ruby
 UserData do

data/lib/kumogata/ext/string_ext.rb

@@ -46,9 +46,45 @@ class String
     null = "\0"
 
     data = Object.new.instance_eval(<<-EOS)
-      @__refs__ = []
-      def Ref(value); @__refs__ << {'Ref' => value}; #{null.inspect}; end
-      ERB.new(#{data.inspect}, nil, #{trim_mode.inspect}).result(binding).split(#{null.inspect}).zip(@__refs__)
+      @__functions__ = []
+
+      @__value_conv__ = proc do |v|
+        case v
+        when Array, Hash
+          v
+        else
+          v.to_s
+        end
+      end
+
+      def Fn__Base64(value)
+        @__functions__ << {'Fn::Base64' => @__value_conv__[value]}
+        #{null.inspect}
+      end
+
+      def Fn__FindInMap(map_name, top_level_key, second_level_key)
+        @__functions__ << {'Fn::FindInMap' => [
+          map_name, top_level_key, second_level_key].map(&@__value_conv__)}
+        #{null.inspect}
+      end
+
+      def Fn__GetAtt(logical_name, attr_name)
+        @__functions__ << {'Fn::GetAtt' => [
+          logical_name, attr_name].map(&@__value_conv__)}
+        #{null.inspect}
+      end
+
+      def Fn__GetAZs(region)
+        @__functions__ << {'Fn::GetAZs' => @__value_conv__[region]}
+        #{null.inspect}
+      end
+
+      def Ref(value)
+        @__functions__ << {'Ref' => value}
+        #{null.inspect}
+      end
+
+      ERB.new(#{data.inspect}, nil, #{trim_mode.inspect}).result(binding).split(#{null.inspect}).zip(@__functions__)
     EOS
 
     data = data.flatten.select {|i| not i.nil? }.map {|i|

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/kumogata_convert_spec.rb

@@ -343,6 +343,32 @@ Resources do
     end # Metadata
   end
 end
+
+Outputs do
+  WebsiteURL do
+    Value (<<-EOS).fn_join
+      http://<%= Fn__GetAtt "myEC2Instance", "PublicDnsName" %>
+    EOS
+  end
+
+  Base64Str do
+    Value (<<-EOS).fn_join
+      <%= Fn__Base64 "AWS CloudFormation" %>
+    EOS
+  end
+
+  MappedValue do
+    Value (<<-EOS).fn_join
+      <%= Fn__FindInMap "RegionMap", { "Ref" => "AWS::Region" }, 32 %>
+    EOS
+  end
+
+  AZ do
+    Value (<<-EOS).fn_join
+      <%= Fn__GetAZs "us-east-1" %>
+    EOS
+  end
+end
     TEMPLATE
 
     json_template = run_client(:convert, :template => template)
@@ -421,6 +447,70 @@ end
         }
       }
     }
+  },
+  "Outputs": {
+    "WebsiteURL": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            "http://",
+            {
+              "Fn::GetAtt": [
+                "myEC2Instance",
+                "PublicDnsName"
+              ]
+            },
+            "\n"
+          ]
+        ]
+      }
+    },
+    "Base64Str": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            {
+              "Fn::Base64": "AWS CloudFormation"
+            },
+            "\n"
+          ]
+        ]
+      }
+    },
+    "MappedValue": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            {
+              "Fn::FindInMap": [
+                "RegionMap",
+                {
+                  "Ref": "AWS::Region"
+                },
+                "32"
+              ]
+            },
+            "\n"
+          ]
+        ]
+      }
+    },
+    "AZ": {
+      "Value": {
+        "Fn::Join": [
+          "",
+          [
+            {
+              "Fn::GetAZs": "us-east-1"
+            },
+            "\n"
+          ]
+        ]
+      }
+    }
   }
 }
     EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Genki Sugawara