kumogata 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDNiMDIxYmY2ZWM3MmI4ZDBiMzgwMGI1NjBmYTIxMDE5ZDhhZDliMw==
-  data.tar.gz: !binary |-
-    NWMzMTI4ZTBmZDczMzRhYmIwZjUxZThmMWVhMzRlYmZiZGFkMTVlZg==
+SHA1:
+  metadata.gz: 6b7300b43907200cf152f62177d203af6a1771c9
+  data.tar.gz: e94419046f5079f0e4b229664dd1e4ddd7772fb9
 SHA512:
-  metadata.gz: !binary |-
-    YWRkMTA5NzMzMzE3M2M5MjNmNzMyOTVjZDU3MWU4YmY2OTQ1YzFiYTlmMzMz
-    ODQzZGIyNzg4ZjQ0MjgzYTIzMzZjYWY2ZWU1MTYyMTMzOGE0Njk0ZWI5N2Y3
-    NjIzMjdkMTc1YTUyZmVjMGZkMzc5MWQ4M2YwMTZlZTgxMDI3NzI=
-  data.tar.gz: !binary |-
-    ZTAwZDc5MjExNThlM2U1ODJhN2NiNDNlZDRlNzFkMmMyNGVkZjlmNzA4OGU5
-    NjUxNTAyMWVjOGQzYTgwYmUyMTk3YTUwMWEwMzU1YWJlNTliYmE5OWQwODMx
-    N2VmODhiZjRiYTRlNmEzMmVhMzY0NzAyZjg5ZGRhZDZkNzhjNWU=
+  metadata.gz: b8e8307dc2eb200b708bd7f70b68f8cc1b66f2dea90612b690f73b792ef2f214ddeec221f96c5bcc622e4f1b5288a16379aca133c316885a30130a7f1eda4102
+  data.tar.gz: d0b5242a7b7d944ba0f4867f257cecbf7bb28f1a1853266f48a8a32f3c934ee34fb544b93a5f6b6e02ce28b98b0df3bfa787f63d5b38b455575932aed882d4ca

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?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)
+[![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)
 
 It can define a template in Ruby DSL, such as:
 
@@ -27,7 +27,7 @@ Resources do
       InstanceType { Ref "InstanceType" }
       KeyName "your_key_name"
 
-      UserData _user_data(<<-EOS)
+      UserData (<<-EOS).undent.encode64
         #!/bin/bash
         yum install -y httpd
         service httpd start
@@ -115,7 +115,8 @@ 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() 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": "..."}}`
 
@@ -133,21 +134,24 @@ end
 ```
 
 ```javascript
-"Fn::Base64": {
-  "Fn::Join": [
-    "",
-    [
-      "#!/bin/bash\n/opt/aws/bin/cfn-init -s ",
-      {
-        "Ref": "AWS::StackName"
-      },
-      " -r myEC2Instance --region ",
-      {
-        "Ref": "AWS::Region"
-      },
-      "\n"
+"UserData": {
+  "Fn::Base64": {
+    "Fn::Join": [
+      "",
+      [
+        "#!/bin/bash\n",
+        "/opt/aws/bin/cfn-init -s ",
+        {
+          "Ref": "AWS::StackName"
+        },
+        " -r myEC2Instance --region ",
+        {
+          "Ref": "AWS::Region"
+        },
+        "\n"
+      ]
     ]
-  ]
+  }
 }
 ```
 

data/kumogata.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk'
-  spec.add_dependency 'dslh', '>= 0.2.2'
+  spec.add_dependency 'dslh', '>= 0.2.3'
   spec.add_dependency 'hashie'
   spec.add_dependency 'highline'
   spec.add_dependency 'json'

data/lib/kumogata.rb

@@ -11,6 +11,7 @@ require 'logger'
 require 'open-uri'
 require 'optparse'
 require 'singleton'
+require 'stringio'
 require 'uuidtools'
 
 require 'kumogata/argument_parser'

data/lib/kumogata/client.rb

@@ -147,27 +147,13 @@ class Kumogata::Client
 
   def define_template_func(scope)
     scope.instance_eval(<<-'EOS')
-      def _user_data(data, options = {})
-        options = {
-          :encode => true,
-          :strip  => true,
-        }.merge(options)
-
-        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
-
       def _join(data, options = {})
         options = {
-          :strip  => true,
+          :undent    => true,
           :trim_mode => nil,
         }.merge(options)
 
+        data = data.undent if options[:undent]
 
         @__refs__ = []
         def Ref(value); @__refs__ << {"Ref" => value}; "\0"; end
@@ -177,47 +163,16 @@ class Kumogata::Client
         data = data.split("\0").zip(@__refs__)
         @__refs__ = nil
 
-        data = data.flatten.select {|i| not i.nil? }
-
-        if options[:strip]
-          prev_elem_is_string = true
-
-          data = data.map {|item|
-            if item.kind_of?(String)
-              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_elem_is_string = false
-              item
-            end
-          }.flatten
-        end
-
-        if data.last.kind_of?(String) and data.last.strip.empty?
-          data.last.replace("\n")
-        end
-
-        unless data.last.kind_of?(String) and data.last =~ /\n\Z/
-          data << "\n"
-        end
+        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]
+          'Fn::Join' => ['', data]
         }
       end
 
@@ -409,7 +364,11 @@ class Kumogata::Client
         :resource_status_reason,
         :last_updated_timestamp
       ].each do |k|
-        summary_hash[k.to_s.camelcase] = summary[k]
+        camelcase = k.to_s.split(/[-_]/).map {|i|
+          i[0, 1].upcase + i[1..-1].downcase
+        }.join
+
+        summary_hash[camelcase] = summary[k]
       end
 
       summary_hash

data/lib/kumogata/ext/string_ext.rb

@@ -25,13 +25,12 @@ class String
     EOS
   end
 
-  def camelcase
-    self.split(/[-_]/).map {|str|
-      str[0, 1].upcase + str[1..-1].downcase
-    }.join
-  end
-
   def encode64
     Base64.encode64(self).delete("\n")
   end
+
+  def undent
+    min_space_num = self.split("\n").delete_if{|s| s=~ /^\s*$/ }.map{|s| s[/^\s+/].length }.min
+    gsub(/^[ \t]{,#{min_space_num}}/, '')
+  end
 end

data/lib/kumogata/version.rb

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

data/spec/kumogata_convert_spec.rb

@@ -184,8 +184,7 @@ end
                   "Ref": "AWS::Region"
                 },
                 "\n",
-                "echo END | logger",
-                "\n"
+                "echo END | logger\n"
               ]
             ]
           }
@@ -219,8 +218,7 @@ end
                       {
                         "Ref": "Password"
                       },
-                      " > /tmp/my-password",
-                      "\n"
+                      " > /tmp/my-password\n"
                     ]
                   ]
                 }
@@ -251,7 +249,7 @@ Resources do
       ImageId "ami-XXXXXXXX"
       InstanceType "t1.micro"
 
-      UserData _user_data(<<-EOS)
+      UserData (<<-EOS).undent.encode64
         #!/bin/bash
         yum install -y httpd
         services start httpd
@@ -285,6 +283,145 @@ end
       }
     }
   }
+}
+    EOS
+  end
+
+  it 'convert Ruby template to JSON template with block args' do
+    template = <<-'TEMPLATE'
+Parameters do
+  Password do
+    NoEcho true
+    Type "String"
+  end
+end
+
+Resources do
+  myEC2Instance do |resource_name|
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+
+      UserData do
+        Fn__Base64 _join(<<-EOS)
+          #!/bin/bash
+          echo START | logger
+          /opt/aws/bin/cfn-init -s <%= Ref "AWS::StackName" %> -r #{resource_name} --region <%= Ref "AWS::Region" %>
+          echo END | logger
+        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",
+                "echo START | logger\n",
+                "/opt/aws/bin/cfn-init -s ",
+                {
+                  "Ref": "AWS::StackName"
+                },
+                " -r myEC2Instance --region ",
+                {
+                  "Ref": "AWS::Region"
+                },
+                "\n",
+                "echo END | logger\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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,140 +14,140 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dslh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: A tool for AWS CloudFormation. It can define a template in Ruby DSL.
@@ -194,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A tool for AWS CloudFormation.
@@ -219,3 +219,4 @@ test_files:
 - spec/kumogata_update_spec.rb
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
+has_rdoc: