kumogata-template 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805a390615c2e10c71e52f4a908adce0c5fd5535
-  data.tar.gz: 5accf023a91f8ac078b4cbaa583ec2a99b97ed94
+  metadata.gz: 0e864c2a60e72840e4dbd4654d206ad26a537f6a
+  data.tar.gz: 42092ee39c37f1ece34f4df417bc8bc9808c1fb2
 SHA512:
-  metadata.gz: 13777f040a5328307f9d94d2eea64379fdae3d04a9ff51062b9f7f3246fcde441d2639fd4f559476c1978c6d1c2d89bbc7ad0f9545fd2b7f5c703a8395c27154
-  data.tar.gz: cb64778a6adbffcf55ccc4a5ae729082763c7b4550a60a3c1d47648828dbe6efb412e29e3c60e81c8f27f0c0f5d28fa2b7bc03e8a99aa890cfdbf33d484b9562
+  metadata.gz: 20b12e59103fdd77b860bdf4b5d45c5481140a50abc191662662e8ae3c588376b1939d046d009ea0885d08e16cc2cfaac0b8e427d3bc703065795787f96ee88d
+  data.tar.gz: e0e8c9b6be839f6675901e136a84458b2c996338f0db834c045c3a2600ba8b7410564a79cb8a055925651689f680501fcce9a95b141bd907fae499b7173b650d

data/.gitignore

@@ -51,4 +51,5 @@ build-iPhoneSimulator/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-
+*.json
+*.yaml

data/.travis.yml

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

data/Gemfile.lock

@@ -1,54 +1,77 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.14)
-      aws-sdk (~> 2)
-      kumogata2-plugin-ruby (= 0.1.3)
-      kumogata2-plugin-yaml (= 0.0.1)
+    kumogata-template (0.0.13)
+      aws-sdk (~> 2.3)
+      kumogata (= 0.5.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.7.3)
-      aws-sdk-resources (= 2.7.3)
-    aws-sdk-core (2.7.3)
+    aws-sdk (2.6.44)
+      aws-sdk-resources (= 2.6.44)
+    aws-sdk-core (2.6.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.3)
-      aws-sdk-core (= 2.7.3)
+    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-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.4.6)
+    dslh (0.2.7)
+    execjs (2.7.0)
     hashie (3.4.6)
     highline (1.7.8)
     jmespath (1.3.1)
-    kumogata2 (0.1.9)
-      aws-sdk (>= 2.3.0)
+    json (1.8.5)
+    json5 (0.0.1)
+    kumogata (0.5.10)
+      aws-sdk-v1
       coderay
+      coffee-script
       diffy
+      dslh (>= 0.2.7, < 0.3)
       hashie
       highline
+      json
+      json5
+      net-ssh
+      retryable (~> 2.0.0)
       term-ansicolor
-    kumogata2-plugin-ruby (0.1.3)
-      dslh (>= 0.3.7)
-      kumogata2
-    kumogata2-plugin-yaml (0.0.1)
-      kumogata2
+      therubyracer
+      uuidtools
+    libv8 (3.16.14.17)
+    mini_portile2 (2.1.0)
     minitest (5.10.1)
-    rake (12.0.0)
+    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)
     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.13)
+  bundler (~> 1.11)
   kumogata-template!
-  minitest (~> 5.10)
-  rake (~> 12.0)
+  minitest (~> 5.8)
+  rake (~> 11.1)
 
 BUNDLED WITH
    1.13.7

data/README.md

@@ -4,10 +4,13 @@
 
 ## About
 
-- `kumogate-template` is a template sets for [kumogata2](https://github.com/winebarrel/kumogata2).
+- `kumogate-template` is a template sets for [kumogata](https://github.com/winebarrel/kumogata).
 
 ## Installation
 
+Add
+
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -193,3 +196,9 @@ 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/option_parser'
+require 'kumogata/template/ext/argument_parser'
 require 'kumogata/template'
 
 
-load Gem.bin_path('kumogata2', 'kumogata2')
+load Gem.bin_path('kumogata', 'kumogata')

data/kumogata-template.gemspec

@@ -18,10 +18,9 @@ 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'
-  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'
+  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'
 end

data/lib/kumogata/template.rb

@@ -3,6 +3,8 @@ require 'kumogata/template/autoscaling'
 require 'kumogata/template/certificate'
 require 'kumogata/template/cloudfront'
 require 'kumogata/template/cloudwatch'
+require 'kumogata/template/codebuild'
+require 'kumogata/template/codecommit'
 require 'kumogata/template/codedeploy'
 require 'kumogata/template/const'
 require 'kumogata/template/datapipeline'
@@ -15,6 +17,7 @@ require 'kumogata/template/emr'
 require 'kumogata/template/helper'
 require 'kumogata/template/iam'
 require 'kumogata/template/lambda'
+require 'kumogata/template/logs'
 require 'kumogata/template/s3'
 require 'kumogata/template/sns'
 require 'kumogata/template/version'

data/lib/kumogata/template/codebuild.rb

@@ -0,0 +1,86 @@
+#
+# Helper - CodeBuild
+#
+require 'kumogata/template/helper'
+
+def _codebuild_to_compute(value)
+  case value
+  when "small"
+    "BUILD_GENERAL1_SMALL"
+  when "medium"
+    "BUILD_GENERAL1_MEDIUM"
+  when "large"
+    "BUILD_GENERAL1_LARGE"
+  else
+    "BUILD_GENERAL1_MEDIUM"
+  end
+end
+
+def _codebuild_source_type(value)
+  case value
+  when "codecommit", "commit"
+    "CODECOMMIT"
+  when "codepipeline", "pipeline"
+    "CODEPIPELINE"
+  when "github", "gh"
+    "GITHUB"
+  when "s3"
+    "S3"
+  end
+end
+
+
+def _codebuild_artifacts(args)
+  name = args[:name] || ""
+  ns = args[:ns] || ""
+  packaging = args[:packaging] || ""
+  path = args[:path] || ""
+  type = _valid_values(args[:type], %w( codepipeline no_artifacts s3 ), "no_artifacts")
+
+  _{
+    Location location if type != "codepipeline" and type != "no_artifacts"
+    Name name if type != "codepipeline" and type != "no_artifacts"
+    NamespaceType ns if type != "codepipeline" and type != "no_artifacts"
+    Packaging packaging if type != "codepipeline" and type != "no_artifacts"
+    Path path unless path.empty?
+    Type type
+  }
+end
+
+def _codebuild_environement(args)
+  compute = _codebuild_to_compute(args[:compute])
+  env_hash = _codebuild_environement_hash(args[:env])
+  image = args[:image]
+
+  _{
+    ComputeType compute
+    EnvironmentVariables env_hash
+    Image image
+    Type "LINUX_CONTAINER"
+  }
+end
+
+def _codebuild_environement_hash(args)
+  hash = args || {}
+
+  array = []
+  hash.each_pair do |k, v|
+    array << _{
+      Name k
+      Value v
+    }
+  end
+  array
+end
+
+def _codebuild_source(args)
+  build = args[:build] || ""
+  location = args[:location] || ""
+  type = _codebuild_source_type(args[:type])
+
+  _{
+    BuildSpec build unless build.empty?
+    Location location unless type == "CODEPIPELINE"
+    Type type
+  }
+end

data/lib/kumogata/template/codecommit.rb

@@ -0,0 +1,20 @@
+#
+# Helper - CodeCommit
+#
+require 'kumogata/template/helper'
+
+def _codecommit_triggers(args)
+  triggers = args[:trigger] || []
+
+  array = []
+  triggers.each do |trigger|
+    array << _{
+      Branches trigger[:branchs] || []
+      CustomData trigger[:custom] || ""
+      DestinationArn trigger[:dest] || ""
+      Events trigger[:events] || []
+      Name trigger[:name] || ""
+    }
+  end
+  array
+end

data/lib/kumogata/template/ec2.rb

@@ -53,7 +53,7 @@ def _ec2_security_group_ingresses(name, args)
 
   rules = []
   _array(args[name.to_sym]).each do |arg|
-    if arg.is_a? Fixnum
+    if arg.is_a? Integer
       arg = {
         from: arg,
         to: arg,

data/lib/kumogata/template/elb.rb

@@ -102,7 +102,10 @@ def _elb_listeners(args)
         443
       end
     policies = []
-    policies << "ELBSecurityPolicy-2015-05" if protocol == "https" or protocol == "ssl"
+    if protocol == "https" or protocol == "ssl"
+      policy = listener[:policy] || "2016-08"
+      policies << "ELBSecurityPolicy-#{policy}"
+    end
     ssl = _ref_string("ssl", listener)
 
     array << _{

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

@@ -0,0 +1,8 @@
+class Kumogata::ArgumentParser
+  Kumogata::ArgumentParser::COMMANDS.merge!(
+    init: {
+      :description => 'Generate basic template',
+      :arguments   => [:stack_name],
+    }
+  )
+end

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

@@ -1,9 +1,7 @@
-require 'kumogata2'
-require 'kumogata2/cli/option_parser'
-require 'kumogata2/logger'
-require 'kumogata2/plugin/ruby'
+require 'kumogata'
+require 'kumogata/argument_parser'
 
-class Kumogata2::Client
+class Kumogata::Client
   def init(stack_name)
     begin
       base_template = ''
@@ -23,29 +21,13 @@ class Kumogata2::Client
         template = base_template.gsub('#{NAME}', stack_name)
         f.write(template)
       }
-      Kumogata2::Logger::Helper.log(:info, "Saved template to #{stack_name}.rb".green)
+      Kumogata.logger.info("Saved template to #{stack_name}.rb".green)
     rescue => e
-      Kumogata2::Logger::Helper.log(:error, "Failed to template #{stack_name} - #{e}".red)
+      Kumogata.logger.info("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|
@@ -118,6 +100,40 @@ class Kumogata2::Plugin::Ruby::Context
     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('::', '__')
@@ -136,6 +152,7 @@ class Kumogata2::Plugin::Ruby::Context
           end
         end
       else
+        k.gsub(':', '_')
         k.gsub('::', '__')
       end
     end
@@ -148,22 +165,6 @@ class Kumogata2::Plugin::Ruby::Context
       end
     end
 
-    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
+    Dslh.deval(template, :key_conv => key_conv, :value_conv => value_conv, :exclude_key => exclude_key)
   end
 end