roadworker 0.5.9.beta4 → 0.5.9.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf24a5904380dd9b9c571ceaa336786ed36835b
-  data.tar.gz: b46d1ae0f3daa8f0c134adbbd16bfe7c4c45f7e0
+  metadata.gz: d74f6860010879a7fbd98866c9ff2915a8b392a7
+  data.tar.gz: 4a46f9a63ff010a97f613168d51116c9d79341b2
 SHA512:
-  metadata.gz: e4b165d6099e0c215fd74ed3a0ee0ee3da41bda6dc01f1622bf022473f66f3a6eb798f5c1ac3d3420d3fddfdd3dbd0b3d41c46441925de688f9178f0ed60addf
-  data.tar.gz: 22e2c43901cc634d52131918824f81daa067a7e63e4d0d410b823e1e1d35da6ea4d121419bd3b88746714207ccc4c4eb2601c4cc940bf7f1e33584788837b284
+  metadata.gz: 30198c307930eb489d90138ecb6f8ea012940a26db4905f38e1e1982e452627a8003bd161dc55292f200a13ff494ce5b9521a21200dfcef4fb779c8510132159
+  data.tar.gz: 9335b7bf22ce6bc0e918e9763bd565017f9d7c89f44dce1ea2a40c0c9871c657ec24c80b4f9966965403fa55f3df45631427915f46f7a83966bb8818ecd583e8

data/lib/roadworker/client.rb

@@ -63,8 +63,8 @@ module Roadworker
     end
 
     def walk_hosted_zones(dsl)
-      expected = collection_to_hash(dsl.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id)] }
-      actual   = collection_to_hash(@route53.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id)] }
+      expected = collection_to_hash(dsl.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id).sort] }
+      actual   = collection_to_hash(@route53.hosted_zones) {|i| [normalize_name(i.name), i.vpcs.map(&:vpc_id).sort] }
 
       expected.each do |keys, expected_zone|
         name = keys[0]
@@ -143,7 +143,7 @@ module Roadworker
         if expected_zone.ignore_patterns.any? { |pattern| pattern === name }
           next
         end
-        
+
         record.delete
       end
     end

data/lib/roadworker/route53-wrapper.rb

@@ -218,6 +218,10 @@ module Roadworker
           actual = actual.sort_by {|i| i.to_s } if actual.kind_of?(Array)
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
+          if attribute == :geo_location and actual
+            actual = Hash[actual.each_pair.select {|k, v| not v.nil? }]
+          end
+
           if !expected and !actual
             true
           elsif expected and actual

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.9.beta4"
+  VERSION = "0.5.9.beta5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.9.beta4
+  version: 0.5.9.beta5
 platform: ruby
 authors:
 - winebarrel