whois 0.5.0 → 0.5.1

data/CHANGELOG.rdoc

@@ -1,7 +1,16 @@
 = Changelog
 
 
-== 0.5.0
+== Release 0.5.1
+
+* FIXED: 'rake coverage' task crashes.
+
+* FIXED: In case of thin server the client should concatenate all responses (closes #259).
+
+* ADDED: Whois binary (closes #271).
+
+
+== Release 0.5.0
 
 * FIXED: Whois#whois defined as instance method but modules can't have instances!
 

data/Manifest

@@ -1,3 +1,4 @@
+bin/ruby-whois
 CHANGELOG.rdoc
 data/ip6_del_list
 data/ip_del_list

data/README.rdoc

@@ -1,6 +1,7 @@
 = Whois
 
-Whois is a pure Ruby WHOIS client. 
+Whois is an intelligent pure Ruby WHOIS client.
+
 It is a os-independent library and doesn't require external C libraries or GEMS: it is a 100% Ruby software with all the advantages and disadvantages that it involves.
 
 This software was developed to power RoboDomain[http://www.robodomain.com] and, despite it has been using in a production environment since July 2009, it should not be considered production-ready yet. It is currently in its beta stage.
@@ -42,6 +43,8 @@ You might need administrator privileges on your system to install it.
 
 == Getting Started
 
+Note. This section covers only the essentials for getting started with the Whois library. If you want to take the full advantage of all its features, visit the {documentation page}[http://code.simonecarletti.com/wiki/whois].
+
 Whois provides the ability to get whois information for hostnames, ipv4 and ipv6 ip addresses. The client is smart enough to guess the best whois server according to given query, send the request and return the response.
 
 Checkout the following examples:
@@ -69,10 +72,18 @@ The query method is stateless. For this reason, you can safely re-use the same c
   w.query("2001:db8::1428:57ab")
   w.query("google.it")
 
+=== Timeout
 
-== Documentation
+By default, each query run though the client has a timeout value of 5 seconds. If the execution exceeds timeout limit, the client raises a <tt>Timeout::Error</tt> exception.
 
-More documentation to come. Please be patient, this library is under active development.
+Off course, you can customize the timeout value setting a different value. If timeout is <tt>nil</tt>, the client will until the response is sent back from the server or the process is killed. Don't disable the timeout unless you really know you are doing!
+
+  w = Whois::Client.new(:timeout => 10)
+  w.timeout # => 10
+  w.timeout = 5
+  w.timeout # => 5
+  
+  w.query("google.com")
 
 
 == Acknowledgments
@@ -121,6 +132,9 @@ Bug reports and Feature suggestions {are welcomed}[http://code.simonecarletti.co
 * {Homepage}[http://code.simonecarletti.com/whois]
 * {GitHub}[http://github.com/weppos/whois]
 * {RubyForge}[http://rubyforge.org/projects/whois/]
+
+* {Documentation}[http://code.simonecarletti.com/wiki/whois]
+* {API}[http://whois.rubyforge.org/]
 * {Discussion Group}[http://groups.google.com/group/ruby-whois]
 
 

data/Rakefile

@@ -9,10 +9,6 @@ require 'whois'
 # Common package properties
 PKG_NAME    = ENV['PKG_NAME']    || Whois::GEM
 PKG_VERSION = ENV['PKG_VERSION'] || Whois::VERSION
-PKG_FILES   = FileList.new("{lib,test}/**/*.rb") do |files|
-  files.include %w(README.rdoc CHANGELOG.rdoc LICENSE.rdoc)
-  files.include %w(Rakefile)
-end
 RUBYFORGE_PROJECT = 'whois'
 
 if ENV['SNAPSHOT'].to_i == 1
@@ -27,22 +23,17 @@ Echoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.url           = "http://code.simonecarletti.com/whois"
   p.project       = RUBYFORGE_PROJECT
   p.description   = <<-EOD
-    WWW::Delicious is an intelligent WHOIS client written in pure Ruby. \
+    Whois is an intelligent WHOIS client written in pure Ruby. \
     It enables you to query registry data for ipv4, ipv6 and top level domains.
   EOD
 
   p.need_zip      = true
-  p.rdoc_pattern  = /^(lib|CHANGELOG.rdoc|README.rdoc)/
 
   p.development_dependencies += ["rake  ~>0.8",
                                  "echoe ~>3.1",
                                  "mocha ~>0.9"]
-  #p.add_development_dependency "rake",  "~>0.8.0"
-  #p.add_development_dependency "echoe", "~>3.1.0"
-  #p.add_development_dependency "mocha", "~>0.9.0"
-
-  p.rcov_options  = ["--main << README.rdoc -x Rakefile -x mocha -x rcov"]
 
+  p.rcov_options  = ["-Itest -x mocha,rcov,Rakefile"]
 end
 
 

data/bin/ruby-whois

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby -wKU
+
+require 'optparse'
+require 'rubygems'
+require 'whois'
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Whois: an intelligent pure Ruby Whois client"
+  opts.define_head "Usage: whois [options] object"
+  opts.separator ""
+  opts.separator "Examples:"
+  opts.separator " whois ruby-lang.com"
+  opts.separator " whois 213.149.247.64"
+  opts.separator ""
+  opts.separator "Options:"
+ 
+  opts.on_tail("--help", "Show this message") do
+    puts opts
+    exit
+  end
+ 
+  opts.on_tail("-V", "--version", "Show version") do
+    puts "#{Whois::NAME} #{Whois::VERSION}"
+    exit
+  end
+end
+opts.parse!
+ 
+qstring = ARGV.shift
+ 
+if qstring.to_s.strip.empty?
+  puts opts
+  exit 1
+end
+ 
+@client = Whois::Client.new
+puts @client.query(qstring)

data/lib/whois/server/adapters/afilias.rb

@@ -17,18 +17,27 @@
 module Whois
   class Server
     module Adapters
-      
+
       class Afilias < Base
-        
+
         def request(qstring)
           response = ask_the_socket(qstring, "whois.afilias-grs.info", DEFAULT_WHOIS_PORT)
-          if response =~ /Domain Name:/ && response =~ /Whois Server:(\S+)/
-            ask_the_socket(qstring, $1, DEFAULT_WHOIS_PORT)
+          endpoint = extract_referral(response)
+          if endpoint
+            response + "\n" + ask_the_socket(qstring, endpoint, DEFAULT_WHOIS_PORT)
           else
             response
           end
         end
-        
+
+        private
+
+          def extract_referral(response)
+            if response =~ /Domain Name:/ && response =~ /Whois Server:(\S+)/
+              $1
+            end
+          end
+
       end
       
     end

data/lib/whois/server/adapters/pir.rb

@@ -17,21 +17,30 @@
 module Whois
   class Server
     module Adapters
-      
+
       class Pir < Base
-        
+
         def request(qstring)
           response = ask_the_socket("FULL #{qstring}", "whois.publicinterestregistry.net", DEFAULT_WHOIS_PORT)
-          if response =~ /Registrant Name:SEE SPONSORING REGISTRAR/ && 
-             response =~ /Registrant Street1:Whois Server:(\S+)/
-            ask_the_socket(qstring, $1, DEFAULT_WHOIS_PORT)
+          endpoint = extract_referral(response)
+          if endpoint
+            response + "\n" + ask_the_socket(qstring, endpoint, DEFAULT_WHOIS_PORT)
           else
             response
           end
         end
-        
+
+        private
+
+          def extract_referral(response)
+            if response =~ /Registrant Name:SEE SPONSORING REGISTRAR/ && 
+               response =~ /Registrant Street1:Whois Server:(\S+)/
+              $1
+            end
+          end
+
       end
-      
+
     end
   end
 end

data/lib/whois/server/adapters/verisign.rb

@@ -22,15 +22,24 @@ module Whois
         
         def request(qstring)
           response = ask_the_socket("=#{qstring}", host, DEFAULT_WHOIS_PORT)
-          if response =~ /Domain Name:/ && response =~ /Whois Server: (\S+)/
-            ask_the_socket(qstring, $1, DEFAULT_WHOIS_PORT)
+          endpoint = extract_referral(response)
+          if endpoint
+            response + "\n" + ask_the_socket(qstring, endpoint, DEFAULT_WHOIS_PORT)
           else
             response
           end
         end
-        
+
+        private
+
+          def extract_referral(response)
+            if response =~ /Domain Name:/ && response =~ /Whois Server: (\S+)/
+              $1
+            end
+          end
+
       end
-      
+
     end
   end
 end

data/lib/whois/version.rb

@@ -19,7 +19,7 @@ module Whois
   module Version
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/adapters/afilias_test.rb

@@ -10,16 +10,18 @@ class ServerAdaptersAfiliasTest < Test::Unit::TestCase
   end
 
   def test_query
-    expected = "No match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("domain.foo", "whois.afilias-grs.info", 43).returns(expected)
+    response = "No match for DOMAIN.FOO."
+    expected = response
+    @server.expects(:ask_the_socket).with("domain.foo", "whois.afilias-grs.info", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 
   def test_query_with_referral
-    response = File.read(File.dirname(__FILE__) + "/../testcases/referrals/afilias.bz.txt")
-    expected = "Match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("domain.foo", "whois.afilias-grs.info", 43).returns(response)
-    @server.expects(:ask_the_socket).with("domain.foo", "whois.belizenic.bz", 43).returns(expected)
+    referral = File.read(File.dirname(__FILE__) + "/../testcases/referrals/afilias.bz.txt")
+    response = "Match for DOMAIN.FOO."
+    expected = referral + "\n" + response
+    @server.expects(:ask_the_socket).with("domain.foo", "whois.afilias-grs.info", 43).returns(referral)
+    @server.expects(:ask_the_socket).with("domain.foo", "whois.belizenic.bz", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 

data/test/adapters/pir_test.rb

@@ -10,16 +10,18 @@ class ServerAdaptersPirTest < Test::Unit::TestCase
   end
 
   def test_query
-    expected = "No match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("FULL domain.foo", "whois.publicinterestregistry.net", 43).returns(expected)
+    response = "No match for DOMAIN.FOO."
+    expected = response
+    @server.expects(:ask_the_socket).with("FULL domain.foo", "whois.publicinterestregistry.net", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 
   def test_query_with_referral
-    response = File.read(File.dirname(__FILE__) + "/../testcases/referrals/pir.org.txt")
-    expected = "Match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("FULL domain.foo", "whois.publicinterestregistry.net", 43).returns(response)
-    @server.expects(:ask_the_socket).with("domain.foo", "whois.iana.org", 43).returns(expected)
+    referral = File.read(File.dirname(__FILE__) + "/../testcases/referrals/pir.org.txt")
+    response = "Match for DOMAIN.FOO."
+    expected = referral + "\n" + response
+    @server.expects(:ask_the_socket).with("FULL domain.foo", "whois.publicinterestregistry.net", 43).returns(referral)
+    @server.expects(:ask_the_socket).with("domain.foo", "whois.iana.org", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 

data/test/adapters/verisign_test.rb

@@ -10,16 +10,18 @@ class ServerAdaptersVerisignTest < Test::Unit::TestCase
   end
 
   def test_query
-    expected = "No match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("=domain.foo", "whois.foo", 43).returns(expected)
+    response = "No match for DOMAIN.FOO."
+    expected = response
+    @server.expects(:ask_the_socket).with("=domain.foo", "whois.foo", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 
   def test_query_with_referral
-    response = File.read(File.dirname(__FILE__) + "/../testcases/referrals/crsnic.com.txt")
-    expected = "Match for DOMAIN.FOO."
-    @server.expects(:ask_the_socket).with("=domain.foo", "whois.foo", 43).returns(response)
-    @server.expects(:ask_the_socket).with("domain.foo", "whois.tucows.com", 43).returns(expected)
+    referral = File.read(File.dirname(__FILE__) + "/../testcases/referrals/crsnic.com.txt")
+    response = "Match for DOMAIN.FOO."
+    expected = referral + "\n" + response
+    @server.expects(:ask_the_socket).with("=domain.foo", "whois.foo", 43).returns(referral)
+    @server.expects(:ask_the_socket).with("domain.foo", "whois.tucows.com", 43).returns(response)
     assert_equal expected, @server.query("domain.foo")
   end
 

data/whois.gemspec

@@ -2,16 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whois}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2009-08-09}
-  s.description = %q{    WWW::Delicious is an intelligent WHOIS client written in pure Ruby.     It enables you to query registry data for ipv4, ipv6 and top level domains.
+  s.date = %q{2009-08-10}
+  s.default_executable = %q{ruby-whois}
+  s.description = %q{    Whois is an intelligent WHOIS client written in pure Ruby.     It enables you to query registry data for ipv4, ipv6 and top level domains.
 }
   s.email = %q{weppos@weppos.net}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/whois/client.rb", "lib/whois/definitions/ipv4.rb", "lib/whois/definitions/ipv4.txt", "lib/whois/definitions/ipv6.rb", "lib/whois/definitions/ipv6.txt", "lib/whois/definitions/tlds.rb", "lib/whois/definitions/tlds.txt", "lib/whois/errors.rb", "lib/whois/server/adapters/afilias.rb", "lib/whois/server/adapters/arpa.rb", "lib/whois/server/adapters/base.rb", "lib/whois/server/adapters/formatted.rb", "lib/whois/server/adapters/none.rb", "lib/whois/server/adapters/not_implemented.rb", "lib/whois/server/adapters/pir.rb", "lib/whois/server/adapters/standard.rb", "lib/whois/server/adapters/verisign.rb", "lib/whois/server/adapters/web.rb", "lib/whois/server.rb", "lib/whois/version.rb", "lib/whois/whois.rb", "lib/whois.rb", "README.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "data/ip6_del_list", "data/ip_del_list", "data/make_ip6_del.pl", "data/make_ip_del.pl", "data/make_tld_serv.pl", "data/tld_serv_list", "lib/whois/client.rb", "lib/whois/definitions/ipv4.rb", "lib/whois/definitions/ipv4.txt", "lib/whois/definitions/ipv6.rb", "lib/whois/definitions/ipv6.txt", "lib/whois/definitions/tlds.rb", "lib/whois/definitions/tlds.txt", "lib/whois/errors.rb", "lib/whois/server/adapters/afilias.rb", "lib/whois/server/adapters/arpa.rb", "lib/whois/server/adapters/base.rb", "lib/whois/server/adapters/formatted.rb", "lib/whois/server/adapters/none.rb", "lib/whois/server/adapters/not_implemented.rb", "lib/whois/server/adapters/pir.rb", "lib/whois/server/adapters/standard.rb", "lib/whois/server/adapters/verisign.rb", "lib/whois/server/adapters/web.rb", "lib/whois/server.rb", "lib/whois/version.rb", "lib/whois/whois.rb", "lib/whois.rb", "LICENSE.rdoc", "Manifest", "Rakefile", "README.rdoc", "tasks/server.rake", "test/adapters/afilias_test.rb", "test/adapters/none_test.rb", "test/adapters/not_implemented_test.rb", "test/adapters/pir_test.rb", "test/adapters/standard_test.rb", "test/adapters/verisign_test.rb", "test/adapters/web_test.rb", "test/client_test.rb", "test/deprecated_test.rb", "test/server_test.rb", "test/test_helper.rb", "test/testcases/referrals/afilias.bz.txt", "test/testcases/referrals/crsnic.com.txt", "test/testcases/referrals/niccc.cc.txt", "test/testcases/referrals/pir.org.txt", "test/testcases/responses/it.txt", "test/whois_test.rb", "utils/bm_shell_vs_pure.rb", "utils/tlds.txt", "whois.gemspec"]
+  s.executables = ["ruby-whois"]
+  s.extra_rdoc_files = ["bin/ruby-whois", "CHANGELOG.rdoc", "lib/whois/client.rb", "lib/whois/definitions/ipv4.rb", "lib/whois/definitions/ipv4.txt", "lib/whois/definitions/ipv6.rb", "lib/whois/definitions/ipv6.txt", "lib/whois/definitions/tlds.rb", "lib/whois/definitions/tlds.txt", "lib/whois/errors.rb", "lib/whois/server/adapters/afilias.rb", "lib/whois/server/adapters/arpa.rb", "lib/whois/server/adapters/base.rb", "lib/whois/server/adapters/formatted.rb", "lib/whois/server/adapters/none.rb", "lib/whois/server/adapters/not_implemented.rb", "lib/whois/server/adapters/pir.rb", "lib/whois/server/adapters/standard.rb", "lib/whois/server/adapters/verisign.rb", "lib/whois/server/adapters/web.rb", "lib/whois/server.rb", "lib/whois/version.rb", "lib/whois/whois.rb", "lib/whois.rb", "LICENSE.rdoc", "README.rdoc", "tasks/server.rake"]
+  s.files = ["bin/ruby-whois", "CHANGELOG.rdoc", "data/ip6_del_list", "data/ip_del_list", "data/make_ip6_del.pl", "data/make_ip_del.pl", "data/make_tld_serv.pl", "data/tld_serv_list", "lib/whois/client.rb", "lib/whois/definitions/ipv4.rb", "lib/whois/definitions/ipv4.txt", "lib/whois/definitions/ipv6.rb", "lib/whois/definitions/ipv6.txt", "lib/whois/definitions/tlds.rb", "lib/whois/definitions/tlds.txt", "lib/whois/errors.rb", "lib/whois/server/adapters/afilias.rb", "lib/whois/server/adapters/arpa.rb", "lib/whois/server/adapters/base.rb", "lib/whois/server/adapters/formatted.rb", "lib/whois/server/adapters/none.rb", "lib/whois/server/adapters/not_implemented.rb", "lib/whois/server/adapters/pir.rb", "lib/whois/server/adapters/standard.rb", "lib/whois/server/adapters/verisign.rb", "lib/whois/server/adapters/web.rb", "lib/whois/server.rb", "lib/whois/version.rb", "lib/whois/whois.rb", "lib/whois.rb", "LICENSE.rdoc", "Manifest", "Rakefile", "README.rdoc", "tasks/server.rake", "test/adapters/afilias_test.rb", "test/adapters/none_test.rb", "test/adapters/not_implemented_test.rb", "test/adapters/pir_test.rb", "test/adapters/standard_test.rb", "test/adapters/verisign_test.rb", "test/adapters/web_test.rb", "test/client_test.rb", "test/deprecated_test.rb", "test/server_test.rb", "test/test_helper.rb", "test/testcases/referrals/afilias.bz.txt", "test/testcases/referrals/crsnic.com.txt", "test/testcases/referrals/niccc.cc.txt", "test/testcases/referrals/pir.org.txt", "test/testcases/responses/it.txt", "test/whois_test.rb", "utils/bm_shell_vs_pure.rb", "utils/tlds.txt", "whois.gemspec"]
   s.homepage = %q{http://code.simonecarletti.com/whois}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Whois", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whois
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 +02:00
+date: 2009-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,13 +42,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
     version: 
-description: "    WWW::Delicious is an intelligent WHOIS client written in pure Ruby.     It enables you to query registry data for ipv4, ipv6 and top level domains.\n"
+description: "    Whois is an intelligent WHOIS client written in pure Ruby.     It enables you to query registry data for ipv4, ipv6 and top level domains.\n"
 email: weppos@weppos.net
-executables: []
-
+executables: 
+- ruby-whois
 extensions: []
 
 extra_rdoc_files: 
+- bin/ruby-whois
 - CHANGELOG.rdoc
 - lib/whois/client.rb
 - lib/whois/definitions/ipv4.rb
@@ -72,8 +73,11 @@ extra_rdoc_files:
 - lib/whois/version.rb
 - lib/whois/whois.rb
 - lib/whois.rb
+- LICENSE.rdoc
 - README.rdoc
+- tasks/server.rake
 files: 
+- bin/ruby-whois
 - CHANGELOG.rdoc
 - data/ip6_del_list
 - data/ip_del_list