kumogata 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTA0NDRkYThiNzBhNzgwODU4YWUxOTM5ZDNjYjUwMjU2Yzc3OTY0MA==
+    MDNiMDIxYmY2ZWM3MmI4ZDBiMzgwMGI1NjBmYTIxMDE5ZDhhZDliMw==
   data.tar.gz: !binary |-
-    NzJmZjYzZTI2NDg0OGFkN2M2NTZiZWNkOTA0ZmZmYWVkODkwMDU5Zg==
+    NWMzMTI4ZTBmZDczMzRhYmIwZjUxZThmMWVhMzRlYmZiZGFkMTVlZg==
 SHA512:
   metadata.gz: !binary |-
-    ZjY5YTYzMDliYTkwNTJhNzdkMmY4MDgwY2E0NTJiMDEwOTUxMzliNDNiZjBh
-    ZmMxOTA2OWM2ZjI1MWVjOWYxOGRlNTAwMmIwNWZjNjNhNmZiMGU1Nzg0N2Ux
-    ODZiOTBjOWVlY2VlNjQyYjZiZjgyZTBjZDhjZDYwZWZhY2E4M2Q=
+    YWRkMTA5NzMzMzE3M2M5MjNmNzMyOTVjZDU3MWU4YmY2OTQ1YzFiYTlmMzMz
+    ODQzZGIyNzg4ZjQ0MjgzYTIzMzZjYWY2ZWU1MTYyMTMzOGE0Njk0ZWI5N2Y3
+    NjIzMjdkMTc1YTUyZmVjMGZkMzc5MWQ4M2YwMTZlZTgxMDI3NzI=
   data.tar.gz: !binary |-
-    ZmU3MmY5YjU0YWE4YmY1ZDczNWU1Nzg1NGJiN2Y4ODkyMmE4ZDg0YzBhYzgx
-    OGZkNjM2NzBjOTViZWUzZmI3ZTQwOTYwYTA3ZWZkYmI2YTNjODZlMmU5MmE1
-    MjViMmQ4YTMxNzU4ZWZmOTM1ZTJhYmNjNzE1N2Q4NWJjMTlhNTk=
+    ZTAwZDc5MjExNThlM2U1ODJhN2NiNDNlZDRlNzFkMmMyNGVkZjlmNzA4OGU5
+    NjUxNTAyMWVjOGQzYTgwYmUyMTk3YTUwMWEwMzU1YWJlNTliYmE5OWQwODMx
+    N2VmODhiZjRiYTRlNmEzMmVhMzY0NzAyZjg5ZGRhZDZkNzhjNWU=

data/README.md

@@ -1,9 +1,12 @@
 # Kumogata
 
+![Stack is not required!](http://serif.hatelabo.jp/images/cache/a69b56ca6985b6ee7e605a102445953f355f54f5/62192c286da4377e608f3f5a5200f1bec272a92e.gif)
+
+
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403031647)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403031647)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403041709)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403041709)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -124,7 +127,7 @@ Ruby templates will be converted as follows by `_join()`:
 UserData do
   Fn__Base64 _join(<<-EOS)
     #!/bin/bash
-    /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackId" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
+    /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
   EOS
 end
 ```
@@ -136,7 +139,7 @@ end
     [
       "#!/bin/bash\n/opt/aws/bin/cfn-init -s ",
       {
-        "Ref": "AWS::StackId"
+        "Ref": "AWS::StackName"
       },
       " -r myEC2Instance --region ",
       {

data/lib/kumogata/client.rb

@@ -154,7 +154,7 @@ class Kumogata::Client
         }.merge(options)
 
         if options[:strip]
-          data = data.split("\n").map {|i| i.gsub(/\A\s+/, "") }.join("\n") + "\n"
+          data = data.split("\n").map {|i| i.gsub(/\A\s+/, '') }.join("\n") + "\n"
         end
 
         data = data.encode64 if options[:encode]
@@ -180,23 +180,35 @@ class Kumogata::Client
         data = data.flatten.select {|i| not i.nil? }
 
         if options[:strip]
-          prev_not_str = false
+          prev_elem_is_string = true
 
-          data = data.map do |item|
+          data = data.map {|item|
             if item.kind_of?(String)
-              item = item.split("\n").map {|i|
-                prev_not_str ? i : i.gsub(/\A\s+/, "")
-              }.join("\n")
-              prev_not_str = false
-              item
+              new_item = []
+              splited = item.split("\n")
+
+              splited.each_with_index do |i, idx|
+                unless idx.zero? and not prev_elem_is_string
+                  i.gsub!(/\A\s+/, '')
+                end
+
+                if idx < splited.length - 1
+                  i << "\n"
+                end
+
+                new_item << i
+              end
+
+              prev_elem_is_string = true
+              new_item
             else
-              prev_not_str = true
+              prev_elem_is_string = false
               item
             end
-          end
+          }.flatten
         end
 
-        if data.last.kind_of?(String) and data.last.strip == ""
+        if data.last.kind_of?(String) and data.last.strip.empty?
           data.last.replace("\n")
         end
 

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/kumogata_convert_spec.rb

@@ -113,7 +113,9 @@ Resources do
       UserData do
         Fn__Base64 _join(<<-EOS)
           #!/bin/bash
+          echo START | logger
           /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
+          echo END | logger
         EOS
       end
     end
@@ -171,7 +173,9 @@ end
             "Fn::Join": [
               "",
               [
-                "#!/bin/bash\n/opt/aws/bin/cfn-init -s ",
+                "#!/bin/bash\n",
+                "echo START | logger\n",
+                "/opt/aws/bin/cfn-init -s ",
                 {
                   "Ref": "AWS::StackName"
                 },
@@ -179,6 +183,8 @@ end
                 {
                   "Ref": "AWS::Region"
                 },
+                "\n",
+                "echo END | logger",
                 "\n"
               ]
             ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk