kumogata-template 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a50c2750395bd793e1bb9210c05e925f6632d4a
-  data.tar.gz: d6faff601811cb365049b0880e731de5f9bb6360
+  metadata.gz: 805a390615c2e10c71e52f4a908adce0c5fd5535
+  data.tar.gz: 5accf023a91f8ac078b4cbaa583ec2a99b97ed94
 SHA512:
-  metadata.gz: ab98967ab2b353665b672bb35c3eea3edcf12d0670650603784eb80d4ff97cafcc65ae9a54351b42ba23e2f66e2feb7b7c669abbb0d8797f2788cbc9b27d7882
-  data.tar.gz: a069fe45f07e2dc691f60881ced851ec96b3922acf67648dc66cbe27440f47b7017baf3319ceef17756185665c80b91e8663c87c8dede9d72577fc086617cff6
+  metadata.gz: 13777f040a5328307f9d94d2eea64379fdae3d04a9ff51062b9f7f3246fcde441d2639fd4f559476c1978c6d1c2d89bbc7ad0f9545fd2b7f5c703a8395c27154
+  data.tar.gz: cb64778a6adbffcf55ccc4a5ae729082763c7b4550a60a3c1d47648828dbe6efb412e29e3c60e81c8f27f0c0f5d28fa2b7bc03e8a99aa890cfdbf33d484b9562

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.1
+  - 2.3.3
 gemfile: n0ts/kumogata-template/Gemfile
 script:
   - bundle install --path vendor/bundle

data/Gemfile.lock

@@ -1,77 +1,54 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.13)
-      aws-sdk (~> 2.3)
-      kumogata (= 0.5.10)
+    kumogata-template (0.0.14)
+      aws-sdk (~> 2)
+      kumogata2-plugin-ruby (= 0.1.3)
+      kumogata2-plugin-yaml (= 0.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.6.44)
-      aws-sdk-resources (= 2.6.44)
-    aws-sdk-core (2.6.44)
+    aws-sdk (2.7.3)
+      aws-sdk-resources (= 2.7.3)
+    aws-sdk-core (2.7.3)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.44)
-      aws-sdk-core (= 2.6.44)
-    aws-sdk-v1 (1.66.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
+    aws-sdk-resources (2.7.3)
+      aws-sdk-core (= 2.7.3)
     aws-sigv4 (1.0.0)
     coderay (1.1.1)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     diffy (3.1.0)
-    dslh (0.2.7)
-    execjs (2.7.0)
+    dslh (0.4.6)
     hashie (3.4.6)
     highline (1.7.8)
     jmespath (1.3.1)
-    json (1.8.5)
-    json5 (0.0.1)
-    kumogata (0.5.10)
-      aws-sdk-v1
+    kumogata2 (0.1.9)
+      aws-sdk (>= 2.3.0)
       coderay
-      coffee-script
       diffy
-      dslh (>= 0.2.7, < 0.3)
       hashie
       highline
-      json
-      json5
-      net-ssh
-      retryable (~> 2.0.0)
       term-ansicolor
-      therubyracer
-      uuidtools
-    libv8 (3.16.14.17)
-    mini_portile2 (2.1.0)
+    kumogata2-plugin-ruby (0.1.3)
+      dslh (>= 0.3.7)
+      kumogata2
+    kumogata2-plugin-yaml (0.0.1)
+      kumogata2
     minitest (5.10.1)
-    net-ssh (4.0.1)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
-    rake (11.3.0)
-    ref (2.0.0)
-    retryable (2.0.4)
+    rake (12.0.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     tins (1.13.0)
-    uuidtools (2.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.11)
+  bundler (~> 1.13)
   kumogata-template!
-  minitest (~> 5.8)
-  rake (~> 11.1)
+  minitest (~> 5.10)
+  rake (~> 12.0)
 
 BUNDLED WITH
    1.13.7

data/README.md

@@ -4,13 +4,10 @@
 
 ## About
 
-- `kumogate-template` is a template sets for [kumogata](https://github.com/winebarrel/kumogata).
+- `kumogate-template` is a template sets for [kumogata2](https://github.com/winebarrel/kumogata2).
 
 ## Installation
 
-Add
-
-
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -196,9 +193,3 @@ EOS
 - AWS::S3::Bucket
 - AWS::SNS::Topic
 - AWS::SQS::Queue
-
-
-## TODO
-
-- Support [Kumogata2](https://github.com/winebarrel/kumogata2)
-- Useful kumogate-template snippets

data/bin/kumogata-template

@@ -2,8 +2,8 @@
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
 require 'kumogata/template/ext/kumogata'
-require 'kumogata/template/ext/argument_parser'
+require 'kumogata/template/ext/option_parser'
 require 'kumogata/template'
 
 
-load Gem.bin_path('kumogata', 'kumogata')
+load Gem.bin_path('kumogata2', 'kumogata2')

data/kumogata-template.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 2.3'
-  spec.add_dependency 'kumogata', '0.5.10'
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 11.1'
-  spec.add_development_dependency 'minitest', '~> 5.8'
+  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'kumogata2-plugin-ruby', '0.1.3'
+  spec.add_dependency 'kumogata2-plugin-yaml', '0.0.1'
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.10'
 end

data/lib/kumogata/template.rb

@@ -1,6 +1,7 @@
 require 'kumogata/template/alb'
 require 'kumogata/template/autoscaling'
 require 'kumogata/template/certificate'
+require 'kumogata/template/cloudfront'
 require 'kumogata/template/cloudwatch'
 require 'kumogata/template/codedeploy'
 require 'kumogata/template/const'

data/lib/kumogata/template/cloudfront.rb

@@ -0,0 +1,306 @@
+#
+# Helper - CloudFront
+#
+require 'kumogata/template/helper'
+
+def _cloudfront_distribution_config(args)
+  aliases = args[:aliases] || []
+  cache =
+    if args.key? :cache
+      _cloudfront_cache_behavior(args[:cache])
+    else
+      ""
+    end
+  comment = args[:comment] || ""
+  custom_errors =
+    if args.key? :custom_errors
+      _cloudfront_custom_errors(args[:custom_errors])
+    else
+      []
+    end
+  default_cache =
+    if args.key? :default_cache
+      _cloudfront_cache_behavior(args[:default_cache], true)
+    else
+      ""
+   end
+  default_root = args[:default_root] || "index.html"
+  enabled = _bool("enabled", args, true)
+  http = _valid_values(args[:http], %w( http1.1 http2 ), "http2")
+  logging =
+    if args.key? :logging
+      _cloudfront_logging(args[:logging])
+    else
+      ""
+    end
+  origins = _cloudfront_origins(args[:origins])
+  price = args[:price] || ""
+  restrictions = args[:restrictions] || ""
+  viewer_cert =
+    if args.key? :viewer_cert
+      _cloudfront_viewer_cert(args[:viewer_cert])
+    else
+      ""
+    end
+  web_acl = args[:web_acl] || ""
+
+  _{
+    Aliases aliases unless aliases.empty?
+    CacheBehaviors cache unless comment.empty?
+    Comment comment unless comment.empty?
+    CustomErrorResponses custom_errors unless custom_errors.empty?
+    DefaultCacheBehavior default_cache unless default_cache.empty?
+    DefaultRootObject default_root unless default_root.empty?
+    Enabled enabled
+    HttpVersion http unless http.empty?
+    Logging logging unless logging.empty?
+    Origins origins
+    PriceClass price unless price.empty?
+    Restrictions restrictions unless restrictions.empty?
+    ViewerCertificate viewer_cert unless viewer_cert.empty?
+    WebACLId web_acl unless web_acl.empty?
+  }
+end
+
+def _cloudfront_cache_behavior(args, default = false)
+  allowed_methods =
+    if args.key? :allowed_methods
+      case args[:allowed_methods]
+       when "with options"
+        %w( GET HEAD OPTIONS )
+       when "all"
+        %w( DELETE GET HEAD OPTIONS PATCH POST PUT )
+       else
+        %w( HEAD GET )
+      end
+    else
+      ""
+    end
+  cached_methods =
+    if args.key? :cached_methods
+      case args[:cached_methods]
+      when "with options"
+        %w( GET HEAD OPTIONS )
+      else
+        %w( HEAD GET )
+      end
+    else
+      ""
+    end
+  compress =
+    if args.key? :compress
+      _bool("compress", args, false)
+    else
+      ""
+    end
+  default_ttl = args[:default_ttl] || nil
+  forwarded_values =
+    if args.key? :forwarded
+      _cloudfront_forwarded_values(args[:forwarded])
+    else
+      ""
+    end
+  max_ttl = args[:max_ttl] || ""
+  min_ttl = args[:min_ttl] || ""
+  path = args[:path]
+  smooth =
+    if args.key? :smooth
+      _bool(args[:smooth])
+    else
+      ""
+    end
+  target = args[:target]
+  trusted = args[:trusted] || ""
+  viewer = _valid_values(args[:viewer], %w( allow-all redirect-to-https https-only ), "redirect-to-https")
+
+  _{
+    AllowedMethods allowed_methods unless allowed_methods.empty?
+    CachedMethods cached_methods unless cached_methods.empty?
+    Compress compress unless compress.empty?
+    DefaultTTL default_ttl unless default_ttl.nil?
+    ForwardedValues forwarded_values
+    MaxTTL max_ttl unless max_ttl.empty?
+    MinTTL min_ttl unless min_ttl.empty?
+    PathPattern path if default == false
+    SmoothStreaming smooth unless smooth.empty?
+    TargetOriginId target
+    TrustedSigners trusted unless trusted.empty?
+    ViewerProtocolPolicy viewer
+  }
+end
+
+def _cloudfront_forwared_cookies(args)
+  forward = args[:forward] || ""
+  white_lists = args[:white_lists] || ""
+
+  _{
+    Forward forward
+    WhitelistedNames white_lists
+  }
+end
+
+def _cloudfront_forwarded_values(args)
+  cookies =
+    if args.key? :cookies
+      _cloudfront_forwared_cookies(args[:cookies])
+    else
+      ""
+    end
+  headers = args[:headers] || []
+  query_string = _bool("query_string", args, false)
+  query_string_keys = args[:query_string_keys] || []
+
+  _{
+    Cookies cookies unless cookies.empty?
+    Headers headers unless headers.empty?
+    QueryString query_string
+    QueryStringCacheKeys query_string_keys unless query_string_keys.empty?
+  }
+end
+
+def _cloudfront_custom_error(args)
+  error_min_ttl = args[:error_min_ttl] || ""
+  error_code = args[:error_code] || 404
+  response_code =
+    if args.key? :response_code
+      args[:response_code] || 404
+    else
+      error_code
+    end
+  response_page =
+    unless response_code.nil?
+      args[:response_page] || "/#{response_code}.html"
+    else
+      ""
+    end
+
+  _{
+    ErrorCachingMinTTL error_min_ttl unless error_min_ttl.empty?
+    ErrorCode error_code
+    ResponseCode response_code unless response_code.nil?
+    ResponsePagePath response_page unless response_page.empty?
+  }
+end
+
+def _cloudfront_custom_errors(args)
+  errors = args || []
+
+  array = []
+  errors.each do |error|
+    array << _cloudfront_custom_error(error)
+  end
+  array
+end
+
+def _cloudfront_logging(args)
+  bucket = _ref_attr_string("bucket", "DomainName", args, "bucket")
+  include_cookies =
+    if args.key? :include_cookies
+      _bool("include_cookies", args, false)
+    else
+      ""
+    end
+  prefix = args[:prefix] || ""
+
+  _{
+    Bucket bucket
+    IncludeCookies include_cookies unless include_cookies.empty?
+    Prefix prefix unless prefix.empty?
+  }
+end
+
+def _cloudfront_origin(args)
+  custom =
+    if args.key? :custom
+      _cloudfront_custom_origin(args[:custom])
+    else
+      nil
+    end
+  domain = _ref_attr_string("domain", "DomainName", args, "bucket")
+  id = args[:id]
+  headers =
+    if args.key? :headers
+      _cloudfront_origin_headers(args[:headers])
+    else
+      ""
+    end
+  path = args[:origin_path] || ""
+  s3 =
+    if args.key? :s3
+      _cloudfront_s3_origin(args[:s3])
+    else
+      nil
+    end
+
+  _{
+    CustomOriginConfig custom if s3.nil?
+    DomainName domain
+    Id id
+    OriginCustomHeaders headers unless headers.empty?
+    OriginPath path unless path.empty?
+    S3OriginConfig s3 if custom.nil?
+  }
+end
+
+def _cloudfront_origins(args)
+  origins = args || []
+
+  array = []
+  origins.each do |origin|
+    array << _cloudfront_origin(origin)
+  end
+  array
+end
+
+def _cloudfront_custom_origin(args)
+  http_port = args[:http_port] || ""
+  https_port = args[:https_port] || ""
+  origin_protocol = args[:origin_protocol] || ""
+  origin_ssl_protocols = args[:origin_ssl_protocols] || []
+
+  _{
+    HTTPPort http_port unless http_port.empty?
+    HTTPSPort https_port unless https_port.empty?
+    OriginProtocolPolicy origin_protocol unless origin_protocol.empty?
+    OriginSSLProtocols origin_ssl_protocols unless origin_ssl_protocols.empty?
+  }
+end
+
+def _cloudfront_s3_origin(args)
+  origin = args[:origin] || ""
+
+  _{
+    OriginAccessIdentity origin unless origin.empty?
+  }
+end
+
+def _cloudfront_origin_headers(args)
+  name = args[:name]
+  value = args[:value]
+
+  _{
+    HeaderName name
+    HeaderValue value
+  }
+end
+
+def _cloudfront_viewer_cert(args)
+  acm = _ref_string("acm", args)
+  default =
+    if args.key? :default
+      _bool("default", args, false)
+    else
+      ""
+    end
+  iam = args[:iam] || ""
+  min_protocol = args[:min_protocol] || ""
+  ssl = _valid_values(args[:ssl], %w( vip sni-only ), "sni-only")
+
+ _{
+   AcmCertificateArn acm unless acm.empty?
+   CloudFrontDefaultCertificate default_cert unless default.empty?
+   IamCertificateId iam unless iam.empty?
+   MinimumProtocolVersion min_protocol unless min_protocol.empty?
+   SslSupportMethod ssl unless acm.empty? and iam.empty?
+  }
+end

data/lib/kumogata/template/ext/kumogata.rb

@@ -1,7 +1,9 @@
-require 'kumogata'
-require 'kumogata/argument_parser'
+require 'kumogata2'
+require 'kumogata2/cli/option_parser'
+require 'kumogata2/logger'
+require 'kumogata2/plugin/ruby'
 
-class Kumogata::Client
+class Kumogata2::Client
   def init(stack_name)
     begin
       base_template = ''
@@ -21,13 +23,29 @@ class Kumogata::Client
         template = base_template.gsub('#{NAME}', stack_name)
         f.write(template)
       }
-      Kumogata.logger.info("Saved template to #{stack_name}.rb".green)
+      Kumogata2::Logger::Helper.log(:info, "Saved template to #{stack_name}.rb".green)
     rescue => e
-      Kumogata.logger.info("Failed to template #{stack_name} - #{e}".red)
+      Kumogata2::Logger::Helper.log(:error, "Failed to template #{stack_name} - #{e}".red)
     end
     nil
   end
+end
+
+class Kumogata2::Plugin::Ruby
+  def parse(str)
+    str = <<EOS
+template do
+  #{str}
+end
+EOS
+    context = Kumogata2::Plugin::Ruby::Context.new(@options)
+    context.instance_eval(str, @options.path_or_url)
+    @post = context.instance_variable_get(:@_post)
+    context.instance_variable_get(:@_template)
+  end
+end
 
+class Kumogata2::Plugin::Ruby::Context
   def define_template_func(scope, path_or_url)
     functions = ''
     Dir.glob(File.join(get_template_path, '*.rb')).all? do |file|
@@ -100,40 +118,6 @@ class Kumogata::Client
     template_path
   end
 
-  def evaluate_template(template, path_or_url)
-    key_converter = proc do |key|
-      key = key.to_s
-      unless @options.skip_replace_underscore?
-        key.gsub!('_', ':')
-        key.gsub!('__', '::')
-      end
-      key
-    end
-
-    value_converter = proc do |v|
-      case v
-      when Hash, Array
-        v
-      else
-        v.to_s
-      end
-    end
-
-    template = Dslh.eval(template.read, {
-      :key_conv   => key_converter,
-      :value_conv => value_converter,
-      :scope_hook => proc {|scope|
-        define_template_func(scope, path_or_url)
-      },
-      :filename   => path_or_url,
-    })
-
-    @outputs_filter.fetch!(template)
-    @post_processing.fetch!(template)
-
-    return template
-  end
-
   def devaluate_template(template)
     exclude_key = proc do |k|
       k = k.to_s.gsub('::', '__')
@@ -152,7 +136,6 @@ class Kumogata::Client
           end
         end
       else
-        k.gsub(':', '_')
         k.gsub('::', '__')
       end
     end
@@ -165,6 +148,22 @@ class Kumogata::Client
       end
     end
 
-    Dslh.deval(template, :key_conv => key_conv, :value_conv => value_conv, :exclude_key => exclude_key)
+    dslh_opts = {
+      key_conv: key_conv,
+      value_conv: value_conv,
+      exclude_key: exclude_key,
+      initial_depth: 1,
+    }
+
+    if ENV['EXPORT_RUBY_USE_BRACES'] == '1'
+      dslh_opts[:use_braces_instead_of_do_end] = true
+    end
+
+    if ENV['EXPORT_RUBY_OLD_FORMAT'] == '1'
+      dslh_opts[:dump_old_hash_array_format] = true
+    end
+
+    dsl = Dslh.deval(template, dslh_opts)
+    dsl.strip
   end
 end

data/lib/kumogata/template/ext/{argument_parser.rb → option_parser.rb}

@@ -1,5 +1,5 @@
-class Kumogata::ArgumentParser
-  Kumogata::ArgumentParser::COMMANDS.merge!(
+class Kumogata2::CLI::OptionParser
+  Kumogata2::CLI::OptionParser::COMMANDS.merge!(
     init: {
       :description => 'Generate basic template',
       :arguments   => [:stack_name],

data/lib/kumogata/template/s3.rb

@@ -7,21 +7,21 @@ def _s3_to_access(value)
   return "Private" if value.nil?
 
   case value
-  when "auth"
+  when "auth read"
     "AuthenticatedRead"
-  when "aws_exec"
+  when "aws exec read"
     "AwsExecRead"
-  when "owner"
+  when "owner read"
     "BucketOwnerRead"
-  when "owner_full"
+  when "owner full"
     "BucketOwnerFullControl"
-  when "log_delivery_w"
+  when "log delivery write"
     "LogDeliveryWrite"
   when "private"
     "Private"
-  when "public_r"
+  when "public read"
     "PublicRead"
-  when "public_rw"
+  when "public read write"
     "PublicReadWrite"
   else
     value

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.14'
+KUMOGATA_TEMPLATE_VERSION = '0.0.15'

data/template/cloudfront-distribution.rb

@@ -0,0 +1,16 @@
+#
+# CloudFront web distribution
+# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution.html
+#
+require 'kumogata/template/helper'
+require 'kumogata/template/cloudfront'
+
+name = _resource_name(args[:name], "distribution")
+config = _cloudfront_distribution_config(args)
+
+_(name) do
+  Type "AWS::CloudFront::Distribution"
+  Properties do
+    DistributionConfig config
+  end
+end

data/template/cloudwatch-alarm.rb

@@ -24,7 +24,7 @@ threshold = args[:threshold] || 60
 unit = _valid_values(args[:unit], %w(Seconds Microseconds Milliseconds Bytes Kilobytes Megabytes Gigabytes Terabytes Bits Kilobits Megabits Gigabits Terabits Percent Count Bytes/Second Kilobytes/Second Megabytes/Second Gigabytes/Second Terabytes/Second Bits/Second Kilobits/Second Megabits/Second Gigabits/Second Terabits/Second Count/Second None), "")
 
 _(name) do
-  Type AWS::CloudWatch::Alarm
+  Type "AWS::CloudWatch::Alarm"
   Properties do
     ActionsEnabled enabled
     AlarmActions actions

data/template/ec2-volume.rb

@@ -16,7 +16,7 @@ tags = _tags(args)
 type = _valid_values(args[:type], %w( io1 gp2 sc1 st1 ), "gp2")
 
 _(name) do
-  Type AWS::EC2::Volume
+  Type "AWS::EC2::Volume"
   Properties do
     AutoEnableIO auto_enable
     AvailabilityZone az

data/template/s3-bucket.rb

@@ -6,8 +6,12 @@ require 'kumogata/template/helper'
 require 'kumogata/template/s3'
 
 name = _resource_name(args[:name], "bucket")
-access = _s3_to_access(args[:access])
-access = "PublicRead" if args.key? :website
+access =
+  if args.key? :website
+    "PublicRead"
+  else
+    _s3_to_access(args[:access])
+  end
 bucket = _ref_name("bucket", args)
 cors = _s3_cors(args)
 lifecycle = _s3_lifecycle(args)

data/test/abstract_unit.rb

@@ -1,13 +1,24 @@
 require 'minitest/autorun'
-require 'kumogata'
-require 'kumogata/argument_parser'
+require 'kumogata2'
+require 'kumogata2/cli/option_parser'
+require 'kumogata2/plugin/ruby'
 require 'json'
 require 'tempfile'
 
 # for only test
 ENV['TZ'] = 'Asia/Tokyo'
 
-class Kumogata::Client
+class Kumogata2::Client
+  include Kumogata2::Logger::Helper
+
+  def initialize(options)
+    @options = options.kind_of?(Hashie::Mash) ? options : Hashie::Mash.new(options)
+    @plugin_by_ext = {}
+    ## Do not initialize AWS client
+  end
+end
+
+class Kumogata2::Plugin::Ruby::Context
   def define_template_func(scope, path_or_url)
     functions = ""
     Dir.glob("template/*.rb").all? do |file|
@@ -73,6 +84,11 @@ def tempfile(content, template_ext = nil)
   basename = "#{File.basename __FILE__}.#{$$}"
   basename = [basename, template_ext] if template_ext
 
+  content = <<EOS
+template do
+  #{content}
+end
+EOS
   Tempfile.open(basename) do |f|
     f << content
     f.flush
@@ -84,14 +100,16 @@ end
 def run_client(template)
   $stdout = open('/dev/null', 'w') unless ENV['DEBUG']
 
-  kumogata_options = Kumogata::ArgumentParser::DEFAULT_OPTIONS
-  kumogata_options[:output_format] = 'json'
-  kumogata_options[:result_log] = '/dev/null'
-  kumogata_options[:command_result_log] = '/dev/null'
+  Kumogata2::Plugin.load_plugins
+
+  options = Kumogata2::CLI::OptionParser::DEFAULT_OPTIONS
+  options[:output_format] = 'json'
+  options[:result_log] = '/dev/null'
+  options[:command_result_log] = '/dev/null'
   template_ext = '.rb'
 
   template = tempfile(template, template_ext) do |f|
-    Kumogata::Client.new(kumogata_options).send(:evaluate_template, f, f.path)
+    Kumogata2::Client.new(options).send(:open_template, f.path)
   end
 end
 

data/test/cloudfront_test.rb

@@ -0,0 +1,265 @@
+require 'abstract_unit'
+require 'kumogata/template/cloudfront'
+
+class CloudFrontTest < Minitest::Test
+  def test_cloudfront_distribution_config
+    template = <<-EOS
+Test _cloudfront_distribution_config({ origins: [{ domain: "test", id: "test", s3: {} }] })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "DefaultRootObject": "index.html",
+    "Enabled": "true",
+    "HttpVersion": "http2",
+    "Origins": [
+      {
+        "DomainName": "test",
+        "Id": "test",
+        "S3OriginConfig": {
+        }
+      }
+    ]
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_cache_behavior
+    template = <<-EOS
+Test _cloudfront_cache_behavior({ forwarded: {}, path: "test", target: "test", viewer: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "ForwardedValues": {
+      "QueryString": "false"
+    },
+    "PathPattern": "test",
+    "TargetOriginId": "test",
+    "ViewerProtocolPolicy": "redirect-to-https"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_forwared_cookies
+    template = <<-EOS
+Test _cloudfront_forwared_cookies({ forward: "test", white_lists: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Forward": "test",
+    "WhitelistedNames": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_forwarded_values
+    template = <<-EOS
+Test _cloudfront_forwarded_values({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "QueryString": "false"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_custom_error
+    template = <<-EOS
+Test _cloudfront_custom_error({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "ErrorCode": "404",
+    "ResponseCode": "404",
+    "ResponsePagePath": "/404.html"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_custom_errors
+    template = <<-EOS
+Test _cloudfront_custom_errors([ {} ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "ErrorCode": "404",
+      "ResponseCode": "404",
+      "ResponsePagePath": "/404.html"
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_logging
+    template = <<-EOS
+Test _cloudfront_logging({ bucket: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "Bucket": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_origin
+    template = <<-EOS
+Test _cloudfront_origin({ domain: "test", id: "test", s3: {} })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "DomainName": "test",
+    "Id": "test",
+    "S3OriginConfig": {
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_origins
+    template = <<-EOS
+Test _cloudfront_origins([ { domain: "test1", id: "test1", s3: {} },
+                           { domain: "test2", id: "test2", s3: {} } ])
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": [
+    {
+      "DomainName": "test1",
+      "Id": "test1",
+      "S3OriginConfig": {
+      }
+    },
+    {
+      "DomainName": "test2",
+      "Id": "test2",
+      "S3OriginConfig": {
+      }
+    }
+  ]
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_custom_origin
+    template = <<-EOS
+Test _cloudfront_custom_origin({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_s3_origin
+    template = <<-EOS
+Test _cloudfront_s3_origin({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_custom_origin
+    template = <<-EOS
+Test _cloudfront_custom_origin({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_s3_origin
+    template = <<-EOS
+Test _cloudfront_s3_origin({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+
+  def test_cloudfront_origin_headers
+    template = <<-EOS
+Test _cloudfront_origin_headers({ name: "test", value: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "HeaderName": "test",
+    "HeaderValue": "test"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_cloudfront_viewer_cert
+    template = <<-EOS
+Test _cloudfront_viewer_cert({ acm: "test" })
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": {
+    "AcmCertificateArn": "test",
+    "SslSupportMethod": "sni-only"
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

data/test/helper_test.rb

@@ -36,8 +36,8 @@ class HelperTest < Minitest::Test
     assert_equal _valid_numbers(1, 0, 1, 2), 1
     assert_equal _valid_numbers(2, 1, 2, 4), 2
     assert_equal _valid_numbers(2, 0, 1, 2), 2
-    assert_equal _valid_numbers(3, 0, 1), nil
-    assert_equal _valid_numbers(nil, 0, 1), nil
+    assert_nil _valid_numbers(3, 0, 1)
+    assert_nil _valid_numbers(nil, 0, 1)
   end
 
   def test_ref_string

data/test/s3_test.rb

@@ -2,6 +2,7 @@ require 'abstract_unit'
 require 'kumogata/template/s3'
 
 class S3Test < Minitest::Test
+
   def test_s3_cors
     template = <<-EOS
 Test _s3_cors(cors: [ { headers: "test", methods: "test", origins: "test", exposed_headers: "test", id: "test", max_age: "test" } ])

data/test/template/cloudfront-distribution_test.rb

@@ -0,0 +1,33 @@
+require 'abstract_unit'
+
+class CloudfrontDistributionTest < Minitest::Test
+  def test_normal
+    template = <<-EOS
+_cloudfront_distribution "test", { origins: [{ domain: "test", id: "test", s3: {} }] }
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "TestDistribution": {
+    "Type": "AWS::CloudFront::Distribution",
+    "Properties": {
+      "DistributionConfig": {
+        "DefaultRootObject": "index.html",
+        "Enabled": "true",
+        "HttpVersion": "http2",
+        "Origins": [
+          {
+            "DomainName": "test",
+            "Id": "test",
+            "S3OriginConfig": {
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,70 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: kumogata
+  name: kumogata2-plugin-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: kumogata2-plugin-yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
 description: Template for Kumogata. Kumogata is a tool for AWS CloudFormation. It
   can define a template in Ruby DSL.
 email:
@@ -101,6 +115,7 @@ files:
 - lib/kumogata/template/alb.rb
 - lib/kumogata/template/autoscaling.rb
 - lib/kumogata/template/certificate.rb
+- lib/kumogata/template/cloudfront.rb
 - lib/kumogata/template/cloudwatch.rb
 - lib/kumogata/template/codedeploy.rb
 - lib/kumogata/template/const.rb
@@ -112,8 +127,8 @@ files:
 - lib/kumogata/template/elb.rb
 - lib/kumogata/template/emr.rb
 - lib/kumogata/template/events.rb
-- lib/kumogata/template/ext/argument_parser.rb
 - lib/kumogata/template/ext/kumogata.rb
+- lib/kumogata/template/ext/option_parser.rb
 - lib/kumogata/template/helper.rb
 - lib/kumogata/template/iam.rb
 - lib/kumogata/template/lambda.rb
@@ -131,6 +146,7 @@ files:
 - template/autoscaling-scaling-policy.rb
 - template/autoscaling-scheduled-action.rb
 - template/certificate.rb
+- template/cloudfront-distribution.rb
 - template/cloudtrail.rb
 - template/cloudwatch-alarm.rb
 - template/codedeploy-application.rb
@@ -231,6 +247,7 @@ files:
 - test/abstract_unit.rb
 - test/alb_test.rb
 - test/autoscaling_test.rb
+- test/cloudfront_test.rb
 - test/codedeploy_test.rb
 - test/data/lambda_function.py
 - test/datapipeline_test.rb
@@ -256,6 +273,7 @@ files:
 - test/template/autoscaling-scaling-policy_test.rb
 - test/template/autoscaling-scheduled-action_test.rb
 - test/template/certificate_test.rb
+- test/template/cloudfront-distribution_test.rb
 - test/template/cloudtrail_test.rb
 - test/template/cloudwatch-alarm_test.rb
 - test/template/codedeploy-application_test.rb
@@ -381,6 +399,7 @@ test_files:
 - test/abstract_unit.rb
 - test/alb_test.rb
 - test/autoscaling_test.rb
+- test/cloudfront_test.rb
 - test/codedeploy_test.rb
 - test/data/lambda_function.py
 - test/datapipeline_test.rb
@@ -406,6 +425,7 @@ test_files:
 - test/template/autoscaling-scaling-policy_test.rb
 - test/template/autoscaling-scheduled-action_test.rb
 - test/template/certificate_test.rb
+- test/template/cloudfront-distribution_test.rb
 - test/template/cloudtrail_test.rb
 - test/template/cloudwatch-alarm_test.rb
 - test/template/codedeploy-application_test.rb