kelbim 0.2.9 → 0.3.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f17dc184fd3cf7fe7567a5bc11be8731a120ce5
-  data.tar.gz: 7fe61d62a7ab76d658cb478c1e88578811c10c96
+  metadata.gz: b2a329d50ba93b5acaacef247844fa11372b8492
+  data.tar.gz: 2c1e85f5409c3e6ed565a3cc2fc5609ffdc13f6f
 SHA512:
-  metadata.gz: 957db04a1a2719744695d2ac378a94fc0fba548e526d87e1408dd76a762a3f112eb1a855c4f8a249d45abfa8337e8a080996ab645a4c84d387e75d89c6468fd9
-  data.tar.gz: 78e2173873bf2481c80b8e0a51276a2d3fa822823a0c852abce2b23c57336be2755bfa05789ad8cd598ed4f38afc639bc0b29f6bca6a87f88dd34fb0ddae768e
+  metadata.gz: a181f841ecef76a507607c5c802af5421ba5a24933a42b0b92d54a72cad17b3856e789ff1a33aa5d80e1341750e9d7fea22fcafd30d1e768f6d0cbabdd386e29
+  data.tar.gz: fce277ac7f3f8be8669ee105a4ccc31fd675b81660fed61048c4f5ac89999a052d452d8abec6aea4ab8183c49fd763023d2b22e870727edc40ae812e68c33bab

data/README.md

@@ -4,7 +4,7 @@ Kelbim is a tool to manage ELB.
 
 It defines the state of ELB using DSL, and updates ELB according to DSL.
 
-[![Gem Version](https://badge.fury.io/rb/kelbim.png)](http://badge.fury.io/rb/kelbim)
+[![Gem Version](https://badge.fury.io/rb/kelbim.svg)](https://badge.fury.io/rb/kelbim)
 [![Build Status](https://travis-ci.org/winebarrel/kelbim.svg?branch=master)](https://travis-ci.org/winebarrel/kelbim)
 
 **Notice**
@@ -148,6 +148,33 @@ ec2 "vpc-XXXXXXXXX" do
 end
 ```
 
+## Use template
+
+```ruby
+template "listeners" do
+  listeners do
+    listener [:tcp, 80] => [:tcp, context.backend_port]
+    listener [:https, 443] => [:http, context.backend_port] do
+      app_cookie_stickiness "CookieName"=>"20"
+      ssl_negotiation ["Protocol-TLSv1", "Protocol-SSLv3", "AES256-SHA", ...]
+      server_certificate "my-cert"
+    end
+  end
+end
+
+ec2 "vpc-XXXXXXXXX" do
+  load_balancer "my-load-balancer", :internal => true do
+    instances(
+      "nyar",
+      "yog"
+    )
+
+    include_template "listeners", backend_port: 80
+    ...
+  end
+end
+```
+
 ## Test
 
 ```ruby

data/bin/kelbim

@@ -36,7 +36,8 @@ ARGV.options do |opt|
     opt.on('-r', '--region REGION')           {|v| region                            = v                    }
     opt.on('-a', '--apply')                   {    mode                              = :apply               }
     opt.on('-f', '--file FILE')               {|v| file                              = v                    }
-    opt.on('-n', '--elb-names NAMES', Array)  {|v| options[:elb_names]               = v                    }
+    opt.on('-n', '--elb-name REGEXP')         {|v| options[:elb_name]                =  Regexp.new(v)       }
+    opt.on('',   '--exclude-elb-name REGEXP') {|v| options[:exclude_elb_name]        =  Regexp.new(v)       }
     opt.on('',   '--dry-run')                 {    options[:dry_run]                 = true                 }
     opt.on('',   '--ec2s VPC_IDS', Array)     {|v| options[:ec2s]                    = v                    }
     opt.on('',   '--without-deleting-policy') {    options[:without_deleting_policy] = true                 }

data/lib/kelbim/client.rb

@@ -1,16 +1,7 @@
-require 'aws-sdk-v1'
-require 'kelbim/dsl'
-require 'kelbim/exporter'
-require 'kelbim/ext/ec2-ext'
-require 'kelbim/ext/elb-load-balancer-ext'
-require 'kelbim/policy-types'
-require 'kelbim/tester'
-require 'kelbim/wrapper/elb-wrapper'
-require 'kelbim/logger'
-
 module Kelbim
   class Client
     include Logger::ClientHelper
+    include Kelbim::Utils::Helper
 
     def initialize(options = {})
       @options = OpenStruct.new(options)
@@ -147,11 +138,7 @@ module Kelbim
 
       lb_list_dsl.each do |key, lb_dsl|
         name = key[0]
-
-        if @options.elb_names
-          next unless @options.elb_names.include?(name)
-        end
-
+        next unless matched_elb?(name)
         lb_aws = lb_list_aws[key]
 
         unless lb_aws
@@ -162,11 +149,7 @@ module Kelbim
 
       lb_list_dsl.each do |key, lb_dsl|
         name = key[0]
-
-        if @options.elb_names
-          next unless @options.elb_names.include?(name)
-        end
-
+        next unless matched_elb?(name)
         log(:info, "Comparing #{vpc || :classic} > #{name}", :intense_black)
 
         lb_aws = lb_list_aws.delete(key)
@@ -175,11 +158,7 @@ module Kelbim
 
       lb_list_aws.each do |key, lb_aws|
         name = key[0]
-
-        if @options.elb_names
-          next unless @options.elb_names.include?(name)
-        end
-
+        next unless matched_elb?(name)
         lb_aws.delete
       end
     end
@@ -264,7 +243,7 @@ module Kelbim
       end
 
       if orig_policy_names.sort != new_policies.map {|i| i.name }.sort
-        listener.policies = new_policies
+        listener.update_policies(new_policies, old_policies)
       end
 
       if not old_policies.empty? and not @options.without_deleting_policy

data/lib/kelbim/dsl/attributes.rb

@@ -1,15 +1,14 @@
-require 'ostruct'
-require 'kelbim/dsl/checker'
-
 module Kelbim
   class DSL
     class EC2
       class LoadBalancer
         class Attributes
           include Checker
+          include Kelbim::TemplateHelper
 
-          def initialize(load_balancer, &block)
+          def initialize(context, load_balancer, &block)
             @error_identifier = "LoadBalancer `#{load_balancer}`"
+            @context = context.dup
             @result = {}
             instance_eval(&block)
           end

data/lib/kelbim/dsl/converter.rb

@@ -1,5 +1,3 @@
-require 'kelbim/policy-types'
-
 module Kelbim
   class DSL
     class Converter

data/lib/kelbim/dsl/ec2.rb

@@ -1,14 +1,13 @@
-require 'ostruct'
-require 'set'
-require 'kelbim/dsl/load-balancer'
-
 module Kelbim
   class DSL
     class EC2
+      include Kelbim::TemplateHelper
+
       attr_reader :result
 
-      def initialize(vpc, load_balancers, &block)
+      def initialize(context, vpc, load_balancers, &block)
         @error_identifier = "EC2 `#{vpc || :classic}`"
+        @context = context.merge(:vpc => vpc)
 
         @result = OpenStruct.new({
           :vpc            => vpc,
@@ -29,7 +28,7 @@ module Kelbim
           raise "LoadBalancer `#{name}`: Invalid option keys: #{invalid_keys}"
         end
 
-        @result.load_balancers << LoadBalancer.new(name, @result.vpc, opts[:internal], &block).result
+        @result.load_balancers << LoadBalancer.new(@context, name, @result.vpc, opts[:internal], &block).result
         @names << name
       end
     end # EC2

data/lib/kelbim/dsl/health-check.rb

@@ -1,15 +1,14 @@
-require 'ostruct'
-require 'kelbim/dsl/checker'
-
 module Kelbim
   class DSL
     class EC2
       class LoadBalancer
         class HealthCheck
           include Checker
+          include Kelbim::TemplateHelper
 
-          def initialize(load_balancer, &block)
+          def initialize(context, load_balancer, &block)
             @error_identifier = "LoadBalancer `#{load_balancer}`"
+            @context = context.dup
             @result = {}
             instance_eval(&block)
           end

data/lib/kelbim/dsl/listener.rb

@@ -1,7 +1,3 @@
-require 'ostruct'
-require 'kelbim/dsl/checker'
-require 'kelbim/policy-types'
-
 module Kelbim
   class DSL
     class EC2
@@ -9,9 +5,11 @@ module Kelbim
         class Listeners
           class Listener
             include Checker
+            include Kelbim::TemplateHelper
 
-            def initialize(load_balancer, protocol_prots, &block)
-              @error_identifier = "LoadBalancer `#{load_balancer}`: #{protocol_prots}"
+            def initialize(context, load_balancer, protocol_ports, &block)
+              @error_identifier = "LoadBalancer `#{load_balancer}`: #{protocol_ports}"
+              @context = context.merge(:protocol_ports => protocol_ports)
 
               @result = OpenStruct.new({
                 :policies => []
@@ -32,7 +30,7 @@ module Kelbim
               expected_type(value, Hash)
 
               unless value.kind_of?(Hash)
-                raise "LoadBalancer `#{@load_balancer}`: #{@protocol_prots}: Invalid policies: #{value}"
+                raise "LoadBalancer `#{@load_balancer}`: #{@protocol_ports}: Invalid policies: #{value}"
               end
 
               value = value.map do |policy, name_or_attrs|

data/lib/kelbim/dsl/listeners.rb

@@ -1,16 +1,14 @@
-require 'ostruct'
-require 'kelbim/dsl/checker'
-require 'kelbim/dsl/listener'
-
 module Kelbim
   class DSL
     class EC2
       class LoadBalancer
         class Listeners
           include Checker
+          include Kelbim::TemplateHelper
 
-          def initialize(load_balancer, &block)
+          def initialize(context, load_balancer, &block)
             @error_identifier = "LoadBalancer `#{load_balancer}`"
+            @context = context.dup
             @result = {}
             instance_eval(&block)
           end
@@ -47,7 +45,7 @@ module Kelbim
               expected_type(port, Integer)
             end
 
-            @result[protocol_ports] = Listener.new(@load_balancer, protocol_ports, &block).result
+            @result[protocol_ports] = Listener.new(@context, @load_balancer, protocol_ports, &block).result
           end
         end # Listeners
       end # LoadBalancer

data/lib/kelbim/dsl/load-balancer.rb

@@ -1,19 +1,15 @@
-require 'ostruct'
-require 'kelbim/dsl/checker'
-require 'kelbim/dsl/health-check'
-require 'kelbim/dsl/attributes'
-require 'kelbim/dsl/listeners'
-
 module Kelbim
   class DSL
     class EC2
       class LoadBalancer
         include Checker
+        include Kelbim::TemplateHelper
 
-        def initialize(name, vpc, internal, &block)
+        def initialize(context, name, vpc, internal, &block)
           @name = name
           @vpc = vpc
           @error_identifier = "LoadBalancer `#{name}`"
+          @context = context.merge(:load_balancer_name => name)
 
           @result = OpenStruct.new({
             :name      => name,
@@ -57,17 +53,17 @@ module Kelbim
 
         def listeners(&block)
           call_once(:listeners)
-          @result.listeners = Listeners.new(@name, &block).result
+          @result.listeners = Listeners.new(@context, @name, &block).result
         end
 
         def health_check(&block)
           call_once(:health_check)
-          @result.health_check = HealthCheck.new(@name, &block).result
+          @result.health_check = HealthCheck.new(@context, @name, &block).result
         end
 
         def attributes(&block)
           call_once(:attributes)
-          @result.attributes = Attributes.new(@name, &block).result
+          @result.attributes = Attributes.new(@context, @name, &block).result
         end
 
         def subnets(*values)

data/lib/kelbim/dsl.rb

@@ -1,9 +1,7 @@
-require 'ostruct'
-require 'kelbim/dsl/converter'
-require 'kelbim/dsl/ec2'
-
 module Kelbim
   class DSL
+    include Kelbim::TemplateHelper
+
     class << self
       def define(source, path)
         self.new(path) do
@@ -21,27 +19,38 @@ module Kelbim
     def initialize(path, &block)
       @path = path
       @result = OpenStruct.new(:ec2s => {})
+
+      @context = Hashie::Mash.new(
+        :path => path,
+        :templates => {}
+      )
+
       instance_eval(&block)
     end
 
     private
+
     def require(file)
-      balancerfile = File.expand_path(File.join(File.dirname(@path), file))
+      balancerfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
       if File.exist?(balancerfile)
-        instance_eval(File.read(balancerfile))
+        instance_eval(File.read(balancerfile), balancerfile)
       elsif File.exist?(balancerfile + '.rb')
-        instance_eval(File.read(balancerfile + '.rb'))
+        instance_eval(File.read(balancerfile + '.rb'), balancerfile + '.rb')
       else
         Kernel.require(file)
       end
     end
 
+    def template(name, &block)
+      @context.templates[name.to_s] = block
+    end
+
     def ec2(vpc = nil, &block)
       if (ec2_result = @result.ec2s[vpc])
-        @result.ec2s[vpc] = EC2.new(vpc, ec2_result.load_balancers, &block).result
+        @result.ec2s[vpc] = EC2.new(@context, vpc, ec2_result.load_balancers, &block).result
       else
-        @result.ec2s[vpc] = EC2.new(vpc, [], &block).result
+        @result.ec2s[vpc] = EC2.new(@context, vpc, [], &block).result
       end
     end
   end # DSL

data/lib/kelbim/exporter.rb

@@ -1,8 +1,7 @@
-require 'kelbim/ext/elb-load-balancer-ext'
-require 'kelbim/ext/elb-listener-ext'
-
 module Kelbim
   class Exporter
+    include Kelbim::Utils::Helper
+
     class << self
       def export(elb, options = {})
         self.new(elb, options).export
@@ -19,12 +18,11 @@ module Kelbim
       lbs = @elb.load_balancers
 
       ec2s = @options[:ec2s]
-      elb_names = @options[:elb_names]
 
-      if ec2s or elb_names
+      if ec2s or @options[:elb_name] or @options[:exclude_elb_name]
         lbs = lbs.select do |lb|
           (ec2s.nil? or ec2s.include?(lb.vpc_id || 'classic')) &&
-          (elb_names.nil? or elb_names.include?(lb.name))
+          matched_elb?(lb.name)
         end
       end
 

data/lib/kelbim/logger.rb

@@ -1,7 +1,3 @@
-require 'logger'
-require 'singleton'
-require 'kelbim/ext/string-ext'
-
 module Kelbim
   class Logger < ::Logger
     include Singleton
@@ -26,7 +22,8 @@ module Kelbim
         message << ": #{log_id}" if log_id
         message << ' (dry-run)' if @options && @options.dry_run
         logger = (@options && @options.logger) || Kelbim::Logger.instance
-        logger.send(level, message.send(color))
+        message = message.send(color) if color
+        logger.send(level, message)
       end
     end # ClientHelper
   end # Logger

data/lib/kelbim/rspec-formatter.rb

@@ -1,6 +1,3 @@
-require 'rspec'
-require 'rspec/core/formatters/progress_formatter'
-
 module Kelbim
   class RSpecFormatter < RSpec::Core::Formatters::ProgressFormatter
     def dump_failure_info(example)

data/lib/kelbim/template_helper.rb

@@ -0,0 +1,20 @@
+module Kelbim
+  module TemplateHelper
+    def include_template(template_name, context = {})
+      tmplt = @context.templates[template_name.to_s]
+
+      unless tmplt
+        raise "Template `#{template_name}` is not defined"
+      end
+
+      context_orig = @context
+      @context = @context.merge(context)
+      instance_eval(&tmplt)
+      @context = context_orig
+    end
+
+    def context
+      @context
+    end
+  end
+end

data/lib/kelbim/tester.rb

@@ -1,9 +1,3 @@
-require 'rspec'
-require 'net/http'
-require 'socket'
-require 'timeout'
-require 'kelbim/logger'
-
 module Kelbim
   class Tester
     class << self

data/lib/kelbim/utils.rb

@@ -0,0 +1,33 @@
+module Kelbim
+  class Utils
+    module Helper
+      def matched_elb?(name)
+        result = true
+
+        if @options[:exclude_elb_name]
+          result &&= name !~ @options[:exclude_elb_name]
+        end
+
+        if @options[:elb_name]
+          result &&= name =~ @options[:elb_name]
+        end
+
+        result
+      end
+    end # Helper
+
+    class << self
+      def diff(obj1, obj2, options = {})
+        diffy = Diffy::Diff.new(
+          obj1.pretty_inspect,
+          obj2.pretty_inspect,
+          :diff => '-u'
+        )
+
+        out = diffy.to_s(options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+        out.gsub!(/^/, options[:indent]) if options[:indent]
+        out
+      end
+    end # of class methods
+  end
+end

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.2.9"
+  VERSION = "0.3.0.beta"
 end
 
 Version = Kelbim::VERSION

data/lib/kelbim/wrapper/elb-wrapper.rb

@@ -1,6 +1,3 @@
-require 'kelbim/wrapper/load-balancer-collection'
-require 'kelbim/ext/ec2-ext'
-
 module Kelbim
   class ELBWrapper
     def initialize(elb, options)

data/lib/kelbim/wrapper/listener-collection.rb

@@ -1,8 +1,3 @@
-require 'ostruct'
-require 'kelbim/wrapper/listener'
-require 'kelbim/wrapper/policy-collection'
-require 'kelbim/logger'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection

data/lib/kelbim/wrapper/listener.rb

@@ -1,8 +1,3 @@
-require 'forwardable'
-require 'kelbim/ext/elb-listener-ext'
-require 'kelbim/wrapper/policy-collection'
-require 'kelbim/logger'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection
@@ -32,8 +27,9 @@ module Kelbim
             def update(dsl)
               log(:info, 'Update Listener', :green, log_id)
 
-              compare_server_certificate(dsl) do
-                log(:info, "  set server_certificate=#{dsl.server_certificate}", :green)
+              compare_server_certificate(dsl) do |old_data, new_data|
+                log(:info, "  server_certificate:", :green)
+                log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
 
                 unless @options.dry_run
                   ss = @options.iam.server_certificates[dsl.server_certificate]
@@ -48,9 +44,11 @@ module Kelbim
               end
             end
 
-            def policies=(policy_list)
+            def update_policies(policy_list, old_policy_list)
+              old_data = old_policy_list.map {|i| i.name }.sort
+              new_data = policy_list.map {|i| i.name }.sort
               log(:info, 'Update Listener Policies', :green, log_id)
-              log(:info, '  set policies=' + policy_list.map {|i| i.name }.join(', '), :green)
+              log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
 
               unless @options.dry_run
                 @options.elb.client.set_load_balancer_policies_of_listener({
@@ -99,7 +97,7 @@ module Kelbim
               aws_server_certificate = @listener.server_certificate
               aws_server_certificate = aws_server_certificate.name if aws_server_certificate
               same = (aws_server_certificate == dsl.server_certificate)
-              yield if !same && block_given?
+              yield(aws_server_certificate, dsl.server_certificate) if !same && block_given?
               return same
             end
           end # Listener

data/lib/kelbim/wrapper/load-balancer-collection.rb

@@ -1,8 +1,3 @@
-require 'ostruct'
-require 'kelbim/wrapper/load-balancer'
-require 'kelbim/wrapper/listener-collection'
-require 'kelbim/logger'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection

data/lib/kelbim/wrapper/load-balancer.rb

@@ -1,7 +1,3 @@
-require 'forwardable'
-require 'kelbim/wrapper/listener-collection'
-require 'kelbim/logger'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection
@@ -69,8 +65,9 @@ module Kelbim
             end
           end
 
-          compare_health_check(dsl) do
-            log(:info, '  set health_check=' + dsl.health_check.inspect, :green)
+          compare_health_check(dsl) do |old_data, new_data|
+            log(:info, '  health_check:', :green)
+            log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
 
             unless @options.dry_run
               @load_balancer.configure_health_check(dsl.health_check)
@@ -78,8 +75,9 @@ module Kelbim
             end
           end
 
-          compare_attributes(dsl) do
-            log(:info, '  set attributes=' + dsl.attributes.inspect, :green)
+          compare_attributes(dsl) do |old_data, new_data|
+            log(:info, '  attributes:', :green)
+            log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
 
             unless @options.dry_run
               @load_balancer.attributes = dsl.attributes
@@ -120,9 +118,12 @@ module Kelbim
               end
             end
 
-            compare_security_groups(dsl) do |dsl_sg_ids|
+            compare_security_groups(dsl) do |aws_sg_ids, dsl_sg_ids|
               sg_names = @options.security_group_names[self.vpc_id] || {}
-              log(:info, '  apply security groups=' + dsl_sg_ids.map {|i| sg_names.fetch(i, i) }.join(', '), :green)
+              old_data = aws_sg_ids.map {|i| sg_names.fetch(i, i) }.sort
+              new_data = dsl_sg_ids.map {|i| sg_names.fetch(i, i) }.sort
+              log(:info, '  security groups:', :green)
+              log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
 
               unless @options.dry_run
                 @options.elb.client.apply_security_groups_to_load_balancer(
@@ -183,8 +184,10 @@ module Kelbim
         end
 
         def compare_health_check(dsl)
-          same = (@load_balancer.health_check.sort == dsl.health_check.sort)
-          yield if !same && block_given?
+          old_data = @load_balancer.health_check.sort
+          new_data = dsl.health_check.sort
+          same = (old_data == new_data)
+          yield(old_data, new_data) if !same && block_given?
           return same
         end
 
@@ -198,8 +201,10 @@ module Kelbim
             lb_attributes[key] = @load_balancer.attributes[key]
           end
 
-          same = (lb_attributes.sort == dsl.attributes.sort)
-          yield if !same && block_given?
+          old_data = lb_attributes.sort
+          new_data = dsl.attributes.sort
+          same = (old_data == new_data)
+          yield(lb_attributes, dsl.attributes) if !same && block_given?
           return same
         end
 
@@ -219,7 +224,7 @@ module Kelbim
           }.sort
 
           same = (aws_sg_ids == dsl_sg_ids)
-          yield(dsl_sg_ids) if !same && block_given?
+          yield(aws_sg_ids, dsl_sg_ids) if !same && block_given?
           return same
         end
 

data/lib/kelbim/wrapper/policy-collection.rb

@@ -1,9 +1,3 @@
-require 'ostruct'
-require 'kelbim/wrapper/policy'
-require 'kelbim/policy-types'
-require 'kelbim/logger'
-require 'uuid'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection

data/lib/kelbim/wrapper/policy.rb

@@ -1,7 +1,3 @@
-require 'forwardable'
-require 'kelbim/policy-types'
-require 'kelbim/logger'
-
 module Kelbim
   class ELBWrapper
     class LoadBalancerCollection
@@ -38,8 +34,16 @@ module Kelbim
                   log(:info, 'Delete Policy', :red, "#{@listener.log_id} > #{self.name}")
 
                   unless @options.dry_run
-                    @policy.delete
-                    @options.updated = true
+                    begin
+                      @policy.delete
+                      @options.updated = true
+                    rescue AWS::ELB::Errors::InvalidConfigurationRequest => e
+                      if e.message =~ /You cannot delete policy/
+                        # nothing to do
+                      else
+                        raise e
+                      end
+                    end
                   end
                 end
               end # Policy

data/lib/kelbim.rb

@@ -1,2 +1,48 @@
-require 'kelbim/version'
+require 'forwardable'
+require 'logger'
+require 'net/http'
+require 'ostruct'
+require 'pp'
+require 'set'
+require 'singleton'
+require 'socket'
+require 'timeout'
+
+require 'aws-sdk-v1'
+require 'diffy'
+require 'rspec'
+require 'rspec/core/formatters/progress_formatter'
+require 'term/ansicolor'
+require 'uuid'
+require 'hashie'
+
+require 'kelbim/ext/string-ext'
+require 'kelbim/ext/ec2-ext'
+require 'kelbim/ext/elb-listener-ext'
+require 'kelbim/ext/elb-load-balancer-ext'
+
+require 'kelbim/logger'
+require 'kelbim/utils'
+require 'kelbim/policy-types'
+require 'kelbim/dsl/checker'
+require 'kelbim/template_helper'
+
 require 'kelbim/client'
+require 'kelbim/dsl'
+require 'kelbim/dsl/attributes'
+require 'kelbim/dsl/converter'
+require 'kelbim/dsl/ec2'
+require 'kelbim/dsl/health-check'
+require 'kelbim/dsl/listener'
+require 'kelbim/dsl/listeners'
+require 'kelbim/dsl/load-balancer'
+require 'kelbim/exporter'
+require 'kelbim/tester'
+require 'kelbim/version'
+require 'kelbim/wrapper/elb-wrapper'
+require 'kelbim/wrapper/listener'
+require 'kelbim/wrapper/listener-collection'
+require 'kelbim/wrapper/load-balancer'
+require 'kelbim/wrapper/load-balancer-collection'
+require 'kelbim/wrapper/policy'
+require 'kelbim/wrapper/policy-collection'

metadata

@@ -1,125 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.59.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: uuid
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !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: 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: 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: 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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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-instafail
   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: Kelbim is a tool to manage ELB. It defines the state of ELB using DSL,
@@ -152,7 +180,9 @@ files:
 - lib/kelbim/logger.rb
 - lib/kelbim/policy-types.rb
 - lib/kelbim/rspec-formatter.rb
+- lib/kelbim/template_helper.rb
 - lib/kelbim/tester.rb
+- lib/kelbim/utils.rb
 - lib/kelbim/version.rb
 - lib/kelbim/wrapper/elb-wrapper.rb
 - lib/kelbim/wrapper/listener-collection.rb
@@ -171,17 +201,17 @@ 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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Kelbim is a tool to manage ELB.