dnstraverse 0.1.1 → 0.1.2

data/bin/dnstraverse

@@ -56,7 +56,7 @@ def progress_main(args)
   stage = args[:stage]
   return if r.refid.empty?
   case stage
-    when :answer then
+  when :answer then
     if o[:verbose] then
       for warning in r.warnings do
         puts "#{r.refid} WARNING: #{warning}"
@@ -65,15 +65,15 @@ def progress_main(args)
     if o[:allstats] then
       r.stats_display(:prefix => "#{r.refid} Results:", :results => false)
     end
-    when :start then
+  when :start then
     print o[:verbose] ? referral_txt_verbose(r) : referral_txt_normal(r)
     if r.serverips.nil? then
       print " -- resolving"
     end
     print "\n"
-    when :answer_fast then
+  when :answer_fast then
     print o[:verbose] ? referral_txt_verbose(r) : referral_txt_normal(r)
-    puts " -- completed earlier"
+    puts " -- completed earlier (#{r.replaced_by.refid})"
   end
 end
 
@@ -82,10 +82,10 @@ def progress_resolves(args)
   r = args[:referral]
   stage = args[:stage]
   case stage
-    when :start then
+  when :start then
     print o[:verbose] ? referral_txt_verbose(r) : referral_txt_normal(r)
     print "\n"
-    when :answer_fast then
+  when :answer_fast then
     print o[:verbose] ? referral_txt_verbose(r) : referral_txt_normal(r)
     puts " -- completed earlier"
   end

data/lib/dnstraverse/fingerprint.rb

@@ -55,18 +55,24 @@ module DNSTraverse
         next unless id =~ /#{rule[:fingerprint]}/
         if rule.has_key?(:result) then
           result = rule[:result]
+          if result.is_a? String
+            ref[:state] = rule[:result]
+            ref[:error] = rule[:result]
+            ref[:id] = id
+            return ret
+          end
           for k in [:vendor, :product, :option] do
             ret[k] = result[k] if result.has_key?(k) and result[k].length > 0
           end
           case @version_style
-            when :none
+          when :none
             ret[:version] = result[:version]
-            when :append
+          when :append
             ver = query_version(ip, result[:qv])
             ver = query_version(ip, "version.bind") unless ver
             ret[:version] = result[:version]
             ret[:version]+= " (#{ver})" if ver
-            when :override
+          when :override
             ver = query_version(ip, result[:qv])
             ver = query_version(ip, "version.bind") unless ver
             ret[:version] = ver ? ver : result[:version]

data/lib/dnstraverse/referral.rb

@@ -31,6 +31,7 @@ module DNSTraverse
     attr_reader :decoded_query_cache
     attr_reader :responses
     attr_reader :stats
+    attr_accessor :replaced_by
     
     EMPTY_ARRAY = [].freeze
     
@@ -437,6 +438,7 @@ module DNSTraverse
     end
     
     def replace_child(before, after)
+      before.replaced_by = after
       @children.each_key do | ip |
         @children[ip].map! { |c| c.equal?(before) ? after : c }
       end

data/lib/dnstraverse/traverser.rb

@@ -195,9 +195,12 @@ module DNSTraverse
           stack.push(*referrals.reverse)
           next
         end
-        # get Referral objects, place on stack with placeholder
+        # put a placeholder on the stack
         stack << r << :calc_answer
+        # get the children
         children = r.process({})
+        # now report progress.  we already can tell whether this will be
+        # completed in fast mode or not, so we report this information
         children.each do |c|
           if @fast
             key = "#{c.qname}:#{c.qclass}:#{c.qtype}:#{c.server}:#{c.txt_ips_verbose}".downcase!
@@ -207,6 +210,7 @@ module DNSTraverse
           end
           report_progress c, :stage => stage
         end
+        # push the children on the stack
         stack.push(*children.reverse)
       end
     end

data/lib/dnstraverse/version.rb

@@ -2,7 +2,7 @@ module DNSTraverse
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dnstraverse
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Ponder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 +01:00
+date: 2011-07-31 00:00:00 +01:00
 default_executable: dnstraverse
 dependencies: 
 - !ruby/object:Gem::Dependency