capistrano-elb 0.3.8 → 0.4.0

data/README.md

@@ -18,6 +18,8 @@ then just
 
 This will instantiate an instance of the CapELB class and add hooks to remove/readd before/after deploys
 
+As of version 0.4.0 it looks for an 'elb' tag with value of the name of a loadbalancer to decide when to remove/readd servers.
+
 (Equivalent to having the following in your deploy.rb)
 
     require "capistrano-elb"
@@ -37,10 +39,6 @@ This will instantiate an instance of the CapELB class and add hooks to remove/re
         capELB.add servers
       end
 
-      task :save do
-        capELB.save_config
-      end
-
       task :check do 
         puts capELB.check_config
       end
@@ -49,11 +47,6 @@ This will instantiate an instance of the CapELB class and add hooks to remove/re
     before "deploy", "elb:remove"
     after "deploy", "elb:add"
 
-The first time you run it a record of the ELB setup is saved to config/lbs.yaml, you can check/update this with 
-    cap elb:check
-    cap elb:save
-    
-
 You can just require capistrano-elb and do whatever you want inside your deploy scripts of course
 
 If you want to hook after deploy but before the elb:add you can target 

data/lib/capistrano-elb.rb

@@ -3,12 +3,17 @@ require 'yaml'
 require 'capistrano'
 require 'pp'
 
+class Hash
+  def diff(h2)
+    dup.delete_if { |k, v| h2[k] == v }.merge!(h2.dup.delete_if { |k, v| has_key?(k) })
+  end
+end
+
 class CapELB
   def initialize(configdir=File.join(Dir.pwd, 'config'))
     ec2credentials = YAML::load(File.open(File.join(configdir, 'ec2credentials.yaml')))
     aws = Fog::Compute.new(ec2credentials.merge({:provider=>'AWS'}))
     @regions = aws.describe_regions.body["regionInfo"].map {|region| region["regionName"]}
-    @regions -= ['us-west-2']
     @compute = {}
     @regions.each do |region|
       @compute.merge!(region => Fog::Compute.new(ec2credentials.merge({:provider=>'AWS',:region=>region})))
@@ -19,40 +24,37 @@ class CapELB
       @elb.merge!(region => Fog::AWS::ELB.new(ec2credentials.merge(:region=>region)))
     end
     
-    @lbsfile = File.join(configdir, 'lbs.yaml') 
-    
-    @lbs = load_config
+    @lbs = config_from_tags
   end
   
-  def config_from_aws
+  def config_from_tags
     lbs = {}
     @regions.each do |region| 
-      loadBalancerDescriptions = 
-        @elb[region].describe_load_balancers.body["DescribeLoadBalancersResult"]["LoadBalancerDescriptions"]
-      loadBalancerDescriptions.each do |lb|
-        lbs.merge!({region => {lb["LoadBalancerName"] => lb["Instances"]}})
+      @elb[region].load_balancers.each do |lb|
+        lbs.merge!({region => {lb.id => get_instances(region,lb.id)}})
       end
     end
     lbs
   end
   
-  def save_config
-    File.open( @lbsfile, 'w' ) do |file|
-       YAML.dump( config_from_aws, file )
+  def config_from_lb
+    lbs = {}
+    @regions.each do |region| 
+      @elb[region].load_balancers.each do |lb|
+        lbs.merge!({region => {lb.id => lb.instances}})
+      end
     end
+    lbs
   end
   
-  def load_config
-    unless File.exists? @lbsfile
-       save_config
-     end
-    YAML::load(File.open(@lbsfile))
+  def get_instances(region,lbname)
+    @compute[region].tags.select{|tag| tag.key == 'elb' and tag.value==lbname}.map(&:resource_id)
   end
   
   def check_config
-    current = config_from_aws
+    current = config_from_lb
     errors = []
-    load_config.each_pair do |region,lbs|
+    @lbs.each_pair do |region,lbs|
       lbs.each_pair do |lbname, target_instances|
         missing = target_instances - current[region][lbname]
         extra = current[region][lbname] - target_instances

data/lib/capistrano-elb/tasks.rb

@@ -14,10 +14,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       capELB.add servers
     end
     
-    task :save do
-      capELB.save_config
-    end
-    
     task :check do 
       puts capELB.check_config
     end
@@ -25,5 +21,4 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   before "deploy", "elb:remove"
   after "deploy", "elb:add"
-  
 end

data/lib/capistrano-elb/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Elb
-    VERSION = "0.3.8"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-elb
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2152996680 !ruby/object:Gem::Requirement
+  requirement: &2154279140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152996680
+  version_requirements: *2154279140
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152995860 !ruby/object:Gem::Requirement
+  requirement: &2154278720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152995860
+  version_requirements: *2154278720
 description: Capistrano plugin for removing/readd servers to EC2 load balancers
 email:
 - tom.hall@forward.co.uk
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano-elb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Automagically remove/readd servers from EC2 load balancers as you cap deploy