elbping 0.0.14 → 0.0.15

data/README.md

@@ -1,5 +1,7 @@
 # elbping
 
+[![Gem Version](https://badge.fury.io/rb/elbping.png)](http://badge.fury.io/rb/elbping)
+
 [![Build Status](https://travis-ci.org/chooper/elbping.png?branch=master)](https://travis-ci.org/chooper/elbping)
 
 `elbping` is a tool to ping all of the nodes that make up an Amazon Elastic

data/elbping.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'elbping'
-  s.version       = '0.0.14'
+  s.version       = '0.0.15'
   s.date          = '2013-08-13'
   s.summary       = "Small tool to 'ping' the nodes that make up an Amazon Elastic Load Balancer"
   s.description   = "elbping is a tool to ping all of the nodes behind an Amazon Elastic Load Balancer. It only works for ELBs in HTTP mode and works by triggering an HTTP 405 (METHOD NOT ALLOWED) error caused when the ELB receives a HTTP verb that is too long."

data/lib/elbping/resolver.rb

@@ -1,4 +1,3 @@
-
 require 'resolv'
 require 'elbping/tcp_dns.rb'
 
@@ -19,7 +18,7 @@ module ElbPing
     # * ArgumentError
 
     def self.find_elb_ns(target, timeout=5)
-      resp = nil
+      resp = []
 
       unless target.end_with? ".elb.amazonaws.com"
         raise ArgumentError, "Not an Amazon ELB hostname"
@@ -28,11 +27,17 @@ module ElbPing
       Timeout::timeout(timeout) do
         Resolv::DNS.open do |sysdns|
           resp = sysdns.getresources target, Resolv::DNS::Resource::IN::NS
-          unless resp
-            raise ArgumentError, "Could not find Amazon nameserver for ELB"
-          end
         end
-        nameservers = resp.map { |ns| ns.name.to_s }
+      end
+
+      if resp.empty?
+        parent = target.split(".")[1..-1].join('.')
+        if parent.empty?
+          raise ArgumentError, "Could not find Amazon nameserver for ELB"
+        end
+        find_elb_ns(parent, timeout)
+      else
+        resp.map { |ns| ns.name.to_s }
       end
     end
 
@@ -53,7 +58,7 @@ module ElbPing
       resp = nil
 
       unless target.end_with? ".elb.amazonaws.com"
-        Timeout::timeout(timeout) do 
+        Timeout::timeout(timeout) do
           Resolv::DNS.open do |sysdns|
             resp = sysdns.getresources target, Resolv::DNS::Resource::IN::CNAME
             cname = resp[0].name.to_s if resp and resp.size > 0
@@ -64,10 +69,10 @@ module ElbPing
 
       nameservers = find_elb_ns target, timeout
 
-      Timeout::timeout(timeout) do 
+      Timeout::timeout(timeout) do
         TcpDNS.open :nameserver => nameservers, :search => '', :ndots => 1 do |dns|
           # TODO: Exceptions
-          resp = dns.getresources target, Resolv::DNS::Resource::IN::ANY
+          resp = dns.getresources "all.#{target}", Resolv::DNS::Resource::IN::A
         end
       end
       if resp

data/lib/elbping/tcp_dns.rb

@@ -38,7 +38,7 @@ class TcpDNS < Resolv::DNS
         end
       }
     ensure
-      requester.close
+      requester.close unless requester.nil?
     end
   end
 end

data/test/test_resolver.rb

@@ -1,9 +1,6 @@
-
 require 'test/unit'
 require 'elbping/resolver.rb'
 
-DEFAULT_GOOD_ELB = ENV['TEST_GOOD_ELB'] || 'test-elb-868888812.us-east-1.elb.amazonaws.com' # feels dirty
-
 class TestResolver< Test::Unit::TestCase
   def test_bad_queries
     ["fake.amazonaws.com", "google.com", "nxdomain.asdf"].each { |tgt|
@@ -15,9 +12,11 @@ class TestResolver< Test::Unit::TestCase
 
   # This might still fail from time to time :-\ Been seeing lots of failures to connect to AWS DNS
   def test_good_query
+    return nil unless ENV['TEST_GOOD_ELB']
+
     resp = nil
     assert_nothing_raised do
-      resp = ElbPing::Resolver.find_elb_nodes(DEFAULT_GOOD_ELB)
+      resp = ElbPing::Resolver.find_elb_nodes(ENV['TEST_GOOD_ELB'])
     end
     # I don't actually care what the results are, only that they are a list
     assert_equal resp.class, Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elbping
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -79,8 +79,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Small tool to 'ping' the nodes that make up an Amazon Elastic Load Balancer
-test_files: []
+test_files:
+- test/test_latencybucket.rb
+- test/test_pinger.rb
+- test/test_resolver.rb
+- test/test_stats.rb
+- test/test_tests.rb