kumogata 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7300b43907200cf152f62177d203af6a1771c9
-  data.tar.gz: e94419046f5079f0e4b229664dd1e4ddd7772fb9
+  metadata.gz: 6dba7edb943ddc60c3ba51b2280ab75963303884
+  data.tar.gz: 71da06088335d8104b011df5771a380a6de9f1b0
 SHA512:
-  metadata.gz: b8e8307dc2eb200b708bd7f70b68f8cc1b66f2dea90612b690f73b792ef2f214ddeec221f96c5bcc622e4f1b5288a16379aca133c316885a30130a7f1eda4102
-  data.tar.gz: d0b5242a7b7d944ba0f4867f257cecbf7bb28f1a1853266f48a8a32f3c934ee34fb544b93a5f6b6e02ce28b98b0df3bfa787f63d5b38b455575932aed882d4ca
+  metadata.gz: 2f37f6ebd3c5ff220a829e48b99eb1f5c8b506879449876dcbcf9f961324b41dedc3b1f4c925b4fe672469f98bb568d04341c6367d66dea1d1e33a72e46fe781
+  data.tar.gz: c1d201f490a069ff328464f796cce66516b8e2159027248dbff67c2942033522108b22c21601523bc757c588a4ae1d044e463040a30449bed78648f458b16964

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403050015)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403050015)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![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)
 
 It can define a template in Ruby DSL, such as:
 
@@ -115,18 +115,19 @@ JSON template can be converted to Ruby template.
   * `Fn::GetAtt` => `Fn__GetAtt`
 * `_{ ... }` is convered to Hash
   * `SecurityGroups [_{Ref "WebServerSecurityGroup"}]` => `{"SecurityGroups": [{"Ref": "WebServerSecurityGroup"}]}`
-* ~~_user_data() creates Base64-encoded UserData~~
-  * `_user_data()` has been removed
 * `_path()` creates Hash that has a key of path
   * `_path("/etc/passwd-s3fs") { content "..." }` => `{"/etc/passwd-s3fs": {"content": "..."}}`
+* ~~_user_data() creates Base64-encoded UserData~~
+  * `_user_data()` has been removed
+* `_join()` has been removed
 
-### _joine()
+### String#fn_joine()
 
 Ruby templates will be converted as follows by `_join()`:
 
 ```ruby
 UserData do
-  Fn__Base64 _join(<<-EOS)
+  Fn__Base64 (<<-EOS).fn_join
     #!/bin/bash
     /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
   EOS

data/lib/kumogata/client.rb

@@ -147,35 +147,6 @@ class Kumogata::Client
 
   def define_template_func(scope)
     scope.instance_eval(<<-'EOS')
-      def _join(data, options = {})
-        options = {
-          :undent    => true,
-          :trim_mode => nil,
-        }.merge(options)
-
-        data = data.undent if options[:undent]
-
-        @__refs__ = []
-        def Ref(value); @__refs__ << {"Ref" => value}; "\0"; end
-        data = ERB.new(data, nil, options[:trim_mode]).result(binding)
-        undef Ref
-
-        data = data.split("\0").zip(@__refs__)
-        @__refs__ = nil
-
-        data = data.flatten.select {|i| not i.nil? }.map {|i|
-          if i.kind_of?(String)
-            StringIO.new(i).to_a
-          else
-            i
-          end
-        }.flatten
-
-        return {
-          'Fn::Join' => ['', data]
-        }
-      end
-
       def _path(path, value = nil, &block)
         if block
           value = Dslh::ScopeBlock.nest(binding, 'block')

data/lib/kumogata/ext/string_ext.rb

@@ -33,4 +33,34 @@ class String
     min_space_num = self.split("\n").delete_if{|s| s=~ /^\s*$/ }.map{|s| s[/^\s+/].length }.min
     gsub(/^[ \t]{,#{min_space_num}}/, '')
   end
+
+  def fn_join(options = {})
+    options = {
+      :undent    => true,
+      :trim_mode => nil,
+    }.merge(options)
+
+    data = self.dup
+    data = data.undent if options[:undent]
+    trim_mode = options[:trim_mode]
+    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__)
+    EOS
+
+    data = data.flatten.select {|i| not i.nil? }.map {|i|
+      if i.kind_of?(String)
+        StringIO.new(i).to_a
+      else
+        i
+      end
+    }.flatten
+
+    return {
+      'Fn::Join' => ['', data]
+    }
+  end
 end

data/lib/kumogata/version.rb

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

data/spec/kumogata_convert_spec.rb

@@ -94,7 +94,7 @@ end
     EOS
   end
 
-  it 'convert Ruby template to JSON template with _join()' do
+  it 'convert Ruby template to JSON template with fn_join()' do
     template = <<-TEMPLATE
 Parameters do
   Password do
@@ -111,7 +111,7 @@ Resources do
       InstanceType "t1.micro"
 
       UserData do
-        Fn__Base64 _join(<<-EOS)
+        Fn__Base64 (<<-EOS).fn_join
           #!/bin/bash
           echo START | logger
           /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
@@ -139,7 +139,7 @@ Resources do
 
           commands do
             any_name do
-              command _join(<<-EOS)
+              command (<<-EOS).fn_join
                 echo <%= Ref "Password" %> > /tmp/my-password
               EOS
             end
@@ -233,7 +233,7 @@ end
     EOS
   end
 
-  it 'convert Ruby template to JSON template with _user_data()' do
+  it 'convert Ruby template to JSON template with converting user_data' do
     template = <<-TEMPLATE
 Parameters do
   Password do
@@ -304,7 +304,7 @@ Resources do
       InstanceType "t1.micro"
 
       UserData do
-        Fn__Base64 _join(<<-EOS)
+        Fn__Base64 (<<-EOS).fn_join
           #!/bin/bash
           echo START | logger
           /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r #{resource_name} --region <%= Ref "AWS::Region" %>
@@ -332,7 +332,7 @@ Resources do
 
           commands do
             any_name do
-              command _join(<<-EOS)
+              command (<<-EOS).fn_join
                 echo <%= Ref "Password" %> > /tmp/my-password
               EOS
             end

metadata

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