whois 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca7b0f2d8ec9478c35b771b92c391d502d3fdad
-  data.tar.gz: 8b30418c6f10a88bb85af114dfacf25cf6b453db
+  metadata.gz: 341a7f023044c61c123a8da6620da15cc4c3111f
+  data.tar.gz: e3b305a477a62108a8b2139d02fb94515e309b1b
 SHA512:
-  metadata.gz: b0073cde2f240c73f2d772b1424f684d2576754b7497c12ac1a353166e0331baf0a28ffcff7c06f626c70d9201cc7377f0ae83f6473c444480ae7da375279414
-  data.tar.gz: 8c7ab0c12cff3d82550ea9841009f7947ba6ae9343c2c959d884082c9f467fdd34c19a6382eb8eb13b0336a275d8887cc0cce310222a9bee59031d9938d5e927
+  metadata.gz: 92c5a8701fe1ba781449e445810cf567cec8a2f84cd5049e2c888978689d290db7910c97bd5c37c0c8ec6af81d4f86a1af76d0f679a82fa9d7f2bea3410b9748
+  data.tar.gz: a1093adff3a70dd5458223329dca8230b90ae99d26e3c8c857e02f88c0e7c8f139db5be361d892f5fa4870665ff0b80b3624b653af01a42d661696d5d9c2ef13

data/{CHANGELOG.md → CHANGELOG.markdown}

@@ -1,5 +1,19 @@
 # Changelog
 
+
+#### Release 3.5.8
+
+- SERVER: Create .FIRMDALE, .MADRID, .XN--FLW351E, .XN--QCKA1PMC, .LDS, .MORMON
+
+- SERVER: Update .TC
+
+- NEW: whois.registry.om now recognizes reserved domains (GH-332). [Thanks @case]
+
+- FIXED: Fixed invalid JSON definition file (GH-349).
+
+- FIXED: Fixed the ARIN referral regex to correctly consider ports optional (GH-350). [Thanks @jrideout]
+
+
 #### Release 3.5.7
 
 - SERVER: Updated .AW, .BW, .GQ, .MK, .ML, .MZ, .PF, .VU, .ZM, .KIWI, .CAREER, .REISE, .VERSICHERUNG, .HOST, .PRESS, .HAMBURG, .BRUSSELS, .VLAANDEREN

data/bin/ruby-whois

@@ -1,64 +1,3 @@
 #!/usr/bin/env ruby -w
 
-$:.unshift(File.expand_path("../../lib", __FILE__))
-
-require 'optparse'
-require 'whois'
-
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner     = "Whois: an intelligent pure Ruby Whois client"
-  opts.define_head  "Usage: ruby-whois [options] object"
-  opts.separator    ""
-  opts.separator    "Examples:"
-  opts.separator    " ruby-whois ruby-lang.com"
-  opts.separator    " ruby-whois 213.149.247.64"
-  opts.separator    ""
-  opts.separator    "Options:"
-
-  opts.on("-t", "--timeout [SECONDS]", Integer, "set the timeout") do |seconds|
-    options[:timeout] = seconds
-  end
-
-  opts.on("-h", "--host [HOST]", String, "connect to server HOST") do |host|
-    options[:host] = host
-  end
-
-  opts.on("--[no-]referral", "skip referral queries") do |boolean|
-    options[:referral] = boolean
-  end
-
-  opts.on_tail("--help", "show this help and exit") do
-    puts opts
-    exit
-  end
-
-  opts.on_tail("--version", "output version information and exit") do
-    puts "ruby-whois #{Whois::VERSION}"
-    exit
-  end
-
-  begin
-    opts.parse!
-  rescue OptionParser::ParseError
-    puts opts
-    exit 1
-  end
-
-  if ARGV.size.zero?
-    puts opts
-    exit 1
-  end
-end
-
-object = ARGV.shift
-
-begin
-  @client = Whois::Client.new(options)
-  puts @client.lookup(object)
-rescue Whois::Error => e
-  abort(e.message)
-rescue Timeout::Error
-  abort("Request Timeout")
-end
+load File.join(File.expand_path("../", __FILE__), "whoisrb")

data/bin/whoisrb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby -w
+
+$:.unshift(File.expand_path("../../lib", __FILE__))
+
+require 'optparse'
+require 'whois'
+
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner     = "Whois: an intelligent pure Ruby Whois client"
+  opts.define_head  "Usage: ruby-whois [options] object"
+  opts.separator    ""
+  opts.separator    "Examples:"
+  opts.separator    " ruby-whois ruby-lang.com"
+  opts.separator    " ruby-whois 213.149.247.64"
+  opts.separator    ""
+  opts.separator    "Options:"
+
+  opts.on("-t", "--timeout [SECONDS]", Integer, "set the timeout") do |seconds|
+    options[:timeout] = seconds
+  end
+
+  opts.on("-h", "--host [HOST]", String, "connect to server HOST") do |host|
+    options[:host] = host
+  end
+
+  opts.on("--[no-]referral", "skip referral queries") do |boolean|
+    options[:referral] = boolean
+  end
+
+  opts.on_tail("--help", "show this help and exit") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("--version", "output version information and exit") do
+    puts "ruby-whois #{Whois::VERSION}"
+    exit
+  end
+
+  begin
+    opts.parse!
+  rescue OptionParser::ParseError
+    puts opts
+    exit 1
+  end
+
+  if ARGV.size.zero?
+    puts opts
+    exit 1
+  end
+end
+
+object = ARGV.shift
+
+begin
+  @client = Whois::Client.new(options)
+  puts @client.lookup(object)
+rescue Whois::Error => e
+  abort(e.message)
+rescue Timeout::Error
+  abort("Request Timeout")
+end

data/data/tld.json

@@ -981,7 +981,7 @@
     "adapter": "none"
   },
   ".tc": {
-    "host": "whois.meridiantld.net"
+    "host": "whois.nic.tc"
   },
   ".td": {
     "host": null,
@@ -1186,7 +1186,7 @@
   ".agency": {
     "host": "whois.donuts.co"
   },
-  ".bar": { // centralnic
+  ".bar": {
     "host": "whois.nic.bar"
   },
   ".bargains": {
@@ -1618,7 +1618,7 @@
   ".wien": {
     "host": "whois.nic.wien"
   },
-  ".wiki": { // centralnic
+  ".wiki": {
     "host": "whois.nic.wiki"
   },
   ".works": {
@@ -1684,7 +1684,7 @@
   ".xn--zfr164b": {
     "host": "whois.conac.cn"
   },
-  ".xyz": { // centralnic
+  ".xyz": {
     "host": "whois.nic.xyz"
   },
   ".zone": {
@@ -2002,10 +2002,10 @@
   ".mortgage": {
     "host": "whois.rightside.co"
   },
-  ".space": { // centralnic
+  ".space": {
     "host": "whois.nic.space"
   },
-  ".website": { // centralnic
+  ".website": {
     "host": "whois.nic.website"
   },
   ".attorney": {
@@ -2110,7 +2110,7 @@
   ".ovh": {
     "host": "whois-ovh.nic.fr"
   },
-  ".physio": { // aridnrs
+  ".physio": {
     "host": "whois.nic.physio"
   },
   ".bmw": {
@@ -2467,6 +2467,24 @@
   ".work": {
     "host": "whois-dub.mm-registry.com"
   },
+  ".firmdale": {
+    "host": "whois.nic.firmdale"
+  },
+  ".madrid": {
+    "host": "whois.madrid.rs.corenic.net"
+  },
+  ".xn--flw351e": {
+    "host": "domain-registry-whois.l.google.com"
+  },
+  ".xn--qcka1pmc": {
+    "host": "domain-registry-whois.l.google.com"
+  },
+  ".lds": {
+    "host": "whois.afilias-srs.net"
+  },
+  ".mormon": {
+    "host": "whois.afilias-srs.net"
+  },
 
   ".xn--3e0b707e": {
     "host": "whois.kr"

data/lib/whois/record/parser/base_shared1.rb

@@ -35,15 +35,19 @@ module Whois
 
 
         property_supported :status do
-          Array.wrap(node("Status"))
+          if respond_to?(:reserved?) && reserved?
+            :reserved
+          else
+            Array.wrap(node("Status"))
+          end
         end
 
         property_supported :available? do
-          !!node('status:available')
+          !(respond_to?(:reserved?) && reserved?) && !!node('status:available')
         end
 
         property_supported :registered? do
-          !available?
+          !(respond_to?(:reserved?) && reserved?) && !available?
         end
 
 

data/lib/whois/record/parser/base_shared3.rb

@@ -51,7 +51,7 @@ module Whois
         end
 
         property_supported :registered? do
-          !available?
+          !(respond_to?(:reserved?) && reserved?) && !available?
         end
 
 

data/lib/whois/record/parser/{whois.meridiantld.net.rb → whois.nic.tc.rb}

@@ -14,12 +14,12 @@ module Whois
   class Record
     class Parser
 
-      # Parser for the whois.meridiantld.net server.
+      # Parser for the whois.nic.tc server.
       #
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      class WhoisMeridiantldNet < BaseCocca2
+      class WhoisNicTc < BaseCocca2
       end
 
     end

data/lib/whois/record/parser/whois.registry.om.rb

@@ -20,9 +20,21 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisRegistryOm < BaseShared1
+
+        self.scanner = Scanners::BaseShared1, {
+            pattern_reserved: /^Restricted\n/
+        }
+
+
         property_supported :updated_on do
           node("Last Modified") { |value| Time.parse(value) }
         end
+
+
+        def reserved?
+          !!node('status:reserved')
+        end
+
       end
 
     end

data/lib/whois/record/scanners/base_shared1.rb

@@ -19,6 +19,7 @@ module Whois
         self.tokenizers += [
             :skip_empty_line,
             :scan_available,
+            :scan_reserved,
             :scan_keyvalue,
         ]
 
@@ -29,6 +30,12 @@ module Whois
           end
         end
 
+        tokenizer :scan_reserved do
+          if settings[:pattern_reserved] && @input.scan(settings[:pattern_reserved])
+            @ast["status:reserved"] = true
+          end
+        end
+
       end
 
     end

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

@@ -38,7 +38,7 @@ module Whois
         private
 
         def extract_referral(response)
-          return unless response =~ /ReferralServer:\s*r?whois:\/\/([\w\.]+):?(\d+)/
+          return unless response =~ /ReferralServer:\s*r?whois:\/\/([\w.-]+)(?::(\d+))?/
           {
             host: $1,
             port: $2 ? $2.to_i : nil

data/lib/whois/version.rb

@@ -13,7 +13,7 @@ module Whois
   module Version
     MAJOR = 3
     MINOR = 5
-    PATCH = 7
+    PATCH = 8
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/whois.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: whois 3.5.6 ruby lib
+# stub: whois 3.5.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "whois"
-  s.version = "3.5.6"
+  s.version = "3.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Simone Carletti"]
-  s.date = "2014-11-10"
+  s.date = "2014-11-16"
   s.description = "Whois is an intelligent WHOIS client and parser written in pure Ruby. It can query registry data for IPv4, IPv6 and top level domains, parse and convert responses into easy-to-use Ruby objects."
   s.email = ["weppos@weppos.net"]
   s.executables = ["ruby-whois"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.post_install_message = "********************************************************************************\n\n  Thank you for installing the whois gem!\n\n  If you like this gem, please support the project.\n  http://pledgie.com/campaigns/11383\n\n  Does your project or organization use this gem? Add it to the apps wiki.\n  https://github.com/weppos/whois/wiki/apps\n\n  Are you looking for a quick and convenient way to perform WHOIS queries?\n  Check out RoboWhois WHOIS API.\n  https://www.robowhois.com/\n\n********************************************************************************\n"
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
   s.rubyforge_project = "whois"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.4"
   s.summary = "An intelligent pure Ruby WHOIS client and parser."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whois
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,15 +86,17 @@ description: Whois is an intelligent WHOIS client and parser written in pure Rub
 email:
 - weppos@weppos.net
 executables:
+- whoisrb
 - ruby-whois
 extensions: []
 extra_rdoc_files: []
 files:
 - ".yardopts"
-- CHANGELOG.md
+- CHANGELOG.markdown
 - LICENSE.txt
-- README.md
+- README.markdown
 - bin/ruby-whois
+- bin/whoisrb
 - data/asn16.json
 - data/asn32.json
 - data/ipv4.json
@@ -193,7 +195,6 @@ files:
 - lib/whois/record/parser/whois.kenic.or.ke.rb
 - lib/whois/record/parser/whois.kr.rb
 - lib/whois/record/parser/whois.markmonitor.com.rb
-- lib/whois/record/parser/whois.meridiantld.net.rb
 - lib/whois/record/parser/whois.monic.mo.rb
 - lib/whois/record/parser/whois.museum.rb
 - lib/whois/record/parser/whois.na-nic.com.na.rb
@@ -263,6 +264,7 @@ files:
 - lib/whois/record/parser/whois.nic.sn.rb
 - lib/whois/record/parser/whois.nic.so.rb
 - lib/whois/record/parser/whois.nic.st.rb
+- lib/whois/record/parser/whois.nic.tc.rb
 - lib/whois/record/parser/whois.nic.tel.rb
 - lib/whois/record/parser/whois.nic.tl.rb
 - lib/whois/record/parser/whois.nic.tm.rb