kelbim 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72724c20ce7d6b2ffe1a5fe2fed4cbf8f396d837
-  data.tar.gz: d2d5b6aa164862a296815658f253dc75e97d34db
+  metadata.gz: 04d4c853c7425e98afd1041b5fed2a4f89bad141
+  data.tar.gz: 32fd2090817185faa83916511b7bc1c476f81401
 SHA512:
-  metadata.gz: 970a1ec948939dbaa1d3fa1505542f3db07472538c9eef488d59efbcb77a7e5214edeb3bbfad9575dbaf711c33c74e69a8c67fae3ebd742442a88bcfae39179b
-  data.tar.gz: b4e0b65eeaaa748530b6f0b6c9e8842665c126e5acde1588b654d214e596f8e6cf59adbcbc40288970cde48c4e0f4c77246cc78c936ea073dcecc4568b1c76ee
+  metadata.gz: ee179bd28ca6b0021e3c23fa560014d695a27aaac2226652bfe2193e4141be922eae7b9a4da81491ba68fdd64c171374da04661e8f69f23b93bc105dec88245f
+  data.tar.gz: 0cd47fe00fd776bea9c602dac1de57215675fae6d72041ed201ddf32785fca0169fbe39b8674f816b6bf8be561ff5d7693f493a89347e9c95f98567d519a2229

data/README.md

@@ -4,6 +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)
 [![Build Status](https://drone.io/bitbucket.org/winebarrel/kelbim/status.png)](https://drone.io/bitbucket.org/winebarrel/kelbim/latest)
 
 **Notice**
@@ -137,6 +138,3 @@ Test `ELBfile`
 Finished in 3.16 seconds
 3 examples, 0 failures
 ```
-
-## Link
-* [RubyGems.org site](http://rubygems.org/gems/kelbim)

data/bin/kelbim

@@ -86,7 +86,7 @@ begin
       output_file = DEFAULT_FILENAME if output_file == '-'
       requires = []
 
-      client.export(options[:elb_names]) do |exported, converter|
+      client.export(options) do |exported, converter|
         exported.each do |vpc, elbs|
           if split == :more
             elb_dir = File.join(File.dirname(output_file), "#{vpc || :classic}")
@@ -127,10 +127,10 @@ begin
     else
       if output_file == '-'
         logger.info('# Export ELB')
-        puts client.export(options[:elb_names])
+        puts client.export(options)
       else
         logger.info("Export ELB to `#{output_file}`")
-        open(output_file, 'wb') {|f| f.puts client.export(options[:elb_names]) }
+        open(output_file, 'wb') {|f| f.puts client.export(options) }
       end
     end
   when :apply

data/lib/kelbim/client.rb

@@ -74,12 +74,12 @@ module Kelbim
       return retval
     end
 
-    def export(elb_names = nil)
+    def export(opts = {})
       exported = nil
       instance_names = nil
 
       AWS.memoize do
-        exported = Exporter.export(@options.elb, :elb_names => elb_names)
+        exported = Exporter.export(@options.elb, opts)
         instance_names = @options.ec2.instance_names
       end
 

data/lib/kelbim/exporter.rb

@@ -11,14 +11,22 @@ module Kelbim
 
     def initialize(elb, options = {})
       @elb = elb
-      @fetch_policies = options[:fetch_policies]
-      @elb_names = options[:elb_names]
+      @options = options
     end
 
     def export
       result = {}
       lbs = @elb.load_balancers
-      lbs = @elb_names.map {|i| lbs[i] } if @elb_names
+
+      ec2s = @options[:ec2s]
+      elb_names = @options[:elb_names]
+
+      if ec2s or elb_names
+        lbs = lbs.select do |lb|
+          (ec2s.nil? or ec2s.include?(lb.vpc_id || 'classic')) &&
+          (elb_names.nil? or elb_names.include?(lb.name))
+        end
+      end
 
       lbs.each do |lb|
         result[lb.vpc_id] ||= {}
@@ -39,7 +47,7 @@ module Kelbim
         :attributes   => load_balancer.attributes,
       }
 
-      if @fetch_policies and load_balancer.policies.first
+      if @options[:fetch_policies] and load_balancer.policies.first
         attrs[:policies] = h = {}
         load_balancer.policies.each {|i| h[i.name] = i.type }
       end

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end
 
 Version = Kelbim::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Kelbim is a tool to manage ELB.