capistrano-elb 0.2.6 → 0.3

data/lib/capistrano-elb/tasks.rb

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

data/lib/capistrano-elb.rb

@@ -2,7 +2,6 @@ require 'fog'
 require 'yaml'
 require 'capistrano'
 require 'pp'
-# require "dir"
 
 class CapELB
   def initialize(configdir=File.join(Dir.pwd, 'config'))
@@ -51,7 +50,17 @@ class CapELB
   end
   
   def check_config
-    load_config == config_from_aws
+    current = config_from_aws
+    errors = []
+    load_config.each_pair do |region,lbs|
+      lbs.each_pair do |lbname, target_instances|
+        missing = target_instances - current[region][lbname]
+        extra = current[region][lbname] - target_instances
+        errors << "#{missing} are missing from #{region}/#{lbname}" unless missing.empty?
+        errors << "#{extra} should not be in #{region}/#{lbname}" unless extra.empty?
+      end
+    end
+    puts (errors.empty? ? "ELB config correct" : errors) 
   end
   
   def add(serverlist)
@@ -74,7 +83,4 @@ class CapELB
       end
     end
   end
-end
-
-
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-elb
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2157491880 !ruby/object:Gem::Requirement
+  requirement: &2154202580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157491880
+  version_requirements: *2154202580
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &2157491320 !ruby/object:Gem::Requirement
+  requirement: &2154202140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157491320
+  version_requirements: *2154202140
 description: Automagically remove/readd servers from EC2 load balancers as you cap
   deploy
 email: tom.hall@forward.co.uk