kumogata 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODhkMTUzNDVjOWU3YjNjMjNmZjFjMDQ5MDQ1ZGJmOWI5Y2MzMmQ4Ng==
+    MTA0NDRkYThiNzBhNzgwODU4YWUxOTM5ZDNjYjUwMjU2Yzc3OTY0MA==
   data.tar.gz: !binary |-
-    NDRhOWNlNzJiYzRhMTQyZDIwNmNkM2NjMTZiNTY0YmM3MTNlOWJmYg==
+    NzJmZjYzZTI2NDg0OGFkN2M2NTZiZWNkOTA0ZmZmYWVkODkwMDU5Zg==
 SHA512:
   metadata.gz: !binary |-
-    MjM3OWIzZTBjOWY3MjZlNzhmYWVjYTU4MmE1ODYxNGQ1NGVhM2ZkODhkNDQz
-    YjUyZmU1N2I1NWQ0NmVkZjE4MTJjYmRmYmYyMGM2ODA2MTNiYzgxOGMzMTQ0
-    NzFhZjhjZGU3NmI0M2MxMjViNmMzZjdiZmVlNzY0MzczNjBmMWI=
+    ZjY5YTYzMDliYTkwNTJhNzdkMmY4MDgwY2E0NTJiMDEwOTUxMzliNDNiZjBh
+    ZmMxOTA2OWM2ZjI1MWVjOWYxOGRlNTAwMmIwNWZjNjNhNmZiMGU1Nzg0N2Ux
+    ODZiOTBjOWVlY2VlNjQyYjZiZjgyZTBjZDhjZDYwZWZhY2E4M2Q=
   data.tar.gz: !binary |-
-    MzgyMjRmMTIwZjJmZGI1ZjJhMmQ5NjBhYzM5NzNjNTQ0MmJkMjE4NzliYmE0
-    YTRkZGVhMWJhMzUyNDc2NjdkNDdjNzA1NTVjZWJhYjVmMGU4ODhhNWFlZGM5
-    OGUyODE1ODdiNTJiYmUxM2Y3ZmZjYTYyNWE5YTc4M2Q2Yjc3YjU=
+    ZmU3MmY5YjU0YWE4YmY1ZDczNWU1Nzg1NGJiN2Y4ODkyMmE4ZDg0YzBhYzgx
+    OGZkNjM2NzBjOTViZWUzZmI3ZTQwOTYwYTA3ZWZkYmI2YTNjODZlMmU5MmE1
+    MjViMmQ4YTMxNzU4ZWZmOTM1ZTJhYmNjNzE1N2Q4NWJjMTlhNTk=

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?201403031537)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403031537)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![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)
 
 It can define a template in Ruby DSL, such as:
 

data/lib/kumogata/client.rb

@@ -184,8 +184,9 @@ class Kumogata::Client
 
           data = data.map do |item|
             if item.kind_of?(String)
-              item = item.split("\n").map {|i| i.gsub(/\A\s+/, "") }.join("\n")
-              item = " " + item if prev_not_str
+              item = item.split("\n").map {|i|
+                prev_not_str ? i : i.gsub(/\A\s+/, "")
+              }.join("\n")
               prev_not_str = false
               item
             else

data/lib/kumogata/version.rb

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

data/spec/kumogata_convert_spec.rb

@@ -93,4 +93,193 @@ Outputs do
 end
     EOS
   end
+
+  it 'convert Ruby template to JSON template with _join()' do
+    template = <<-TEMPLATE
+Parameters do
+  Password do
+    NoEcho true
+    Type "String"
+  end
+end
+
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+
+      UserData do
+        Fn__Base64 _join(<<-EOS)
+          #!/bin/bash
+          /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r myEC2Instance --region <%= Ref "AWS::Region" %>
+        EOS
+      end
+    end
+
+    Metadata do
+      AWS__CloudFormation__Init do
+        config do
+
+          packages do
+            yum({"httpd"=>[]})
+          end
+
+          services do
+            sysvinit do
+              httpd do
+                enabled "true"
+                ensureRunning "true"
+              end
+            end
+          end
+
+          commands do
+            any_name do
+              command _join(<<-EOS)
+                echo <%= Ref "Password" %> > /tmp/my-password
+              EOS
+            end
+          end
+
+        end # config
+      end # AWS__CloudFormation__Init
+    end # Metadata
+  end
+end
+    TEMPLATE
+
+    json_template = run_client(:convert, :template => template)
+
+    expect(json_template).to eq((<<-'EOS').chomp)
+{
+  "Parameters": {
+    "Password": {
+      "NoEcho": "true",
+      "Type": "String"
+    }
+  },
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro",
+        "UserData": {
+          "Fn::Base64": {
+            "Fn::Join": [
+              "",
+              [
+                "#!/bin/bash\n/opt/aws/bin/cfn-init -s ",
+                {
+                  "Ref": "AWS::StackName"
+                },
+                " -r myEC2Instance --region ",
+                {
+                  "Ref": "AWS::Region"
+                },
+                "\n"
+              ]
+            ]
+          }
+        }
+      },
+      "Metadata": {
+        "AWS::CloudFormation::Init": {
+          "config": {
+            "packages": {
+              "yum": {
+                "httpd": [
+
+                ]
+              }
+            },
+            "services": {
+              "sysvinit": {
+                "httpd": {
+                  "enabled": "true",
+                  "ensureRunning": "true"
+                }
+              }
+            },
+            "commands": {
+              "any_name": {
+                "command": {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "echo ",
+                      {
+                        "Ref": "Password"
+                      },
+                      " > /tmp/my-password",
+                      "\n"
+                    ]
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    EOS
+  end
+
+  it 'convert Ruby template to JSON template with _user_data()' do
+    template = <<-TEMPLATE
+Parameters do
+  Password do
+    NoEcho true
+    Type "String"
+  end
+end
+
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+
+      UserData _user_data(<<-EOS)
+        #!/bin/bash
+        yum install -y httpd
+        services start httpd
+      EOS
+    end
+  end
+end
+    TEMPLATE
+
+    json_template = run_client(:convert, :template => template)
+
+    # UserData: IyEvYmluL2Jhc2gKeXVtIGluc3RhbGwgLXkgaHR0cGQKc2VydmljZXMgc3RhcnQgaHR0cGQK
+    # => #!/bin/bash
+    #    yum install -y httpd
+    #    services start httpd
+    expect(json_template).to eq((<<-EOS).chomp)
+{
+  "Parameters": {
+    "Password": {
+      "NoEcho": "true",
+      "Type": "String"
+    }
+  },
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro",
+        "UserData": "IyEvYmluL2Jhc2gKeXVtIGluc3RhbGwgLXkgaHR0cGQKc2VydmljZXMgc3RhcnQgaHR0cGQK"
+      }
+    }
+  }
+}
+    EOS
+  end
 end

metadata

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