monosasi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59fbb459c9fe2e563a97130ffb73f96668e41efa01219070969d259e2882534a
-  data.tar.gz: 71240ada08e3ce67acb26c960d72379519f20ede50db4b05511c8a1fb5a092c5
+  metadata.gz: b60110d249f0b7a8ac57184b1a398dfa99453c0d2f8219524f7990bb304ced65
+  data.tar.gz: c428dbafa7f1b7796cc6df50a32a07efac35854a96ac0a8a3a77da5266ac62b5
 SHA512:
-  metadata.gz: 0655ede007497ebd8918e6bccc19a6a7c00a4afc95f8f5470f9dde3a258c885a527555f5bd97388dc81b537ff0d31f98450d0510a13903af437522c2f0ff3c5b
-  data.tar.gz: 9ae5121d7861b63c1458e107c9210ad5a169b68b2b0ed389a976cd7c7c99d76952cb8b42a032f20870450ee47715f04279885b5dddbfd0f5b4d23e60d6fdeb3b
+  metadata.gz: 063bca03baf00957de3c42baf2596076f8430564d5926eacdebb2c83683c56c53e43c658b7df73e710a25e9053746eafce7176dce63d811ea6c1e1faa442f20e
+  data.tar.gz: 97f3a6c0949aec6d28f012da71ce4d27364ebea3059365d5afaf03f6507491258e21bc947b96233f854a972cdb850af1334cbd237b9d1a7fed4c525ae003b92a

data/.gitignore

@@ -10,3 +10,4 @@
 test.rb
 Rulefile
 *.rule
+/vendor/

data/lib/monosasi.rb

@@ -1,5 +1,6 @@
-require 'aws-sdk'
+require 'aws-sdk-cloudwatchevents'
 require 'diffy'
+require 'dslh'
 require 'hashie'
 require 'json'
 require 'logger'
@@ -24,5 +25,7 @@ require 'monosasi/dsl/template_helper'
 require 'monosasi/dsl/context'
 require 'monosasi/dsl/context/rule'
 require 'monosasi/dsl/context/rule/target'
+require 'monosasi/dsl/context/rule/target/batch_parameters'
+require 'monosasi/dsl/context/rule/target/ecs_parameters'
 require 'monosasi/dsl/converter'
 require 'monosasi/exporter'

data/lib/monosasi/dsl/context/rule/target.rb

@@ -1,5 +1,6 @@
 class Monosasi::DSL::Context::Rule::Target
   include Monosasi::DSL::TemplateHelper
+  include Monosasi::Logger::Helper # TODO: remove this line when log() would not been called
 
   def initialize(context, id, &block)
     @id = id
@@ -32,11 +33,21 @@ class Monosasi::DSL::Context::Rule::Target
     @result[:role_arn] = value.to_s
   end
 
-  def ecs_parameters(*values)
-    @result[:ecs_parameters] = Hash(*values)
+  def ecs_parameters(*values, &block)
+    unless values.empty?
+      log(:warn, "`ecs_parameter(Hash)` will no longer be available. use ecs_parameter(block)", color: :yellow)
+      @result[:ecs_parameters] = Hash(*values)
+    else
+      @result[:ecs_parameters] = Monosasi::DSL::Context::Rule::Target::EcsParameters.new(@context, &block).result
+    end
   end
 
-  def batch_parameters(*values)
-    @result[:batch_parameters] = Hash(*values)
+  def batch_parameters(*values, &block)
+    unless values.empty?
+      log(:warn, "`batch_parameter(Hash)` will no longer be available. use batch_parameter(block)", color: :yellow)
+      @result[:batch_parameters] = Hash(*values)
+    else
+      @result[:batch_parameters] = Monosasi::DSL::Context::Rule::Target::BatchParameters.new(@context, &block).result
+    end
   end
 end

data/lib/monosasi/dsl/context/rule/target/batch_parameters.rb

@@ -0,0 +1,39 @@
+class Monosasi::DSL::Context::Rule::Target::BatchParameters
+  include Monosasi::DSL::TemplateHelper
+
+  def initialize(context, &block)
+    @context = context
+    @result = {}
+    instance_eval(&block)
+  end
+
+  attr_reader :result
+
+  private
+
+  def job_definition(value)
+    @result[:job_definition] = value.to_s
+  end
+
+  def job_name(value)
+    @result[:job_name] = value.to_s
+  end
+
+  class BatchRetryStrategy
+    include Monosasi::DSL::TemplateHelper
+
+    def initialize(context, &block)
+      @context = context
+      @result = {}
+      instance_eval(&block)
+    end
+
+    attr_reader :result
+
+    private
+
+    def attempts(value)
+      @result[:attempts] = value
+    end
+  end
+end

data/lib/monosasi/dsl/context/rule/target/ecs_parameters.rb

@@ -0,0 +1,81 @@
+class Monosasi::DSL::Context::Rule::Target::EcsParameters
+  include Monosasi::DSL::TemplateHelper
+
+  def initialize(context, &block)
+    @context = context
+    @result = {}
+    instance_eval(&block)
+  end
+
+  attr_reader :result
+
+  private
+
+  def task_definition_arn(value)
+    @result[:task_definition_arn] = value.to_s
+  end
+
+  def task_count(value)
+    @result[:task_count] = value
+  end
+
+  def launch_type(value)
+    @result[:launch_type] = value.to_s
+  end
+
+  def network_configuration(&block)
+    @result[:network_configuration] = NetworkConfiguration.new(@context, &block).result
+  end
+
+  def platform_version(value)
+    @result[:platform_version] = value.to_s
+  end
+
+  def group(value)
+    @result[:group] = value.to_s
+  end
+
+  class NetworkConfiguration
+    include Monosasi::DSL::TemplateHelper
+
+    def initialize(context, &block)
+      @context = context
+      @result = {}
+      instance_eval(&block)
+    end
+
+    attr_reader :result
+
+    private
+
+    def awsvpc_configuration(&block)
+      @result[:awsvpc_configuration] = AwsvpcConfiguration.new(@context, &block).result
+    end
+
+    class AwsvpcConfiguration
+      include Monosasi::DSL::TemplateHelper
+
+      def initialize(context, &block)
+        @context = context
+        @result = {}
+        instance_eval(&block)
+      end
+
+      attr_reader :result
+
+      private
+
+      def subnets(values)
+        @result[:subnets] = values
+      end
+
+      def security_groups(values)
+        @result[:security_groups] = values
+      end
+
+      def assign_public_ip(value)
+        @result[:assign_public_ip] = value.to_s
+      end
+    end
+  end
+end

data/lib/monosasi/dsl/converter.rb

@@ -96,9 +96,8 @@ end
     end
 
     if target[:ecs_parameters]
-      body += <<-EOS
-    ecs_parameters #{target[:ecs_parameters].inspect}
-      EOS
+      body += output_ecs_parameters(target[:ecs_parameters])
+      body += "\n"
     end
 
     if target[:role_arn]
@@ -108,9 +107,8 @@ end
     end
 
     if target[:batch_parameters]
-      body += <<-EOS
-    batch_parameters #{target[:batch_parameters].inspect}
-      EOS
+      body += output_batch_parameters(target[:batch_parameters])
+      body += "\n"
     end
 
     <<-EOS.chomp
@@ -119,4 +117,12 @@ end
   end
     EOS
   end
+
+  def output_ecs_parameters(params)
+    Dslh.deval({"ecs_parameters" => params}, initial_depth: 2, force_dump_braces: true)
+  end
+
+  def output_batch_parameters(params)
+   Dslh.deval({"batch_parameters" => params}, initial_depth: 2, force_dump_braces: true)
+  end
 end

data/lib/monosasi/version.rb

@@ -1,3 +1,3 @@
 module Monosasi
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/monosasi.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '>= 2.11.118'
+  spec.add_dependency 'aws-sdk-cloudwatchevents', '~> 1.13'
   spec.add_dependency 'diffy'
+  spec.add_dependency 'dslh'
   spec.add_dependency 'hashie'
   spec.add_dependency 'parallel'
   spec.add_dependency 'pp_sort_hash'

metadata

@@ -1,31 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: monosasi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-cloudwatchevents
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.118
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.118
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: dslh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -161,6 +175,8 @@ files:
 - lib/monosasi/dsl/context.rb
 - lib/monosasi/dsl/context/rule.rb
 - lib/monosasi/dsl/context/rule/target.rb
+- lib/monosasi/dsl/context/rule/target/batch_parameters.rb
+- lib/monosasi/dsl/context/rule/target/ecs_parameters.rb
 - lib/monosasi/dsl/converter.rb
 - lib/monosasi/dsl/template_helper.rb
 - lib/monosasi/exporter.rb
@@ -191,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Monosasi is a tool to manage Cloudwatch Events rules.