whois 4.0.6 → 6.0.3

data/utils/deftld.rb

@@ -0,0 +1,230 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'pathname'
+require 'json'
+
+class TldDefs
+
+  KEY_SCHEMA = "_".freeze
+
+  # The current schema version for the definition file
+  #
+  # @return [String] version
+  SCHEMA_VERSION = "2".freeze
+
+
+  class ChangeError < StandardError
+  end
+
+  class TldDef
+    attr_accessor :name
+
+    attr_accessor :host
+    attr_accessor :adapter
+    attr_accessor :format
+    attr_accessor :url
+
+    attr_accessor :type
+    attr_accessor :group
+    attr_accessor :note
+
+    ATTRIBUTES = {
+        host: :host,
+        adapter: :adapter,
+        format: :format,
+        url: :url,
+
+        note: :_note,
+        type: :_type,
+    }
+
+
+    # Normalizes the TLD name by appending the dot, if missing.
+    #
+    # @return [String] the normalized TLD name
+    def self.name(string)
+      string = string.to_str.downcase
+      string.start_with?(".") ? string[1..-1] : string
+    end
+
+    def initialize(name, attributes = {})
+      @name = self.class.name(name)
+      @attributes = {}
+
+      update(attributes)
+    end
+
+    def load(attributes = {})
+      validate(ATTRIBUTES.values, attributes)
+
+      attributes.each do |key, value|
+        @attributes[key.to_sym] = value
+      end
+
+      self
+    end
+
+    # Updates the definition attributes.
+    #
+    # @param  attributes [Hash]
+    # @return [void]
+    def update(attributes = {})
+      validate(ATTRIBUTES.keys, attributes)
+
+      attributes.each do |key, value|
+        @attributes[ATTRIBUTES[key.to_sym]] = value
+      end
+
+      self
+    end
+
+    # Validates the definitions to make sure there are no unknown attributes.
+    #
+    # @param  allowed [Array]
+    # @param  attributes [Hash]
+    # @return [void]
+    # @raise  [ArgumentError] when a definition attribute is unknown
+    def validate(allowed, attributes)
+      attributes.each do |key, _|
+        allowed.include?(key.to_sym) or
+            raise ArgumentError, "Invalid attribute `#{key}`"
+      end
+    end
+
+    # Dump the definition object into a serializable Hash.
+    #
+    # Private attributes (starting by _) are added on top.
+    # Keys are sorted alphabetically.
+    #
+    # @return [Hash] the serializable hash
+    def dump
+      Hash[@attributes.reject { |_, value| value.nil? }.sort]
+    end
+  end
+
+
+  # @param  file_path [String] path to the TLD definition file
+  # @param  ignore_missing [Boolean] set to true to silently skip missing TLDs on update.
+  #         When set to false, an error will be raised.
+  def initialize(file_path, ignore_missing: true)
+    @path = Pathname.new(file_path)
+    @settings = {
+        ignore_missing: ignore_missing
+    }
+  end
+
+  def read
+    JSON.load(@path)
+  end
+
+  def write(data)
+    data[KEY_SCHEMA] = schema_attributes
+    data = Hash[data.sort_by { |tld, _| tld.split(".").reverse.join(".") }]
+    File.write(@path, JSON.pretty_generate(data))
+  end
+
+  def count
+    read.count
+  end
+
+  def tlds_add(*tlds, **attributes)
+    update do |defs|
+      tlds.each do |tld|
+        tld = TldDef.name(tld)
+        tlddef = TldDef.new(tld, attributes)
+        defs[tld] = tlddef.dump
+      end
+    end
+  end
+
+  def tlds_update(*tlds, **attributes)
+    update do |defs|
+      tlds.each do |tld|
+        tld = TldDef.name(tld)
+        # puts(tld) if !defs.key?(tld)
+        next if !defs.key?(tld) && @settings[:ignore_missing]
+        raise ChangeError, "error updating `#{tld}`, tld is missing" if !defs.key?(tld) && !@settings[:ignore_missing]
+
+        tlddef = TldDef.new(tld).load(defs[tld]).update(attributes)
+        defs[tld] = tlddef.dump
+      end
+    end
+  end
+
+  def update
+    data = read
+    puts "#{data.count} definitions read"
+    yield data if block_given?
+    write(data)
+    puts "#{data.count} definitions written"
+    data
+  end
+
+  def validate
+    read.each do |tld, data|
+      TldDef.new(tld, data)
+    end; nil
+  end
+
+  private
+
+  def schema_attributes
+    {
+        "schema" => SCHEMA_VERSION,
+        "updated" => Time.now.utc,
+    }
+  end
+
+end
+
+
+defs = TldDefs.new(File.expand_path("../../data/tld.json", __FILE__))
+
+args = ARGV
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: deftld command [options]"
+  opts.separator <<~EOS
+
+Commands:
+\tadd
+\tupdate
+\tvalidate
+\tfmt
+
+Options:
+  EOS
+
+  TldDefs::TldDef::ATTRIBUTES.each do |key, _|
+    opts.on("--#{key} [VALUE]", String, "set the #{key}") do |value|
+      options[key] = value
+    end
+  end
+
+  begin
+    opts.parse!
+  rescue OptionParser::ParseError
+    puts opts
+    exit 1
+  end
+
+  if args.size.zero?
+    puts opts
+    exit 1
+  end
+end
+
+case command = args.shift
+when "validate"
+  defs.validate
+when "fmt"
+  defs.update
+when "add"
+  defs.tlds_add(*args, options)
+when "update"
+  defs.tlds_update(*args, options)
+else
+  puts "Unknown command `#{command}`"
+  exit 1
+end

data/utils/defutils.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+args = ARGV
+case command = args.shift
+
+# Command retag-newgtld
+when "retag-newgtld"
+  require 'open-uri'
+
+  tlds = []
+  count = 0
+  open("https://newgtlds.icann.org/newgtlds.csv").each_line do |line|
+    count += 1
+    next if count < 3
+    tlds << line.split(",", 2).first
+  end
+
+  puts "Updating #{tlds.size} newGTLDs..."
+  puts "utils/deftld.rb update #{tlds.join(" ")} --type newgtld"
+  puts `utils/deftld.rb update #{tlds.join(" ")} --type newgtld`
+
+else
+  puts "Unknown command `#{command}`"
+  exit 1
+end
+

data/utils/fixupd.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby -w
+
+$:.unshift(File.expand_path("../../lib", __FILE__))
+
+require 'fileutils'
+require 'net/https'
+require 'uri'
+require 'yaml'
+require 'whois'
+
+# SOURCE = "tlds.yml"
+# defs = YAML.load_file(SOURCE)
+
+
+SOURCE = "https://gist.github.com/weppos/3907123/raw/tlds.yml"
+uri  = URI.parse(SOURCE)
+http = Net::HTTP.new(uri.host, uri.port)
+http.use_ssl = true
+http.verify_mode = OpenSSL::SSL::VERIFY_NONE # read into this
+defs = YAML.load(http.get(uri.request_uri).body)
+
+client = Whois::Client.new
+
+defs.each do |tld, node|
+  fixtures = node.reject { |k,v| k.index("_") == 0 }
+  subdir   = node["_subdir"] ? "/#{node["_subdir"]}" : ""
+  fixtures.each do |name, domain|
+    begin
+      record = client.lookup(domain)
+      part   = record.parts.first
+      target = File.expand_path("../../spec/fixtures/responses/#{part.host}#{subdir}/#{name}.txt", __FILE__)
+      FileUtils.mkdir_p(File.dirname(target))
+      File.open(target, "w+") { |f| f.write(part.body) }
+      puts "Saved #{target}"
+    rescue => e
+      puts "Error for #{domain}: #{e.message}"
+    end
+  end
+end
+
+
+# skippable = {}
+# defs.each do |tld, node|
+#   fixtures = node.reject { |k,v| k.index("_") == 0 }.reject { |k,v| node["_#{k}_skipdiff"].nil? }
+#   subdir   = node["_subdir"] ? "/#{node["_subdir"]}" : ""
+#   fixtures.each do |name, domain|
+#     target = "spec/fixtures/responses/#{node["_server"]}#{subdir}/#{name}.txt"
+#     skippable[target] = node["_#{name}_skipdiff"]
+#   end
+# end
+
+# changes = `git status`.scan(/modified:\s+(.+)/).flatten
+# changes.each do |path|
+#   next unless (alpha = skippable[path])
+#   beta = `git show HEAD~1:#{path} | diff - #{path}`.scan(/^(\d+)c\1/).flatten.map(&:to_i)
+#   if (alpha - beta) == []
+#     `git checkout #{path}`
+#     puts "Reset #{path}"
+#   end
+# end

data/utils/matrix.rb

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby -w
+
+ROOT = File.expand_path("../..", __FILE__)
+LIB  = File.join(ROOT, "lib")
+
+$:.unshift(LIB)
+
+def pretty_state(state)
+  case state
+  when :supported       then 'Y'
+  when :not_supported   then 'N'
+  when :not_implemented then '.'
+  end
+end
+
+def matrix(hosts)
+  hosts.map do |host|
+    klass = P.parser_klass(host)
+    props = klass._properties
+    PROPERTIES.inject([host]) { |all, property| all << pretty_state(props[property]) }
+  end
+end
+
+def markdown_matrix(matrix, header: nil, formatter: ->(columns) { "| #{columns.join(" | ")} |" })
+  matrix = matrix.dup
+  length = matrix.inject(0) { |l, row| l = row[0].size > l ? row[0].size : l }
+  matrix.each { |row| row[0] = row[0].ljust(length) }
+
+  output  = matrix.map(&formatter)
+  if header
+    string = formatter.(header)
+    output.unshift [string, string.gsub(/([^\|])/, "-")]
+  end
+  output.join("\n")
+end
+
+
+require 'whois'
+
+P = Whois::Record::Parser
+PROPERTIES = [:disclaimer, :domain, :domain_id, :status, :available?, :registered?, :created_on, :updated_on, :expires_on, :registrar, :registrant_contacts, :admin_contacts, :technical_contacts, :nameservers]
+
+hosts = Dir.glob(File.join(LIB, "whois/record/parser/*.rb"))
+           .reject { |f| f.match?(/\/(base|blank|example)/) }
+           .map { |f| File.basename(f, ".rb") }
+
+pthin = %w(
+  whois.1und1.info
+  whois.ascio.com
+  whois.comlaude.com
+  whois.dreamhost.com
+  whois.enom.com
+  whois.gandi.net
+  whois.godaddy.com
+  whois.markmonitor.com
+  whois.networksolutions.com
+  whois.pairnic.com
+  whois.register.com
+  whois.rrpproxy.net
+  whois.schlund.info
+  whois.tucows.com
+  whois.udag.net
+  whois.yoursrs.com
+)
+ptlds = hosts - pthin
+
+puts markdown_matrix(matrix(ptlds), header: ["parser"] + PROPERTIES)
+puts markdown_matrix(matrix(pthin), header: ["parser"] + PROPERTIES)

data/utils/mkwhois.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby -w
+
+# Usage:
+#
+# $ ./utils/mkwhois.rb google.com.br status_registered
+#
+# It will execute the query and dump the result into a file
+# called status_registered.txt into the appriate folder based
+# on the hostname that was queried, and the TLD.
+
+$:.unshift(File.expand_path("../../lib", __FILE__))
+
+require 'fileutils'
+require 'whois'
+begin
+  require File.expand_path("../whois-utf8", __FILE__)
+rescue LoadError
+end
+
+d = ARGV.shift || raise("Missing domain")
+n = ARGV.shift || raise("Missing file name")
+
+r = Whois.lookup(d)
+tld = r.server.allocation
+
+r.parts.each do |part|
+  target = File.expand_path("../../spec/fixtures/responses/#{part.host}/#{tld}/#{n}.txt", __FILE__)
+  FileUtils.mkdir_p(File.dirname(target))
+  File.open(target, "w+") { |f| f.write(part.body) }
+  puts "#{target}"
+end

data/whois.gemspec

@@ -1,39 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: whois 4.0.6 ruby lib
+$:.push File.expand_path("../lib", __FILE__)
+require "whois/version"
 
 Gem::Specification.new do |s|
-  s.name = "whois".freeze
-  s.version = "4.0.6"
+  s.name        = "whois"
+  s.version     = Whois::VERSION
+  s.authors     = ["Simone Carletti"]
+  s.email       = ["weppos@weppos.net"]
+  s.homepage    = "https://whoisrb.org/"
+  s.summary     = "An intelligent pure Ruby WHOIS client and parser."
+  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, and parse the responses into easy-to-use Ruby objects via the whois-parser library."
+  s.license     = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Simone Carletti".freeze]
-  s.date = "2018-03-26"
-  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, and parse the responses into easy-to-use Ruby objects via the whois-parser library.".freeze
-  s.email = ["weppos@weppos.net".freeze]
-  s.executables = ["whoisrb".freeze]
-  s.files = [".yardopts".freeze, "4.0-Upgrade.md".freeze, "CHANGELOG.md".freeze, "CONTRIBUTING.md".freeze, "LICENSE.txt".freeze, "README.md".freeze, "bin/console".freeze, "bin/setup".freeze, "bin/whoisrb".freeze, "data/asn16.json".freeze, "data/asn32.json".freeze, "data/ipv4.json".freeze, "data/ipv6.json".freeze, "data/tld.json".freeze, "lib/whois.rb".freeze, "lib/whois/client.rb".freeze, "lib/whois/errors.rb".freeze, "lib/whois/record.rb".freeze, "lib/whois/record/part.rb".freeze, "lib/whois/server.rb".freeze, "lib/whois/server/adapters/afilias.rb".freeze, "lib/whois/server/adapters/arin.rb".freeze, "lib/whois/server/adapters/arpa.rb".freeze, "lib/whois/server/adapters/base.rb".freeze, "lib/whois/server/adapters/formatted.rb".freeze, "lib/whois/server/adapters/none.rb".freeze, "lib/whois/server/adapters/not_implemented.rb".freeze, "lib/whois/server/adapters/standard.rb".freeze, "lib/whois/server/adapters/verisign.rb".freeze, "lib/whois/server/adapters/web.rb".freeze, "lib/whois/server/socket_handler.rb".freeze, "lib/whois/version.rb".freeze, "whois.gemspec".freeze]
-  s.homepage = "https://whoisrb.org/".freeze
-  s.licenses = ["MIT".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0.0".freeze)
-  s.rubygems_version = "2.7.3".freeze
-  s.summary = "An intelligent pure Ruby WHOIS client and parser.".freeze
+  s.required_ruby_version = ">= 3.0"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.require_paths    = %w( lib )
+  s.executables      =%w( whoisrb )
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = %w( LICENSE.txt .yardopts )
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<yard>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_dependency(%q<yard>.freeze, [">= 0"])
-  end
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: whois
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 6.0.3
 platform: ruby
 authors:
 - Simone Carletti
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,16 +59,30 @@ email:
 executables:
 - whoisrb
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- ".yardopts"
+- LICENSE.txt
 files:
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/tests.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_opinionated.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
+- ".tool-versions"
 - ".yardopts"
-- 4.0-Upgrade.md
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
+- SECURITY.md
 - bin/console
-- bin/setup
 - bin/whoisrb
 - data/asn16.json
 - data/asn32.json
@@ -94,12 +107,48 @@ files:
 - lib/whois/server/adapters/web.rb
 - lib/whois/server/socket_handler.rb
 - lib/whois/version.rb
+- spec/fixtures/referrals/afilias.bz.txt
+- spec/fixtures/referrals/arin_referral_apnic.txt
+- spec/fixtures/referrals/arin_referral_missing.txt
+- spec/fixtures/referrals/arin_referral_ripe.txt
+- spec/fixtures/referrals/arin_referral_rwhois.txt
+- spec/fixtures/referrals/arin_referral_servernap.txt
+- spec/fixtures/referrals/arin_referral_whois.txt
+- spec/fixtures/referrals/crsnic.com.txt
+- spec/fixtures/referrals/crsnic.com_referral.txt
+- spec/fixtures/referrals/crsnic.com_referral_missing.txt
+- spec/integration/whois_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers/connectivity_helper.rb
+- spec/support/helpers/spec_helper.rb
+- spec/whois/client_spec.rb
+- spec/whois/record/part_spec.rb
+- spec/whois/record_spec.rb
+- spec/whois/server/adapters/afilias_spec.rb
+- spec/whois/server/adapters/arin_spec.rb
+- spec/whois/server/adapters/arpa_spec.rb
+- spec/whois/server/adapters/base_spec.rb
+- spec/whois/server/adapters/formatted_spec.rb
+- spec/whois/server/adapters/none_spec.rb
+- spec/whois/server/adapters/not_implemented_spec.rb
+- spec/whois/server/adapters/standard_spec.rb
+- spec/whois/server/adapters/verisign_spec.rb
+- spec/whois/server/adapters/web_spec.rb
+- spec/whois/server/socket_handler_spec.rb
+- spec/whois/server_spec.rb
+- spec/whois/web_interface_error_spec.rb
+- spec/whois/whois_spec.rb
+- utils/compare-whois.rb
+- utils/deftld.rb
+- utils/defutils.rb
+- utils/fixupd.rb
+- utils/matrix.rb
+- utils/mkwhois.rb
 - whois.gemspec
 homepage: https://whoisrb.org/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,16 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An intelligent pure Ruby WHOIS client and parser.
 test_files: []