capistrano-elb 0.3.3 → 0.3.4

data/README.md

@@ -6,17 +6,20 @@ gem install capistrano-elb
 
 ## Usage
 You should have ec2credentials.yaml in the same directory as your cap files
+
     #ec2credentials.yaml
     --- 
     :aws_access_key_id: YOUR_KEY_ID_
     :aws_secret_access_key: YOUR_KEY
 
 then just 
+    
     require "capistrano-elb/tasks"
 
 This will instantiate an instance of the CapELB class and add hooks to remove/readd before/after deploys
 
 (Equivalent to having the following in your deploy.rb)
+
     require "capistrano-elb"
     
     namespace :elb do

data/lib/capistrano-elb/tasks.rb

@@ -6,13 +6,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     task :remove do 
       servers = roles[:web].servers.map {|server| server.host}
-      puts "Removing #{servers} from ELB"
       capELB.remove servers
     end
 
     task :add do 
       servers = roles[:web].servers.map {|server| server.host}
-      puts "Adding #{servers} to ELB"
       capELB.add servers
     end
     

data/lib/capistrano-elb/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Elb
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/lib/capistrano-elb.rb

@@ -64,22 +64,27 @@ class CapELB
   end
   
   def add(serverlist)
-    each_server_by_lbs(serverlist) do |region, lbname, servers|
-      region.register_instances_with_load_balancer(servers, lbname)
+    @lbs.each_pair do |region, lbs|
+      lbs.each_pair do |lbname, target_instances|
+        server_ids = @compute[region].servers.select{|server| serverlist.include? server.dns_name}.map{|server| server.id}
+        to_change = server_ids.select{|server_id| target_instances.include? server_id}
+        unless to_change.empty?
+          puts "Adding #{to_change} to LB #{lbname} in #{region}" 
+          @elb[region].register_instances_with_load_balancer(to_change, lbname) 
+        end
+      end
     end
   end
   
   def remove(serverlist)
-    each_server_by_lbs(serverlist) do |region, lbname, servers|
-      region.deregister_instances_from_load_balancer(servers, lbname)
-    end
-  end
-  
-  def each_server_by_lbs(serverlist)
     @lbs.each_pair do |region, lbs|
       lbs.each_pair do |lbname, target_instances|
-        to_change = @compute[region].servers.select{|server| serverlist.include? server.dns_name}.map{|server| server.id}
-        yield(@elb[region], lbname, to_change) unless to_change.empty?
+        server_ids = @compute[region].servers.select{|server| serverlist.include? server.dns_name}.map{|server| server.id}
+        to_change = server_ids.select{|server_id| target_instances.include? server_id}
+        unless to_change.empty?
+          puts "Removing #{to_change} from LB #{lbname} in #{region}"        
+          @elb[region].deregister_instances_from_load_balancer(to_change, lbname)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-elb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2157705880 !ruby/object:Gem::Requirement
+  requirement: &2161737060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157705880
+  version_requirements: *2161737060
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &2157705460 !ruby/object:Gem::Requirement
+  requirement: &2161736640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157705460
+  version_requirements: *2161736640
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157705040 !ruby/object:Gem::Requirement
+  requirement: &2161736220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157705040
+  version_requirements: *2161736220
 description: Capistrano plugin for removing/readd servers to EC2 load balancers
 email:
 - tom.hall@forward.co.uk