kumogata 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c52814103c4dfd004239aeb9cd54b86323b8d1a
-  data.tar.gz: bc647f27a50468920365f9b6ddb18975668ebe37
+  metadata.gz: a626076a8776de3b3f80ff1627fa21753236f73c
+  data.tar.gz: 2b532df5a2e844ceb3ea69d791fb1d2fcc30fc5b
 SHA512:
-  metadata.gz: 12b445111efc2f36caf2ca79f1ec7aa0e6dcb37921188882124fe0674400a7552b0832fdb663505a24eafb3d91cccdd774a34836550f69390438e17b11057a8e
-  data.tar.gz: c547e1adc47c4e4e719fe3f10997b031ac41576c92ca46322b09badd890d836e0da6b9887083050be32e13fc8f9cbf1d6ef84d795ea51e7d7d79ce6214fb1625
+  metadata.gz: cfbc840b9761ff339e536a6e4e43c8a27866c910454ffb8f0783ff2ec446d3a691025dd9db4ae9c16d2f85f1310e6b864a74442cbb7f00bf0356833a9902b163
+  data.tar.gz: 71cc9feed08e69b16523136b607f5c7f2184ac7a8f5855dd0d3d9a53e59bcfd7c3dcebe55f47f30f351124624f5385788a4f86a4f317f6fb9796e46ba077db1d

data/README.md

@@ -9,6 +9,8 @@ It supports the following format:
 * Ruby
 * YAML
 * JavaScript
+* CoffeeScript (experimental)
+* JSON5 (experimental)
 
 [![Gem Version](https://badge.fury.io/rb/kumogata.png?201406152020)](http://badge.fury.io/rb/kumogata)
 [![Build Status](https://travis-ci.org/winebarrel/kumogata.svg?branch=master)](https://travis-ci.org/winebarrel/kumogata)
@@ -372,7 +374,7 @@ Status: 0
 
 ## JavaScript template
 
-You can also use the YAML template instead of JSON and Ruby.
+You can also use the JavaScript template instead of JSON and Ruby.
 
 ```javascript
 function fetch_ami() {
@@ -431,6 +433,55 @@ function fetch_ami() {
 
     $ kumogata convert Drupal_Single_Instance.template --output-format=js
 
+## CoffeeScript template
+
+You can also use the CoffeeScript template instead of JSON and Ruby.
+
+```coffeescript
+fetch_ami = () -> "ami-XXXXXXXX"
+
+/* For JS Object is evaluated last, it must use `return` */
+return {
+  Resources:
+    myEC2Instance:
+      Type: "AWS::EC2::Instance",
+      Properties:
+        ImageId: fetch_ami(),
+        InstanceType: "t1.micro"
+  Outputs:
+    AZ: # comment
+      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"
+         ]
+       }
+     }
+   }
+ }
+###
+```
+
 ## YAML template
 
 You can also use the YAML template instead of JSON and Ruby.
@@ -477,6 +528,58 @@ Outputs:
 
     $ kumogata convert Drupal_Single_Instance.template --output-format=yaml
 
+## [JSON5](http://json5.org/) template
+
+You can also use the [JSON5](http://json5.org/) template instead of JSON and Ruby.
+
+```javascript
+{
+  Resources: { /* comment */
+    myEC2Instance: {
+      Type: "AWS::EC2::Instance",
+      Properties: {
+        ImageId: "ami-XXXXXXXX",
+        InstanceType: "t1.micro"
+      }
+    }
+  },
+  Outputs: {
+    AZ: { /* comment */
+      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"
+         ]
+       }
+     }
+   }
+ }
+ */
+```
+
 ## Outputs Filter
 
 ```ruby

data/kumogata.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk'
   spec.add_dependency 'coderay'
+  spec.add_dependency 'coffee-script'
   spec.add_dependency 'diffy'
   spec.add_dependency 'dslh', '>= 0.2.7'
   spec.add_dependency 'hashie'
   spec.add_dependency 'highline'
   spec.add_dependency 'json'
+  spec.add_dependency 'json5'
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'retryable'
   spec.add_dependency 'term-ansicolor'

data/lib/kumogata/argument_parser.rb

@@ -80,7 +80,7 @@ class Kumogata::ArgumentParser
       update_usage(opt)
 
       begin
-        supported_formats = [:ruby, :json, :yaml, :js]
+        supported_formats = [:ruby, :json, :yaml, :js, :coffee, :json5]
         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     }

data/lib/kumogata/client.rb

@@ -41,18 +41,21 @@ class Kumogata::Client
                       when :json then :ruby
                       when :yaml then :json
                       when :js then :json
+                      when :json5 then :json
                       end
     end
 
     case output_format
     when :ruby
       devaluate_template(template).chomp.colorize_as(:ruby)
-    when :json
+    when :json, :json5
       JSON.pretty_generate(template).colorize_as(:json)
     when :yaml
       YAML.dump(template).colorize_as(:yaml)
     when :js
       '(' + JSON.pretty_generate(template).colorize_as(:json) + ')'
+    when :coffee
+      raise 'Output to CoffeeScript is not implemented'
     end
   end
 
@@ -174,6 +177,17 @@ class Kumogata::Client
         end
 
         Kumogata::Utils.stringify(obj.to_hash)
+      when :coffee
+        completed = CoffeeScript.compile(f.read)
+        obj = V8::Context.new.eval(completed)
+
+        unless obj.instance_of?(V8::Object)
+          raise "Invalid CoffeeScript template. Please return Object: #{path_or_url}"
+        end
+
+        Kumogata::Utils.stringify(obj.to_hash)
+      when :json5
+        JSON5.parse(f.read)
       else
         raise "Unknown format: #{format}"
       end
@@ -196,6 +210,10 @@ class Kumogata::Client
       :yaml
     when '.js'
       :js
+    when '.coffee'
+      :coffee
+    when '.json5'
+      :json5
     else
       :json
     end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.4.18'
+  VERSION = '0.4.19'
 end

data/lib/kumogata.rb

@@ -4,11 +4,13 @@ require 'kumogata/version'
 require 'aws-sdk'
 require 'base64'
 require 'coderay'
+require 'coffee-script'
 require 'diffy'
 require 'dslh'
 require 'hashie'
 require 'highline/import'
 require 'json'
+require 'json5'
 require 'logger'
 require 'net/ssh'
 require 'open-uri'

data/spec/kumogata_convert_spec.rb

@@ -225,6 +225,145 @@ end
     EOS
   end
 
+  it 'convert Ruby template to JSON5 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
+
+    js_template = run_client(:convert, :template => template, :options => {:output_format => :json5})
+
+    expect(js_template).to eq <<-EOS.strip
+{
+  "Resources": {
+    "myEC2Instance": {
+      "Type": "AWS::EC2::Instance",
+      "Properties": {
+        "ImageId": "ami-XXXXXXXX",
+        "InstanceType": "t1.micro"
+      }
+    }
+  },
+  "Outputs": {
+    "AZ": {
+      "Value": {
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+      }
+    }
+  }
+}
+    EOS
+  end
+
+  it 'convert JSON5 template to Ruby template' do
+    template = <<-EOS
+{
+  Resources: { /* comment */
+    myEC2Instance: {
+      Type: "AWS::EC2::Instance",
+      Properties: {
+        ImageId: "ami-XXXXXXXX",
+        InstanceType: "t1.micro"
+      }
+    }
+  },
+  Outputs: {
+    AZ: { /* comment */
+      Value: {
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+      }
+    }
+  }
+}
+    EOS
+
+    ruby_template = run_client(:convert, :template => template, :template_ext => '.json5', :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 JavaScript template to Ruby template' do
+    template = <<-EOS
+fetch_ami = () -> "ami-XXXXXXXX"
+
+# comment
+return {
+  Resources:
+    myEC2Instance:
+      Type: "AWS::EC2::Instance",
+      Properties:
+        ImageId: fetch_ami(),
+        InstanceType: "t1.micro"
+  Outputs:
+    AZ: # comment
+      Value:
+        "Fn::GetAtt": [
+          "myEC2Instance",
+          "AvailabilityZone"
+        ]
+}
+    EOS
+
+    ruby_template = run_client(:convert, :template => template, :template_ext => '.coffee', :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
 ---

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Genki Sugawara
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  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
@@ -108,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json5
+  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