kumogata 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae80fe8d0ad7f732542d8cef0073b9874ed71f8
-  data.tar.gz: d3fae446f4ea8d63b6767b1e2428c0d505709ae8
+  metadata.gz: 6798b24b8bfe85192d54fbb5433737c03265191b
+  data.tar.gz: 63dbd0ccd0856dd8354ce843d1b02ca17a69e039
 SHA512:
-  metadata.gz: ef951fce6ac3edc1419723eeb65783ebc85248f5d2bdcb0b60dba8e78f91dd180ff475c374f589a0a832eba2f6fdfd7fbaa814f57229cea0e36aa5907f35f4fb
-  data.tar.gz: 8d7d1efb50beb83a314703c4886170ea37f4ea767611b9fd4af5be44dacd7ddec9b7730c65fb8539b31b6f6a37f9a00253e2ed8fde314437e3f8a096db3f090a
+  metadata.gz: efd7342e7234b10fee55e612138df45583ae6f2abd9d980eaf9bc50cf57518d69721ee733de392dd702598079b5cdcb7f4026906b5ec125e21a9439c14ea535c
+  data.tar.gz: 3bd3310aa41fbd02d5800cb0066bc9a9c4ec9560f1618323725c756d3527ce30e0def5d13e04bee829c8844c304bb2e21084b13670caa8f9847874bed68ad812

data/README.md

@@ -337,6 +337,46 @@ Status: 0
 (Save to `/foo/bar/command_result.json`)
 ```
 
+## YAML template
+
+```yaml
+---
+Resources:
+  myEC2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      ImageId: ami-XXXXXXXX
+      InstanceType: t1.micro
+Outputs:
+  AZ:
+    Value:
+      Fn::GetAtt:
+      - myEC2Instance
+      - AvailabilityZone
+
+# {
+#   "Resources": {
+#     "myEC2Instance": {
+#       "Type": "AWS::EC2::Instance",
+#       "Properties": {
+#         "ImageId": "ami-XXXXXXXX",
+#         "InstanceType": "t1.micro"
+#       }
+#     }
+#   },
+#   "Outputs": {
+#     "AZ": {
+#       "Value": {
+#         "Fn::GetAtt": [
+#           "myEC2Instance",
+#           "AvailabilityZone"
+#         ]
+#       }
+#     }
+#   }
+# }
+```
+
 ## Demo
 
 * Create resources

data/bin/kumogata

@@ -35,7 +35,7 @@ begin
   # See http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html
   if File.exist?(AWSConfig.config_file)
     unless AWSConfig.has_profile?(options.config_profile)
-      raise "No profile : #{AWSConfig.config_file} => #{options.config_profile}"
+      raise "No profile: #{AWSConfig.config_file} => #{options.config_profile}"
     end
 
     {

data/lib/kumogata/argument_parser.rb

@@ -81,29 +81,31 @@ class Kumogata::ArgumentParser
       update_usage(opt)
 
       begin
-        opt.on('-k', '--access-key ACCESS_KEY')                 {|v| options[:access_key_id]                 = v     }
-        opt.on('-s', '--secret-key SECRET_KEY')                 {|v| options[:secret_access_key]             = v     }
-        opt.on('-r', '--region REGION')                         {|v| options[:region]                        = v     }
-        opt.on(''  , '--config PATH')                           {|v| options[:config_path]                   = v     }
-        opt.on(''  , '--profile CONFIG_PROFILE')                {|v| options[:config_profile]                = v     }
-        opt.on(''  , '--format TMPLATE_FORMAT', [:ruby, :json]) {|v| options[:format]                        = v     }
-        opt.on(''  , '--skip-replace-underscore')               {    options[:skip_replace_underscore]       = false }
-        opt.on(''  , '--deletion-policy-retain')                {    options[:deletion_policy_retain]        = true  }
-        opt.on('-p', '--parameters KEY_VALUES', Array)          {|v| options[:parameters]                    = v     }
-        opt.on('-e', '--encrypt-parameters KEYS', Array)        {|v| options[:encrypt_parameters]            = v     }
-        opt.on('',   '--encryption-password PASS')              {|v| options[:encryption_password]           = v     }
-        opt.on('',   '--skip-send-password')                    {    options[:skip_send_password] = true  }
-        opt.on(''  , '--capabilities CAPABILITIES', Array)      {|v| options[:capabilities]                  = v     }
-        opt.on(''  , '--disable-rollback')                      {    options[:disable_rollback]              = true  }
-        opt.on(''  , '--notify SNS_TOPICS', Array)              {|v| options[:notify]                        = v     }
-        opt.on(''  , '--timeout MINUTES', Integer)              {|v| options[:timeout]                       = v     }
-        opt.on(''  , '--result-log PATH')                       {|v| options[:result_log]                    = v     }
-        opt.on(''  , '--command-result-log PATH')               {|v| options[:command]                       = v     }
-        opt.on(''  , '--force')                                 {    options[:force]                         = true  }
-        opt.on('-w', '--ignore-all-space')                      {    options[:ignore_all_space]              = true  }
-        opt.on(''  , '--color')                                 {    options[:color]                         = true  }
-        opt.on(''  , '--no-color')                              {    options[:color]                         = false }
-        opt.on(''  , '--debug')                                 {    options[:debug]                         = true  }
+        supported_formats = [:ruby, :json, :yaml]
+        opt.on('-k', '--access-key ACCESS_KEY')                          {|v| options[:access_key_id]                 = v     }
+        opt.on('-s', '--secret-key SECRET_KEY')                          {|v| options[:secret_access_key]             = v     }
+        opt.on('-r', '--region REGION')                                  {|v| options[:region]                        = v     }
+        opt.on(''  , '--config PATH')                                    {|v| options[:config_path]                   = v     }
+        opt.on(''  , '--profile CONFIG_PROFILE')                         {|v| options[:config_profile]                = v     }
+        opt.on(''  , '--format TMPLATE_FORMAT', supported_formats)       {|v| options[:format]                        = v     }
+        opt.on(''  , '--output-format OUTPUT_FORMAT', supported_formats) {|v| options[:output_format]                 = v     }
+        opt.on(''  , '--skip-replace-underscore')                        {    options[:skip_replace_underscore]       = false }
+        opt.on(''  , '--deletion-policy-retain')                         {    options[:deletion_policy_retain]        = true  }
+        opt.on('-p', '--parameters KEY_VALUES', Array)                   {|v| options[:parameters]                    = v     }
+        opt.on('-e', '--encrypt-parameters KEYS', Array)                 {|v| options[:encrypt_parameters]            = v     }
+        opt.on('',   '--encryption-password PASS')                       {|v| options[:encryption_password]           = v     }
+        opt.on('',   '--skip-send-password')                             {    options[:skip_send_password]            = true  }
+        opt.on(''  , '--capabilities CAPABILITIES', Array)               {|v| options[:capabilities]                  = v     }
+        opt.on(''  , '--disable-rollback')                               {    options[:disable_rollback]              = true  }
+        opt.on(''  , '--notify SNS_TOPICS', Array)                       {|v| options[:notify]                        = v     }
+        opt.on(''  , '--timeout MINUTES', Integer)                       {|v| options[:timeout]                       = v     }
+        opt.on(''  , '--result-log PATH')                                {|v| options[:result_log]                    = v     }
+        opt.on(''  , '--command-result-log PATH')                        {|v| options[:command]                       = v     }
+        opt.on(''  , '--force')                                          {    options[:force]                         = true  }
+        opt.on('-w', '--ignore-all-space')                               {    options[:ignore_all_space]              = true  }
+        opt.on(''  , '--color')                                          {    options[:color]                         = true  }
+        opt.on(''  , '--no-color')                                       {    options[:color]                         = false }
+        opt.on(''  , '--debug')                                          {    options[:debug]                         = true  }
         opt.parse!
 
         unless (command = ARGV.shift)

data/lib/kumogata/client.rb

@@ -29,11 +29,23 @@ class Kumogata::Client
 
   def convert(path_or_url)
     template = open_template(path_or_url)
+    output_format = @options.output_format
 
-    if ruby_template?(path_or_url)
-      JSON.pretty_generate(template).colorize_as(:json)
-    else
+    unless output_format
+      output_format = case guess_format(path_or_url)
+                      when :ruby then :json
+                      when :json then :ruby
+                      when :yaml then :json
+                      end
+    end
+
+    case output_format
+    when :ruby
       devaluate_template(template).chomp.colorize_as(:ruby)
+    when :json
+      JSON.pretty_generate(template).colorize_as(:json)
+    when :yaml
+      YAML.dump(template).colorize_as(:yaml)
     end
   end
 
@@ -131,7 +143,7 @@ class Kumogata::Client
   private ###########################################################
 
   def open_template(path_or_url)
-    format = @options.format || (ruby_template?(path_or_url) ? :ruby : :json)
+    format = @options.format || guess_format(path_or_url)
 
     open(path_or_url) do |f|
       case format
@@ -139,14 +151,26 @@ class Kumogata::Client
         evaluate_template(f, path_or_url)
       when :json
         JSON.parse(f.read)
+      when :yaml
+        parsed = YAML.load(f.read)
+        Kumogata::Utils.stringify(parsed)
       else
         raise "Unknown format: #{format}"
       end
     end
   end
 
-  def ruby_template?(path_or_url)
-    File.extname(path_or_url) == '.rb'
+  def guess_format(path_or_url)
+    case File.extname(path_or_url)
+    when '.rb'
+      :ruby
+    when '.json', '.js'
+      :json
+    when '.yml', '.yaml'
+      :yaml
+    else
+      :json
+    end
   end
 
   def evaluate_template(template, path_or_url)

data/lib/kumogata/ext/coderay_ext.rb

@@ -16,3 +16,5 @@ CodeRay::Encoders::Terminal::TOKEN_COLORS[:string] = {
   :delimiter => "\e[1;32m",
   :escape => "\e[1;32m",
 }
+
+CodeRay::Encoders::Terminal::TOKEN_COLORS[:error] = "\e[0m"

data/lib/kumogata/utils.rb

@@ -37,6 +37,19 @@ class Kumogata::Utils
         not filter_path.any? {|i| i =~ path }
       end
     end
+
+    def stringify(obj)
+      case obj
+      when Array
+        obj.map {|i| stringify(i) }
+      when Hash
+        hash = {}
+        obj.each {|k, v| hash[stringify(k)] = stringify(v) }
+        hash
+      else
+        obj.to_s
+      end
+    end
   end # of class methods
 end
 

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

data/lib/kumogata.rb

@@ -23,6 +23,7 @@ require 'strscan'
 require 'term/ansicolor'
 require 'thread'
 require 'uuidtools'
+require 'yaml'
 
 require 'kumogata/client'
 require 'kumogata/crypt'

data/spec/Drupal_Single_Instance.template.yml

@@ -0,0 +1,301 @@
+---
+AWSTemplateFormatVersion: '2010-09-09'
+Description: |
+  AWS CloudFormation Sample Template Drupal_Single_Instance.
+   Drupal is an open source content management platform powering millions of websites and applications.
+   This template installs a singe instance deployment with a local MySQL database for storage.
+   It uses the AWS CloudFormation bootstrap scripts to install packages and files at instance launch time.
+
+   **WARNING**
+   This template creates an Amazon EC2 instance.
+   You will be billed for the AWS resources used if you create a stack from this template.
+Parameters:
+  KeyName:
+    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+    Type: String
+    MinLength: 1
+    MaxLength: 255
+    AllowedPattern: '[\x20-\x7E]*'
+    ConstraintDescription: can contain only ASCII characters.
+  InstanceType:
+    Description: WebServer EC2 instance type
+    Type: String
+    Default: m1.small
+    AllowedValues:
+    - t1.micro
+    - m1.small
+    - m1.medium
+    - m1.large
+    - m1.xlarge
+    - m2.xlarge
+    - m2.2xlarge
+    - m2.4xlarge
+    - m3.xlarge
+    - m3.2xlarge
+    - c1.medium
+    - c1.xlarge
+    - cc1.4xlarge
+    - cc2.8xlarge
+    - cg1.4xlarge
+    ConstraintDescription: must be a valid EC2 instance type.
+  SiteName:
+    Default: My Site
+    Description: The name of the Drupal Site
+    Type: String
+  SiteEMail:
+    Description: EMail for site adminitrator
+    Type: String
+  SiteAdmin:
+    Description: The Drupal site admin account username
+    Type: String
+    MinLength: 1
+    MaxLength: 16
+    AllowedPattern: '[a-zA-Z][a-zA-Z0-9]*'
+    ConstraintDescription: must begin with a letter and contain only alphanumeric characters.
+  SitePassword:
+    NoEcho: 'true'
+    Description: The Drupal site admin account password
+    Type: String
+    MinLength: 1
+    MaxLength: 41
+    AllowedPattern: '[a-zA-Z0-9]*'
+    ConstraintDescription: must contain only alphanumeric characters.
+  DBName:
+    Default: drupaldb
+    Description: The Drupal database name
+    Type: String
+    MinLength: 1
+    MaxLength: 64
+    AllowedPattern: '[a-zA-Z][a-zA-Z0-9]*'
+    ConstraintDescription: must begin with a letter and contain only alphanumeric characters.
+  DBUsername:
+    Default: admin
+    NoEcho: 'true'
+    Description: The Drupal database admin account username
+    Type: String
+    MinLength: 1
+    MaxLength: 16
+    AllowedPattern: '[a-zA-Z][a-zA-Z0-9]*'
+    ConstraintDescription: must begin with a letter and contain only alphanumeric characters.
+  DBPassword:
+    Default: admin
+    NoEcho: 'true'
+    Description: The Drupal database admin account password
+    Type: String
+    MinLength: 1
+    MaxLength: 41
+    AllowedPattern: '[a-zA-Z0-9]*'
+    ConstraintDescription: must contain only alphanumeric characters.
+  DBRootPassword:
+    NoEcho: 'true'
+    Description: Root password for MySQL
+    Type: String
+    MinLength: 1
+    MaxLength: 41
+    AllowedPattern: '[a-zA-Z0-9]*'
+    ConstraintDescription: must contain only alphanumeric characters.
+  SSHLocation:
+    Description: The IP address range that can be used to SSH to the EC2 instances
+    Type: String
+    MinLength: 9
+    MaxLength: 18
+    Default: 0.0.0.0/0
+    AllowedPattern: (\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})
+    ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
+Mappings:
+  AWSInstanceType2Arch:
+    t1.micro:
+      Arch: 64
+    m1.small:
+      Arch: 64
+    m1.medium:
+      Arch: 64
+    m1.large:
+      Arch: 64
+    m1.xlarge:
+      Arch: 64
+    m2.xlarge:
+      Arch: 64
+    m2.2xlarge:
+      Arch: 64
+    m2.4xlarge:
+      Arch: 64
+    m3.xlarge:
+      Arch: 64
+    m3.2xlarge:
+      Arch: 64
+    c1.medium:
+      Arch: 64
+    c1.xlarge:
+      Arch: 64
+    cc1.4xlarge:
+      Arch: 64HVM
+    cc2.8xlarge:
+      Arch: 64HVM
+    cg1.4xlarge:
+      Arch: 64HVM
+  AWSRegionArch2AMI:
+    us-east-1:
+      32: ami-a0cd60c9
+      64: ami-aecd60c7
+      64HVM: ami-a8cd60c1
+    us-west-2:
+      32: ami-46da5576
+      64: ami-48da5578
+      64HVM: NOT_YET_SUPPORTED
+    us-west-1:
+      32: ami-7d4c6938
+      64: ami-734c6936
+      64HVM: NOT_YET_SUPPORTED
+    eu-west-1:
+      32: ami-61555115
+      64: ami-6d555119
+      64HVM: ami-67555113
+    ap-southeast-1:
+      32: ami-220b4a70
+      64: ami-3c0b4a6e
+      64HVM: NOT_YET_SUPPORTED
+    ap-southeast-2:
+      32: ami-b3990e89
+      64: ami-bd990e87
+      64HVM: NOT_YET_SUPPORTED
+    ap-northeast-1:
+      32: ami-2a19aa2b
+      64: ami-2819aa29
+      64HVM: NOT_YET_SUPPORTED
+    sa-east-1:
+      32: ami-f836e8e5
+      64: ami-fe36e8e3
+      64HVM: NOT_YET_SUPPORTED
+Resources:
+  WebServer:
+    Type: AWS::EC2::Instance
+    Metadata:
+      AWS::CloudFormation::Init:
+        config:
+          packages:
+            yum:
+              httpd: []
+              php: []
+              php-mysql: []
+              php-gd: []
+              php-xml: []
+              php-mbstring: []
+              mysql: []
+              mysql-server: []
+              mysql-devel: []
+              mysql-libs: []
+          sources:
+            /var/www/html: http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz
+            /home/ec2-user: http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz
+          files:
+            /tmp/setup.mysql:
+              content:
+                Fn::Join:
+                - ''
+                - [ "CREATE DATABASE ", { Ref: DBName }, ";\n",
+                    "CREATE USER '", { Ref: DBUsername }, "'@'localhost' IDENTIFIED BY '", { Ref: DBPassword }, "';\n",
+                    "GRANT ALL ON ", { Ref: DBName }, ".* TO '", { Ref: DBUsername }, "'@'localhost';\n",
+                    "FLUSH PRIVILEGES;\n" ]
+              mode: '000644'
+              owner: root
+              group: root
+          services:
+            sysvinit:
+              httpd:
+                enabled: 'true'
+                ensureRunning: 'true'
+              mysqld:
+                enabled: 'true'
+                ensureRunning: 'true'
+              sendmail:
+                enabled: 'false'
+                ensureRunning: 'false'
+    Properties:
+      ImageId:
+        Fn::FindInMap:
+        - AWSRegionArch2AMI
+        - Ref: AWS::Region
+        - Fn::FindInMap:
+          - AWSInstanceType2Arch
+          - Ref: InstanceType
+          - Arch
+      InstanceType:
+        Ref: InstanceType
+      SecurityGroups:
+      - Ref: WebServerSecurityGroup
+      KeyName:
+        Ref: KeyName
+      UserData:
+        Fn::Base64:
+          Fn::Join:
+          - ''
+          - [ "#!/bin/bash -v\n",
+              "yum update -y aws-cfn-bootstrap\n",
+
+
+              "# Helper function\n",
+              "function error_exit\n",
+              "{\n",
+              "  /opt/aws/bin/cfn-signal -e 0 -r \"$1\" '", { Ref: WaitHandle }, "'\n",
+              "  exit 1\n",
+              "}\n",
+              "# Install Apache Web Server, MySQL, PHP and Drupal\n",
+              "/opt/aws/bin/cfn-init -s ", { Ref: "AWS::StackId" }, " -r WebServer --region ", { Ref: "AWS::Region" }, " || error_exit 'Failed to run cfn-init'\n",
+
+              "# Setup MySQL root password and create a user\n",
+              "mysqladmin -u root password '", { Ref: DBRootPassword }, "' || error_exit 'Failed to initialize root password'\n",
+              "mysql -u root --password='", { Ref: DBRootPassword }, "' < /tmp/setup.mysql || error_exit 'Failed to create database user'\n",
+
+              "# Make changes to Apache Web Server configuration\n",
+              "mv /var/www/html/drupal-7.8/* /var/www/html\n",
+              "mv /var/www/html/drupal-7.8/.* /var/www/html\n",
+              "rmdir /var/www/html/drupal-7.8\n",
+              "sed -i 's/AllowOverride None/AllowOverride All/g'  /etc/httpd/conf/httpd.conf\n",
+              "service httpd restart\n",
+
+              "# Create the site in Drupal\n",
+              "cd /var/www/html\n",
+              "~ec2-user/drush/drush site-install standard --yes --site-name='", { Ref: SiteName },
+              "' --site-mail=", { Ref: SiteEMail },
+              " --account-name=",  { Ref: SiteAdmin },
+              " --account-pass=", { Ref: SitePassword },
+              " --db-url=mysql://", { Ref: DBUsername }, ":",  { Ref: DBPassword }, "@localhost/", { Ref: DBName },
+              " --db-prefix=drupal_\n",
+              "chown apache:apache sites/default/files\n",
+
+              "# All is well so signal success\n",
+              "/opt/aws/bin/cfn-signal -e 0 -r \"Drupal setup complete\" '", { Ref: WaitHandle }, "'\n" ]
+  WaitHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+  WaitCondition:
+    Type: AWS::CloudFormation::WaitCondition
+    DependsOn: WebServer
+    Properties:
+      Handle:
+        Ref: WaitHandle
+      Timeout: 300
+  WebServerSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Enable HTTP access via port 80 and SSH access
+      SecurityGroupIngress:
+      - IpProtocol: tcp
+        FromPort: 80
+        ToPort: 80
+        CidrIp: 0.0.0.0/0
+      - IpProtocol: tcp
+        FromPort: 22
+        ToPort: 22
+        CidrIp:
+          Ref: SSHLocation
+Outputs:
+  WebsiteURL:
+    Value:
+      Fn::Join:
+      - ''
+      - - http://
+        - Fn::GetAtt:
+          - WebServer
+          - PublicDnsName
+    Description: Drupal Website

data/spec/kumogata_convert_spec.rb

@@ -47,14 +47,137 @@ end
     EOS
   end
 
-  it 'convert Ruby template to JSON template' do
+  it 'convert Ruby template to YAML template' do
+    template = <<-EOS
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+
+    json_template = run_client(:convert, :template => template, :options => {:output_format => :yaml})
+
+    expect(json_template).to eq((<<-EOS))
+---
+Resources:
+  myEC2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      ImageId: ami-XXXXXXXX
+      InstanceType: t1.micro
+Outputs:
+  AZ:
+    Value:
+      Fn::GetAtt:
+      - myEC2Instance
+      - AvailabilityZone
+    EOS
+  end
+
+  it 'convert YAML template to Ruby template' do
+    template = <<-EOS
+---
+Resources:
+  myEC2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      ImageId: ami-XXXXXXXX
+      InstanceType: t1.micro
+Outputs:
+  AZ:
+    Value:
+      Fn::GetAtt:
+      - myEC2Instance
+      - AvailabilityZone
+    EOS
+
+    ruby_template = run_client(:convert, :template => template, :template_ext => '.yml', :options => {:output_format => :ruby})
+
+    expect(ruby_template).to eq((<<-EOS).chomp)
+Resources do
+  myEC2Instance do
+    Type "AWS::EC2::Instance"
+    Properties do
+      ImageId "ami-XXXXXXXX"
+      InstanceType "t1.micro"
+    end
+  end
+end
+Outputs do
+  AZ do
+    Value do
+      Fn__GetAtt "myEC2Instance", "AvailabilityZone"
+    end
+  end
+end
+    EOS
+  end
+
+  it 'convert YAML template to JSON template' do
+    template = <<-EOS
+---
+Resources:
+  myEC2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      ImageId: ami-XXXXXXXX
+      InstanceType: t1.micro
+Outputs:
+  AZ:
+    Value:
+      Fn::GetAtt:
+      - myEC2Instance
+      - AvailabilityZone
+    EOS
+
+    ruby_template = run_client(:convert, :template => template, :template_ext => '.yml', :options => {:output_format => :json})
+
+    expect(ruby_template).to eq((<<-EOS).chomp)
+{
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro"
+      }
+    }
+  },
+  "Outputs": {
+    "AZ": {
+      "Value": {
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+      }
+    }
+  }
+}
+    EOS
+  end
+
+  it 'convert JSON template to Ruby template' do
     template = <<-EOS
 {
   "Resources": {
     "myEC2Instance": {
       "Type": "AWS::EC2::Instance",
       "Properties": {
-        "ImageId": "ami-07f68106",
+        "ImageId": "ami-XXXXXXXX",
         "InstanceType": "t1.micro"
       }
     }
@@ -79,7 +202,7 @@ Resources do
   myEC2Instance do
     Type "AWS::EC2::Instance"
     Properties do
-      ImageId "ami-07f68106"
+      ImageId "ami-XXXXXXXX"
       InstanceType "t1.micro"
     end
   end
@@ -94,6 +217,50 @@ end
     EOS
   end
 
+  it 'convert JSON template to YAML template' do
+    template = <<-EOS
+{
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro"
+      }
+    }
+  },
+  "Outputs": {
+    "AZ": {
+      "Value": {
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+      }
+    }
+  }
+}
+    EOS
+
+    ruby_template = run_client(:convert, :template => template, :template_ext => '.template', :options => {:output_format => :yaml})
+
+    expect(ruby_template).to eq((<<-EOS))
+---
+Resources:
+  myEC2Instance:
+    Type: AWS::EC2::Instance
+    Properties:
+      ImageId: ami-XXXXXXXX
+      InstanceType: t1.micro
+Outputs:
+  AZ:
+    Value:
+      Fn::GetAtt:
+      - myEC2Instance
+      - AvailabilityZone
+    EOS
+  end
+
   it 'convert Ruby template to JSON template with fn_join()' do
     template = <<-TEMPLATE
 Parameters do

data/spec/kumogata_diff_spec.rb

@@ -9,6 +9,11 @@ describe 'Kumogata::Client#diff' do
     open(path) {|f| f.read }
   end
 
+  let(:drupal_single_instance_template_yaml) do
+    path = File.expand_path('../Drupal_Single_Instance.template.yml', __FILE__)
+    open(path) {|f| f.read }
+  end
+
   it 'compare templates logically' do
     json_template = drupal_single_instance_template
     json_template.sub!('localhost', '127.0.0.1')
@@ -43,6 +48,40 @@ describe 'Kumogata::Client#diff' do
     end
   end
 
+  it 'compare yaml templates logically' do
+    yaml_template = drupal_single_instance_template_yaml
+    yaml_template.sub!('localhost', '127.0.0.1')
+    yaml_template.sub!('ToPort: 80', 'ToPort: 8080')
+
+    tempfile(yaml_template, '.yml') do |yaml|
+      tempfile(drupal_single_instance_template_rb, '.rb') do |rb|
+        diff = ruby_template = run_client(:diff, :arguments => [yaml.path, rb.path], :options => {:color => false})
+        diff = diff.split(/\n/).slice(2..-1).join("\n")
+
+        expect(diff).to eq((<<-EOS).chomp)
+@@ -257,7 +257,7 @@
+                       {
+                         "Ref": "DBUsername"
+                       },
+-                      "'@'127.0.0.1' IDENTIFIED BY '",
++                      "'@'localhost' IDENTIFIED BY '",
+                       {
+                         "Ref": "DBPassword"
+                       },
+@@ -437,7 +437,7 @@
+           {
+             "IpProtocol": "tcp",
+             "FromPort": "80",
+-            "ToPort": "8080",
++            "ToPort": "80",
+             "CidrIp": "0.0.0.0/0"
+           },
+           {
+        EOS
+      end
+    end
+  end
+
   it 'compare templates logically with "-w"' do
     json_template = drupal_single_instance_template
     json_template.sub!('localhost', '127.0.0.1')

data/spec/kumogata_utils_spec.rb

@@ -0,0 +1,21 @@
+describe Kumogata::Utils do
+  it 'should stringify the hash' do
+    hash = {
+      :foo => {
+        'bar' => ['1', 2, 3],
+        'zoo' => :value,
+      },
+      12 => :value2
+    }
+
+    expect(Kumogata::Utils.stringify(hash)).to eq(
+      {
+        'foo' => {
+          'bar' => ['1', '2', '3'],
+          'zoo' => 'value',
+        },
+        '12' => 'value2'
+      }
+    )
+  end
+end

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: aws_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: coderay
   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: diffy
   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.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.6
 - !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: net-ssh
   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: retryable
   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
 - !ruby/object:Gem::Dependency
   name: timecop
   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'
 description: A tool for AWS CloudFormation. It can define a template in Ruby DSL.
@@ -242,8 +242,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -267,6 +267,7 @@ files:
 - packer/Ubuntu-12.04.4-LTS-x86_64-ebs-Asia_Pacific.json
 - spec/Drupal_Single_Instance.template
 - spec/Drupal_Single_Instance.template.rb
+- spec/Drupal_Single_Instance.template.yml
 - spec/kumogata_convert_spec.rb
 - spec/kumogata_create_spec.rb
 - spec/kumogata_crypt_spec.rb
@@ -278,6 +279,7 @@ files:
 - spec/kumogata_show_outputs_spec.rb
 - spec/kumogata_show_resources_spec.rb
 - spec/kumogata_update_spec.rb
+- spec/kumogata_utils_spec.rb
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
 - spec/string_stream_spec.rb
@@ -291,12 +293,12 @@ 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: []
@@ -308,6 +310,7 @@ summary: A tool for AWS CloudFormation.
 test_files:
 - spec/Drupal_Single_Instance.template
 - spec/Drupal_Single_Instance.template.rb
+- spec/Drupal_Single_Instance.template.yml
 - spec/kumogata_convert_spec.rb
 - spec/kumogata_create_spec.rb
 - spec/kumogata_crypt_spec.rb
@@ -319,6 +322,8 @@ test_files:
 - spec/kumogata_show_outputs_spec.rb
 - spec/kumogata_show_resources_spec.rb
 - spec/kumogata_update_spec.rb
+- spec/kumogata_utils_spec.rb
 - spec/kumogata_validate_spec.rb
 - spec/spec_helper.rb
 - spec/string_stream_spec.rb
+has_rdoc: