kelbim 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31722ea70560259f840e6930f24b8c37e33fd5e8
-  data.tar.gz: b355daf0b127520c498c02af58dffe7b0aefd18d
+  metadata.gz: d76367e3e72459fcb48c7e7c2ac7644c91bfc2a8
+  data.tar.gz: 4fcd4b448eb952c926b96330d53a462de3e1daeb
 SHA512:
-  metadata.gz: 2c2141371eced944ce51727775ed9bd83784593e1b3131c35822d04c6985b9442b9ef36bb62ee5e6a28309fc6f5aa47c9dd974e7bd5e713a0d673111535f3ac9
-  data.tar.gz: bab991f93822e384c4e542bfdf6b682720aa4c642f7b3808a51e3d5f691d8a60bba42352a6d2973bcc77b2ca7633e86a8d875ea2e11d94a816ef338ac1a6ef74
+  metadata.gz: 344fa9f5496e7564195c040e9772091a6a9a608f57e6a1bc6bea44391cb295d32b67a17a9ba2067539b1c7e512b741be4124a5fd10cd4a2d7339b8c64187bebf
+  data.tar.gz: 9441923f6b77523ee48a530376438f3c35c7e28bc8b93e0500bc83f2188ebdb9e761916f4cd867eb3da2da2c92acdcc23f2faf6a7dc5f53f21ae39134d329f5d

data/README.md

@@ -4,7 +4,15 @@ Kelbim is a tool to manage ELB.
 
 It defines the state of ELB using DSL, and updates ELB according to DSL.
 
-**Attention! This is a alpha version!**
+[![Build Status](https://drone.io/bitbucket.org/winebarrel/kelbim/status.png)](https://drone.io/bitbucket.org/winebarrel/kelbim/latest)
+
+**Notice**
+
+It does not yet support the following load balancer policies:
+
+* ProxyProtocolPolicyType
+* BackendServerAuthenticationPolicyType
+* PublicKeyPolicyType
 
 ## Installation
 

data/bin/kelbim

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
+require 'fileutils'
 require 'json'
 require 'kelbim'
 require 'optparse'
 require 'rspec'
+require 'kelbim/rspec_formatter'
 
 DEFAULT_FILENAME = 'ELBfile'
 
@@ -35,6 +37,7 @@ ARGV.options do |opt|
     opt.on('-e', '--export')                  {|v| mode                              = :export              }
     opt.on('-o', '--output FILE')             {|v| output_file                       = v                    }
     opt.on('',   '--split')                   {|v| split                             = true                 }
+    opt.on('',   '--split-more')              {|v| split                             = :more                }
     opt.on('-t', '--test')                    {|v| mode                              = :test                }
     opt.on('',   '--show-load-balancers')     {|v| mode                              = :show_load_balancers }
     opt.on('',   '--show-policies')           {|v| mode                              = :show_policies       }
@@ -83,13 +86,29 @@ begin
 
       client.export do |exported, converter|
         exported.each do |vpc, elbs|
-          elb_file = File.join(File.dirname(output_file), "#{vpc || :classic}.elb")
-          requires << elb_file
+          if split == :more
+            elb_dir = File.join(File.dirname(output_file), "#{vpc || :classic}")
+            FileUtils.mkdir_p(elb_dir)
 
-          logger.info("  write `#{elb_file}`")
+            elbs.each do |name, attrs|
+              elb_file = File.join(elb_dir, "#{name}.elb")
+              requires << elb_file
 
-          open(elb_file, 'wb') do |f|
-            f.puts converter.call(vpc => elbs)
+              logger.info("  write `#{elb_file}`")
+
+              open(elb_file, 'wb') do |f|
+                f.puts converter.call(vpc => {name => attrs})
+              end
+            end
+          else
+            elb_file = File.join(File.dirname(output_file), "#{vpc || :classic}.elb")
+            requires << elb_file
+
+            logger.info("  write `#{elb_file}`")
+
+            open(elb_file, 'wb') do |f|
+              f.puts converter.call(vpc => elbs)
+            end
           end
         end
       end
@@ -127,8 +146,13 @@ begin
       raise "No ELBfile found (looking for: #{file})"
     end
 
+    RSpec.configure do |config|
+      config.color_enabled = options[:color]
+      config.output_stream = $stdout # formatterをセットする前に設定…
+      config.formatter = Kelbim::RSpecFormatter
+    end
+
     logger.info("Test `#{file}`")
-    RSpec.configuration.color_enabled = options[:color]
     client.test(file)
   when :show_load_balancers
     puts JSON.pretty_generate(client.load_balancers)

data/lib/kelbim/client.rb

@@ -123,7 +123,7 @@ module Kelbim
         if ec2_aws
           walk_ec2(vpc, ec2_dsl, ec2_aws, elb.load_balancers)
         else
-          log(:warn, "EC2 `#{vpc || :classic}` is not found", :yellow)
+          walk_ec2(vpc, ec2_dsl, [], elb.load_balancers)
         end
       end
 
@@ -145,6 +145,9 @@ module Kelbim
       end
 
       lb_list_dsl.each do |key, lb_dsl|
+        name = key[0]
+        log(:info, "Comparing #{vpc || :classic} > #{name}", :intense_black)
+
         lb_aws = lb_list_aws.delete(key)
         walk_load_balancer(lb_dsl, lb_aws)
       end
@@ -233,13 +236,13 @@ module Kelbim
         old_policies << plcy_aws
       end
 
-      if not new_policies.empty? and orig_policy_names.sort != new_policies.map {|i| i.name }.sort
+      if orig_policy_names.sort != new_policies.map {|i| i.name }.sort
         listener.policies = new_policies
+      end
 
-        unless @options.without_deleting_policy
-          old_policies.each do |plcy_aws|
-            plcy_aws.delete
-          end
+      if not old_policies.empty? and not @options.without_deleting_policy
+        old_policies.each do |plcy_aws|
+          plcy_aws.delete
         end
       end
     end

data/lib/kelbim/dsl/converter.rb

@@ -119,7 +119,7 @@ end
 
       def output_instances(instances, vpc)
         if instances.empty?
-          instances = '# not registered'
+          instances = '# no instances'
         else
           instance_id_names = @instance_names[vpc] || {}
 

data/lib/kelbim/dsl/ec2.rb

@@ -8,7 +8,6 @@ module Kelbim
       attr_reader :result
 
       def initialize(vpc, load_balancers, &block)
-        @names = []
         @error_identifier = "EC2 `#{vpc || :classic}`"
 
         @result = OpenStruct.new({
@@ -16,6 +15,7 @@ module Kelbim
           :load_balancers => load_balancers,
         })
 
+        @names = load_balancers.map {|i| i.name }
         instance_eval(&block)
       end
 

data/lib/kelbim/rspec_formatter.rb

@@ -0,0 +1,22 @@
+require 'rspec'
+require 'rspec/core/formatters/progress_formatter'
+
+module Kelbim
+  class RSpecFormatter < RSpec::Core::Formatters::ProgressFormatter
+    def dump_failure_info(example)
+      exception = example.execution_result[:exception]
+
+      if exception.message
+        line = exception.message.to_s.split("\n").first
+        line.sub!(/\s*with backtrace:\s*/, '')
+        output.puts "#{long_padding}#{failure_color(line)}"
+      end
+    end
+
+    def dump_backtrace(example)
+    end
+
+    def dump_commands_to_rerun_failed_examples
+    end
+  end # RSpecFormatter
+end # Kelbim

data/lib/kelbim/tester.rb

@@ -2,7 +2,6 @@ require 'rspec'
 require 'net/http'
 require 'socket'
 require 'timeout'
-require 'kelbim/ext/base_text_formatter-ext'
 require 'kelbim/logger'
 
 module Kelbim

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end
 
 Version = Kelbim::VERSION

data/lib/kelbim/wrapper/listener.rb

@@ -33,7 +33,7 @@ module Kelbim
               log(:info, 'Update Listener', :green, log_id)
 
               compare_server_certificate(dsl) do
-                log(:info, "  set server_certificate=#{dsl.server_certificate ? dsl.server_certificate.name : nil.inspect}", :green)
+                log(:info, "  set server_certificate=#{dsl.server_certificate}", :green)
 
                 unless @options.dry_run
                   ss = @options.iam.server_certificates[dsl.server_certificate]

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

@@ -29,7 +29,7 @@ module Kelbim
             :id           => "<new load balancer name=#{dsl.name}>",
             :name         => dsl.name,
             :vpc_id       => vpc,
-            :instances    => dsl.instances,
+            :instances    => [], # instancesはLoadBalancerの処理で更新
             :scheme       => dsl.scheme,
             :listeners    => dsl.listeners.map {|i| LoadBalancer::ListenerCollection.create_mock_listener(i, @load_balancer) },
             :health_check => {}, # health_checkはLoadBalancerの処理で更新
@@ -48,7 +48,7 @@ module Kelbim
             :listeners => [],
           }
 
-          opts[:instances] = dsl.instances unless dsl.instances.empty?
+          # instancesはLoadBalancerの処理で更新
 
           dsl.listeners.each do |lstnr|
             lstnr_opts = LoadBalancer::ListenerCollection.create_listener_options(lstnr, @options.iam)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,13 +143,13 @@ files:
 - lib/kelbim/dsl/load-balancer.rb
 - lib/kelbim/dsl.rb
 - lib/kelbim/exporter.rb
-- lib/kelbim/ext/base_text_formatter-ext.rb
 - lib/kelbim/ext/ec2-ext.rb
 - lib/kelbim/ext/elb-listener-ext.rb
 - lib/kelbim/ext/elb-load-balancer-ext.rb
 - lib/kelbim/ext/string-ext.rb
 - lib/kelbim/logger.rb
 - lib/kelbim/policy-types.rb
+- lib/kelbim/rspec_formatter.rb
 - lib/kelbim/tester.rb
 - lib/kelbim/version.rb
 - lib/kelbim/wrapper/elb-wrapper.rb

data/lib/kelbim/ext/base_text_formatter-ext.rb

@@ -1,26 +0,0 @@
-require 'rspec'
-require 'rspec/core/formatters/base_text_formatter'
-
-module RSpec
-  module Core
-    module Formatters
-      class BaseTextFormatter < BaseFormatter
-        def dump_failure_info(example)
-          exception = example.execution_result[:exception]
-
-          if exception.message
-            line = exception.message.to_s.split("\n").first
-            line.sub!(/\s*with backtrace:\s*/, '')
-            output.puts "#{long_padding}#{failure_color(line)}"
-          end
-        end
-
-        def dump_backtrace(example)
-        end
-
-        def dump_commands_to_rerun_failed_examples
-        end
-      end # BaseTextFormatter
-    end # Formatters
-  end # Core
-end # RSpec