kumogata 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU2ZWQyYmY3MzE5MzRjOTg2OTczZjllYWRlYTAyZTg3YmZlM2NkZA==
+    YWVlZDU1MjQ3Y2Y3NDk1Nzg5YmRiZTZjN2NkZjAyODY2NWNmY2NjYg==
   data.tar.gz: !binary |-
-    NjFlZWIzYWYxMjBjODE1YmE3M2ZiYjYxYzdhNjNlYmZkMTRjNTk4OQ==
+    MjBkOWE5MjJhZTRkY2I0MjExMTc0ODY3NGYzY2M5MGRhOTg4ZjQzOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjNmZjViNTc4ZjlmNDlhY2ViYjFjMDNmMmRkY2Q0MGRmNDYyMDkxNjE5ZTlk
-    NDU2MTQ0MzNkMWI5ZDMzNWE5NzIzYmZjNzc1ODQ2YjExMGFhN2Y4M2YzZjc4
-    OTIwYWU2YTc5Njc3MWM3Njc3NTY0YzVmNTllYTI4NzMzMDNjZmE=
+    NWNlZjUyZGRlNzJmYjc1MGFiYmU2M2U1ZDMwYTQyZGU5MzAwOWNjYTNlYmNi
+    MTRmOGIwOTk3OGM2OTIxOTRjYmVmOWUwZWY2MWU4NDVhMDQ3NjlhZWYzZjVh
+    MDU2NTM2ZGYwNjEwZGZiNzRiM2NhZjMyYmZhNjlhYmQ5NTM3YTc=
   data.tar.gz: !binary |-
-    ZjRjODY4MWI2MTliN2JlNjhiMzc2OWIzYmE4MzE1NGM4ZGU4YTUyMDlmNTI2
-    YTY3NWNiZGY1YWNhOTE3Y2VkMjA5NmY1MmNmYzY1YmY5NjFkNzgyYjJhNTI1
-    ZGM5ZTU0MDZmZTc5OWU4OGI5ZGEzNGIzNzY4ZmZjZTc3ZTY4ODE=
+    YjEwYzI0Zjc5ZGZlNDA4ZmI5Yzc0ZWVjMGE3Y2FkNmJjZmY0MGMwZGMwOGJj
+    MmY2ZDdhNGM3MmQwZTY0ZTFlMDI5NzE4OTJiNjBkZjlmNzY0YTY3N2Y2ZmMx
+    YzhkOWQ2ZDFkNzBlNTlmZDNiMzUxNzJiMmJlNWU1OTk4Yzk3MDM=

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?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)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403031512)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403031512)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 
@@ -123,7 +123,7 @@ Ruby templates will be converted as follows by `_join()`:
 ```ruby
 UserData do
   Fn__Base64 _join(<<-EOS)
-    #!/bin/bash,
+    #!/bin/bash
     /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackId" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
   EOS
 end
@@ -134,11 +134,11 @@ end
   "Fn::Join": [
     "",
     [
-      "#!/bin/bash,\n          /opt/aws/bin/cfn-init -s\n",
+      "#!/bin/bash\n/opt/aws/bin/cfn-init -s ",
       {
         "Ref": "AWS::StackId"
       },
-      "-r myEC2Instance --region\n",
+      "-r myEC2Instance --region ",
       {
         "Ref": "AWS::Region"
       },

data/lib/kumogata/client.rb

@@ -153,8 +153,12 @@ class Kumogata::Client
           :strip  => true,
         }.merge(options)
 
-        data = data.strip_lines + "\n" if options[:strip]
+        if options[:strip]
+          data = data.split("\n").map {|i| i.gsub(/\A\s+/, "") }.join("\n") + "\n"
+        end
+
         data = data.encode64 if options[:encode]
+
         return data
       end
 
@@ -175,12 +179,22 @@ class Kumogata::Client
 
         data = data.flatten.select {|i| not i.nil? }
 
-        unless data.last.kind_of?(String) and data.last =~ /\n\Z/
-          data << "\n"
+        if options[:strip]
+          data = data.map do |item|
+            if item.kind_of?(String)
+              item.split("\n").map {|i| i.gsub(/\A\s+/, "") }.join("\n")
+            else
+              item
+            end
+          end
         end
 
-        if options[:strip]
-          data = data.map {|i| i.kind_of?(String) ? i.strip + "\n" : i }
+        if data.last.kind_of?(String) and data.last == ""
+          data.last << "\n"
+        end
+
+        unless data.last.kind_of?(String) and data.last =~ /\n\Z/
+          data << "\n"
         end
 
         return {

data/lib/kumogata/ext/string_ext.rb

@@ -34,8 +34,4 @@ class String
   def encode64
     Base64.encode64(self).delete("\n")
   end
-
-  def strip_lines
-    self.strip.split("\n").map {|i| i.strip }.join("\n")
-  end
 end

data/lib/kumogata/version.rb

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

metadata

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