roadworker 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3665677e4511d16efbe94f88b4be369f6e5cde
-  data.tar.gz: b61a6cf8b695aa77a9334ccb3353077f860eb3fb
+  metadata.gz: 07906e386dc67f026a0254434e4ed1886d7e17fa
+  data.tar.gz: 79b3f49f6310a454308cd7e404c0765b2b874ff2
 SHA512:
-  metadata.gz: 1a214364df43143a33b4977c2f79bd348b87ea9e1f5b9198f771304ba307d2d181c1bcf390059014e889d11f6bca17ea52c69c437fa32a139abd3d29c6128642
-  data.tar.gz: 87707077040830d1627d45611d2b3cad50a168ce094353ab1ec9354783581c3b387ec3330d11df44f74d049659212693e59dc7083c6941fa6197921346efa078
+  metadata.gz: d7015d50b5d4bec4b90af58ed0df164dba4c891fa3758840e89fe094c81216a2f9ca23e161773911a475b52ff08cae5b6cb0a281fba1f38edb987ff66273cb11
+  data.tar.gz: 796388785e2fc76779aaa68c9bbed2703555cb1a93251fd33e2010866be6f3023a3027ac52d799d69e390df8f5e3172a5a2b6cf17db06a4b2a00a2178a9b848e

data/lib/roadworker/dsl-tester.rb

@@ -80,7 +80,7 @@ module Roadworker
 
           is_valid = rrs.any? {|record|
             expected_value = (record.resource_records || []).map {|i| i[:value].strip }.sort
-            expected_ttl = record.dns_name ? 60 : record.ttl
+            expected_ttl = fetch_dns_name(record.dns_name) ? 60 : record.ttl
 
             actual_value = response.answer.map {|i| (%w(TXT SPF).include?(type) ? i.txt : i.value).strip }.sort
             actual_ttls = response.answer.map {|i| i.ttl }
@@ -95,7 +95,7 @@ module Roadworker
               actual_value = actual_value.map {|i| i.strip }
             end
 
-            expected_message = record.resource_records ? expected_value.map {|i| "#{i}(#{expected_ttl})" }.join(',') : "#{record.dns_name}(#{expected_ttl})"
+            expected_message = record.resource_records ? expected_value.map {|i| "#{i}(#{expected_ttl})" }.join(',') : "#{fetch_dns_name(record.dns_name)}(#{expected_ttl})"
             actual_message = actual_value.zip(actual_ttls).map {|v, t| "#{v}(#{t})" }.join(',')
             logmsg_expected = "expected=#{expected_message}"
             logmsg_actual = "actual=#{actual_message}"
@@ -103,9 +103,9 @@ module Roadworker
 
             is_same = false
 
-            if record.dns_name
+            if fetch_dns_name(record.dns_name)
               # A(Alias)
-              case record.dns_name.sub(/\.\Z/, '')
+              case fetch_dns_name(record.dns_name).sub(/\.\Z/, '')
               when /\.elb\.amazonaws\.com/i
                 is_same = response.answer.all? {|a|
                   response_query_ptr = query(a.value, 'PTR', error_messages)
@@ -128,7 +128,7 @@ module Roadworker
                     log(:debug, 'Retry Check', :white, "#{name} #{type}")
                   end
 
-                  dns_name_a = query(record.dns_name, 'A', error_messages)
+                  dns_name_a = query(fetch_dns_name(record.dns_name), 'A', error_messages)
                   s3_website_endpoint_ips = dns_name_a.answer.map {|i| i.value }
 
                   !s3_website_endpoint_ips.empty? && s3_website_endpoint_ips.any? {|ip|
@@ -146,13 +146,13 @@ module Roadworker
                   end
                 }
               else
-                if (alias_target_a_record = a_records[record.dns_name])
+                if (alias_target_a_record = a_records[fetch_dns_name(record.dns_name)])
                   expected_message = alias_target_a_record.map {|values, ttl| values.map {|i| "#{i}(#{ttl})" }.join(',') }.uniq.join (' or ')
                   logmsg_expected = "expected=#{expected_message}"
                   expected_ttl = alias_target_a_record.map {|values, ttl| ttl }.max
                   is_same = alias_target_a_record.any? {|values, ttl| values == actual_value }
                 else
-                  warning_messages << "#{name} #{type}: Cannot check `#{record.dns_name}`"
+                  warning_messages << "#{name} #{type}: Cannot check `#{fetch_dns_name(record.dns_name)}`"
                   is_same = true
                 end
               end
@@ -299,6 +299,13 @@ module Roadworker
         print 'F'.intense_red unless @options.debug
       end
 
+      def fetch_dns_name(dns_name)
+        if dns_name
+          dns_name.first
+        else
+          nil
+        end
+      end
     end # Tester
   end # DSL
 end # Roadworker

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,4 +184,3 @@ signing_key:
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.
 test_files: []
-has_rdoc: