passive-dns 0.2.0 → 0.2.1

data/lib/pdns/bfkclient.rb

@@ -29,7 +29,7 @@ module PassiveDNS
 							######### FIX BLANKS FOR MX
 							
 					end
-					res << PDNSResult.new('BFK',response_time,r[0],r[2],r[1],nil,nil,nil)
+					res << PDNSResult.new('BFK',response_time,r[0],r[2],r[1])
 				end
 			end
 			res

data/lib/pdns/iscpdns.rb

@@ -35,9 +35,9 @@ module PassiveDNS
 				record['rdata'] = [record['rdata']] if record['rdata'].class == String
 				record['rdata'].each do |rdata|
 					if record['time_first']
-						res << PDNSResult.new('ISC',response_time,record['rrname'],rdata,record['rrtype'],0,Time.at(record['time_first'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),Time.at(record['time_last'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"))
+						res << PDNSResult.new('ISC',response_time,record['rrname'],rdata,record['rrtype'],0,Time.at(record['time_first'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),Time.at(record['time_last'].to_i).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),record['count'])
 					else
-						res << PDNSResult.new('ISC',response_time,record['rrname'],rdata,record['rrtype'],nil,nil,nil)
+						res << PDNSResult.new('ISC',response_time,record['rrname'],rdata,record['rrtype'])
 					end
 				end
 			end
@@ -70,6 +70,7 @@ module PassiveDNS
 				t1 = Time.now
 				response = http.request(request)
 				t2 = Time.now
+				$stderr.puts response if @debug
 				parse_json(response.body,t2-t1)
 			}
 		rescue Timeout::Error => e

data/lib/pdns/pdns.rb

@@ -11,7 +11,7 @@ require 'getoptlong'
 require 'sqlite3'
 
 module PassiveDNS
-	class PDNSResult < Struct.new(:source, :response_time, :query, :answer, :rrtype, :ttl, :firstseen, :lastseen); end
+	class PDNSResult < Struct.new(:source, :response_time, :query, :answer, :rrtype, :ttl, :firstseen, :lastseen, :count); end
 	class PDNSQueueEntry < Struct.new(:query, :state, :level); end
 	class PDNSToolState
 		attr_accessor :debug

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Chris Lee
@@ -36,13 +36,14 @@ cert_chain:
   6yhklP75
   -----END CERTIFICATE-----
 
-date: 2012-03-19 00:00:00 -04:00
+date: 2012-07-17 00:00:00 -04:00
 default_executable: pdnstool
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: json
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -51,13 +52,12 @@ dependencies:
         - 4
         - 3
         version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: sqlite3
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -66,69 +66,64 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
+        - 1
+        - 5
+        version: 1.1.5
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id005
+        - 8
+        - 4
+        version: 1.8.4
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: simplecov
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: json
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
@@ -137,13 +132,12 @@ dependencies:
         - 4
         - 3
         version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -152,9 +146,7 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id008
+  requirement: *id008
 description: This provides interfaces to various passive DNS databases to do the query and to normalize the responses.  The query tool also allows for recursive queries, using an SQLite3 database to keep state.
 email: rubygems@chrislee.dhs.org
 executables: 
@@ -175,8 +167,6 @@ files:
 - lib/util/structformatter.rb
 - LICENSE.txt
 - README.rdoc
-- test/helper.rb
-- test/test_passive-dns.rb
 has_rdoc: true
 homepage: https://rubygems.org/gems/passive-dns
 licenses: 
@@ -187,16 +177,13 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2792024255355768910
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -206,10 +193,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Query passive DNS databases
-test_files: 
-- test/helper.rb
-- test/test_passive-dns.rb
+test_files: []
+

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'passive-dns'
-
-class Test::Unit::TestCase
-end

data/test/test_passive-dns.rb

@@ -1,70 +0,0 @@
-require 'helper'
-
-class TestPassiveDnsQuery < Test::Unit::TestCase
-	should "instantiate BFK Client" do
-		assert_not_nil(PassiveDNS::BFKClient.new) 
-	end
-
-	should "instantiate DNSParse Client" do
-		assert_not_nil(PassiveDNS::DNSParse.new)
-	end
-	
-	should "instantiate ISC Client" do
-		assert_not_nil(PassiveDNS::ISC.new)
-	end
-	
-	should "instantiate CERT-EE Client" do
-		assert_not_nil(PassiveDNS::CERTEE.new)
-	end
-	
-	should "instantiate Passive DNS State" do
-		assert_not_nil(PassiveDNS::PDNSToolState.new)
-	end
-	
-	should "instantiate Passive DNS State database" do
-		if File.exists?("test/test.sqlite3")
-			File.unlink("test/test.sqlite3")
-		end
-		assert_not_nil(PassiveDNS::PDNSToolStateDB.new("test/test.sqlite3"))
-		if File.exists?("test/test.sqlite3")
-			File.unlink("test/test.sqlite3")
-		end
-	end
-	
-	should "query BFK" do
-		rows = PassiveDNS::BFKClient.new.lookup("example.org");
-		assert_not_nil(rows)
-		assert_not_nil(rows.to_s)
-		assert_not_nil(rows.to_xml)
-		assert_not_nil(rows.to_json)
-		assert_not_nil(rows.to_yaml)
-	end
-	
-	should "query DNSParse" do
-		rows = PassiveDNS::DNSParse.new.lookup("example.org");
-		assert_not_nil(rows)
-		assert_not_nil(rows.to_s)
-		assert_not_nil(rows.to_xml)
-		assert_not_nil(rows.to_json)
-		assert_not_nil(rows.to_yaml)
-	end
-
-	should "query ISC" do
-		rows = PassiveDNS::ISC.new.lookup("example.org");
-		assert_not_nil(rows)
-		assert_not_nil(rows.to_s)
-		assert_not_nil(rows.to_xml)
-		assert_not_nil(rows.to_json)
-		assert_not_nil(rows.to_yaml)
-	end
-
-	should "query CERTEE" do
-		rows = PassiveDNS::CERTEE.new.lookup("sim.cert.ee");
-		assert_not_nil(rows)
-		assert_not_nil(rows.to_s)
-		assert_not_nil(rows.to_xml)
-		assert_not_nil(rows.to_json)
-		assert_not_nil(rows.to_yaml)
-	end
-
-end