kumogata 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGM5NjA4MDkxMGZlOGNlNjZiNGFjZjMwZGU1Mzg5YTg5YWQ5NGEwMQ==
+    MmU2ZWQyYmY3MzE5MzRjOTg2OTczZjllYWRlYTAyZTg3YmZlM2NkZA==
   data.tar.gz: !binary |-
-    ZDY4YmYzOWUzMzcyMzEwNjZlNjNjMzU2MWEzMWJkZWNjN2JmYjcxMA==
+    NjFlZWIzYWYxMjBjODE1YmE3M2ZiYjYxYzdhNjNlYmZkMTRjNTk4OQ==
 SHA512:
   metadata.gz: !binary |-
-    YTgzYzQ4MzA4ZWQyNGNlNmYyZGY1ZjIxODZlNTAxZDIzNDc1ZmVhZmMyYTUw
-    MDBlNjNmOWJkYWQ3OTE1OTNhZDg3NzNkNWU2MWM2MjBlNDM4NDJmNTQxMmNm
-    YmIxY2M1ZTJjNjRiNDFiYTUxOTM2NDUwNGIxZGMxMDYyZGI1ZDM=
+    ZjNmZjViNTc4ZjlmNDlhY2ViYjFjMDNmMmRkY2Q0MGRmNDYyMDkxNjE5ZTlk
+    NDU2MTQ0MzNkMWI5ZDMzNWE5NzIzYmZjNzc1ODQ2YjExMGFhN2Y4M2YzZjc4
+    OTIwYWU2YTc5Njc3MWM3Njc3NTY0YzVmNTllYTI4NzMzMDNjZmE=
   data.tar.gz: !binary |-
-    ZmZjNTEzZDk4ZTU1YzkyZjAwZGVjNDVhNjYyYjU3YzdjYmRiY2U1N2RjN2Iw
-    NjA2NmY4ZjExMmM5MmFhYmQzZjI4NDQ4Mzc2YTQ3MmMxNmFhMDM1ZTVlMGE5
-    M2I1NzgxODlkYzkyY2E0MjdlYmQ2MTFlMGQyNjg4MzAwMTNlODk=
+    ZjRjODY4MWI2MTliN2JlNjhiMzc2OWIzYmE4MzE1NGM4ZGU4YTUyMDlmNTI2
+    YTY3NWNiZGY1YWNhOTE3Y2VkMjA5NmY1MmNmYzY1YmY5NjFkNzgyYjJhNTI1
+    ZGM5ZTU0MDZmZTc5OWU4OGI5ZGEzNGIzNzY4ZmZjZTc3ZTY4ODE=

data/README.md

@@ -2,8 +2,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403031324)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403031324)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403031458)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403031458)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -116,6 +116,38 @@ JSON template can be converted to Ruby template.
 * `_path()` creates Hash that has a key of path
   * `_path("/etc/passwd-s3fs") { content "..." }` => `{"/etc/passwd-s3fs": {"content": "..."}}`
 
+### _joine()
+
+Ruby templates will be converted as follows by `_join()`:
+
+```ruby
+UserData do
+  Fn__Base64 _join(<<-EOS)
+    #!/bin/bash,
+    /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackId" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
+  EOS
+end
+```
+
+```javascript
+"Fn::Base64": {
+  "Fn::Join": [
+    "",
+    [
+      "#!/bin/bash,\n          /opt/aws/bin/cfn-init -s\n",
+      {
+        "Ref": "AWS::StackId"
+      },
+      "-r myEC2Instance --region\n",
+      {
+        "Ref": "AWS::Region"
+      },
+      "\n"
+    ]
+  ]
+}
+```
+
 ## Demo
 
 * Create resources

data/lib/kumogata/client.rb

@@ -146,9 +146,46 @@ class Kumogata::Client
   end
 
   def define_template_func(scope)
-    scope.instance_eval do
-      def _user_data(data)
-        data.strip_lines.encode64
+    scope.instance_eval(<<-'EOS')
+      def _user_data(data, options = {})
+        options = {
+          :encode => true,
+          :strip  => true,
+        }.merge(options)
+
+        data = data.strip_lines + "\n" if options[:strip]
+        data = data.encode64 if options[:encode]
+        return data
+      end
+
+      def _join(data, options = {})
+        options = {
+          :strip  => true,
+          :trim_mode => nil,
+        }.merge(options)
+
+
+        @__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? }
+
+        unless data.last.kind_of?(String) and data.last =~ /\n\Z/
+          data << "\n"
+        end
+
+        if options[:strip]
+          data = data.map {|i| i.kind_of?(String) ? i.strip + "\n" : i }
+        end
+
+        return {
+          "Fn::Join" => ["", data]
+        }
       end
 
       def _path(path, value = nil, &block)
@@ -158,7 +195,7 @@ class Kumogata::Client
 
         @__hash__[path] = value
       end
-    end
+    EOS
   end
 
   def create_stack(template, stack_name)

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

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