nicinfo 1.3.0.pre.alpha1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f574db872855ffbfa72d6a22daaf59fdc1aec3b5
-  data.tar.gz: 414c3b45e8a4fe46e6afc31fc3d02c591a27c485
+SHA256:
+  metadata.gz: 7ecaa53b9df142ebd216e7dc88de56ab2f811c4339e9f075c4088f26d5cecd83
+  data.tar.gz: af818b3b4a62989a1a4b4f8379601ca184461ad6483361070ac22a021ad83b18
 SHA512:
-  metadata.gz: 2eedd1a0b3a0226000664e4c9268874ac1886d7d940668f79826348cfbc285609be465c280a727f332297514ef5138eac095c91ed376881d406713962f8fa438
-  data.tar.gz: 93bd001ca3321104020bb7a0d1c48324c571cc97e81fc130d114958865eac35e378461b69c9e5e582070100686f9c99c89c74b02a64fada2c48a532bd22f100f
+  metadata.gz: 035ad570ca83474c8a2256ca0107507322aacdd7987cdde9c63332158e2cb59f1c2e100d30e384648b711a2e73e77a3d3a36a1e6e65789de74a4154557e23610
+  data.tar.gz: 3d10ed8e6f05f03b7d6b2124e831e30e7684a7b505791265db4170ad117f574e4a53977aa8e0ed1abd97fef7f33cdee8f819ac620eaba06e1d4e3adb6a908047

data/lib/nicinfo/autnum.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012,2013,2014 American Registry for Internet Numbers
+# Copyright (C) 2011-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -22,7 +22,7 @@ require 'nicinfo/data_tree'
 module NicInfo
 
   def NicInfo.display_autnum json_data, config, data_tree
-    autnum = Autnum.new( config ).process( json_data )
+    autnum = config.factory.new_autnum.process( json_data )
     NicInfo::display_object_with_entities( autnum, config, data_tree )
   end
 
@@ -47,15 +47,15 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ AS NUMBER ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
-      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass, "autnum", @config )
       endNum = NicInfo.get_endAutnum @objectclass
       startNum = NicInfo.get_startAutnum @objectclass
       if endNum
-        @config.logger.terse "Start AS Number", startNum
-        @config.logger.terse "End AS Number", endNum
+        @config.logger.terse "Start AS Number", startNum, NicInfo::AttentionType::SUCCESS
+        @config.logger.terse "End AS Number", endNum, NicInfo::AttentionType::SUCCESS
       else
-        @config.logger.terse "AS Number", startNum
+        @config.logger.terse "AS Number", startNum, NicInfo::AttentionType::SUCCESS
       end
       @config.logger.extra "Name", NicInfo.get_name( @objectclass )
       @config.logger.terse "Country", NicInfo.get_country( @objectclass )

data/lib/nicinfo/cache.rb

@@ -106,36 +106,6 @@ module NicInfo
       return count
     end
 
-    def get_last
-      cache_files = Dir::entries(@config.rdap_cache_dir)
-      last_file = nil
-      last_file_mtime = nil
-      cache_files.each do |file|
-        full_file_name = File.join(@config.rdap_cache_dir, file)
-        if !file.start_with?(".")
-          mtime = File.mtime(full_file_name)
-          if last_file == nil
-            last_file = full_file_name
-            last_file_mtime = mtime
-          elsif mtime > last_file_mtime
-            last_file = full_file_name
-            last_file_mtime = mtime
-          end
-        end
-      end
-      if last_file
-        f = File.open(last_file, "r")
-        data = ''
-        f.each_line do |line|
-          data += line
-        end
-        f.close
-        return [last_file, last_file_mtime, data]
-      end
-      #else
-      return nil
-    end
-
   end
 
 end

data/lib/nicinfo/common_json.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012,2013,2014 American Registry for Internet Numbers
+# Copyright (C) 2011-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -67,7 +67,7 @@ module NicInfo
       entities = Array.new
       json_entities = NicInfo::get_entitites( objectclass )
       json_entities.each do |json_entity|
-        entity = Entity.new( @config )
+        entity = @config.factory.new_entity
         entity.process( json_entity )
         entities << entity
       end if json_entities
@@ -76,14 +76,15 @@ module NicInfo
 
     def display_remarks objectclass
       remarks = objectclass[ "remarks" ]
-      if (Notices::is_excessive_notice(remarks, @config)) && (@config.logger.data_amount != NicInfo::DataAmount::EXTRA_DATA)
-        @config.logger.datum "Excessive Remarks", "Use \"-V\" or \"--data extra\" to see them."
-      else
-        if remarks
-          if remarks.instance_of?( Array )
+      if remarks
+        excessive_notice = @config.factory.new_notices.is_excessive_notice(remarks)
+        if (excessive_notice && (@config.logger.data_amount != NicInfo::DataAmount::EXTRA_DATA))
+          @config.logger.datum "Excessive Remarks", "Use \"-V\" or \"--data extra\" to see them."
+        else
+          if remarks.instance_of?(Array)
             remarks.each do |remark|
-              if remark.instance_of?( Hash )
-                title = remark[ "title" ]
+              if remark.instance_of?(Hash)
+                title = remark["title"]
                 @config.logger.datum "Remarks", "-- #{title} --" if title
                 descriptions = NicInfo::get_descriptions remark, @config
                 i = 1
@@ -97,11 +98,11 @@ module NicInfo
                 end if descriptions
                 links = NicInfo::get_links remark, @config
                 if links
-                  @config.logger.datum "More", NicInfo::get_alternate_link( links )
-                  @config.logger.datum "About", NicInfo::get_about_link( links )
-                  @config.logger.datum "TOS", NicInfo::get_tos_link( links )
-                  @config.logger.datum "(C)", NicInfo::get_copyright_link( links )
-                  @config.logger.datum "License", NicInfo::get_license_link( links )
+                  @config.logger.datum "More", NicInfo::get_alternate_link(links)
+                  @config.logger.datum "About", NicInfo::get_about_link(links)
+                  @config.logger.datum "TOS", NicInfo::get_tos_link(links)
+                  @config.logger.datum "(C)", NicInfo::get_copyright_link(links)
+                  @config.logger.datum "License", NicInfo::get_license_link(links)
                 end
               else
                 @config.conf_msgs << "remark is not an object."
@@ -203,6 +204,25 @@ module NicInfo
       end
     end
 
+    def display_simple_links links
+      if links
+        if links.instance_of?( Array )
+          alternate = NicInfo.get_alternate_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "More", alternate, NicInfo::AttentionType::SECONDARY if alternate
+          about = NicInfo.get_about_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "About", about, NicInfo::AttentionType::SECONDARY if about
+          tos = NicInfo.get_tos_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "TOS", tos, NicInfo::AttentionType::SECONDARY if tos
+          copyright = NicInfo.get_copyright_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "(C)", copyright, NicInfo::AttentionType::SECONDARY if copyright
+          license = NicInfo.get_license_link links
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "License", license, NicInfo::AttentionType::SECONDARY if license
+        else
+          @config.conf_msgs << "'links' is not an array."
+        end
+      end
+    end
+
   end
 
   class EventActor

data/lib/nicinfo/config.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011,2012,2013,2014,2015 American Registry for Internet Numbers
+# Copyright (C) 2011-2017 American Registry for Internet Numbers
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,9 +15,10 @@
 
 require 'fileutils'
 require 'time'
-require 'nicinfo/nicinfo_logger'
 require 'yaml'
 require 'ostruct'
+require 'nicinfo/nicinfo_logger'
+require 'nicinfo/factory'
 require 'nicinfo/constants'
 
 module NicInfo
@@ -25,7 +26,7 @@ module NicInfo
   # Handles configuration of the application
   class Config
 
-    attr_accessor :logger, :config, :rdap_cache_dir, :options, :conf_msgs, :rdap_bootstrap_dir
+    attr_accessor :logger, :config, :rdap_cache_dir, :options, :conf_msgs, :rdap_bootstrap_dir, :factory
 
     # Intializes the configuration with a place to look for the config file
     # If the file doesn't exist, a default is used.
@@ -36,6 +37,7 @@ module NicInfo
       @app_data = app_data
       @logger = NicInfo::Logger.new
       @conf_msgs = Array.new
+      @factory = NicInfo::Factory.new( self )
 
       config_file_name = Config.formulate_config_file_name( @app_data )
       if File.exist?( config_file_name )
@@ -99,7 +101,7 @@ module NicInfo
       if config_version == nil || config_version < NicInfo::CONFIG_VERSION
         # if a reset hasn't been asked for
         if !@options.reset_config
-          @logger.mesg( "Your configuration is old. Use --reset to create a new one.")
+          @logger.mesg( "Your configuration is old. Use --reset to create a new one.", NicInfo::AttentionType::ERROR )
         end
       end
     end
@@ -222,6 +224,9 @@ module NicInfo
       @logger.auto_wrap=output[ NicInfo::AUTO_WRAP ]
       @logger.default_width=output[ NicInfo::DEFAULT_WIDTH ]
       @logger.detect_width=output[ NicInfo::DETECT_WIDTH ]
+
+      @logger.color_scheme = output[ NicInfo::COLOR_SCHEME ]
+      @logger.validate_color_scheme
     end
 
     def self.clean
@@ -231,7 +236,7 @@ module NicInfo
     end
 
     def self.formulate_app_data_dir
-      if RUBY_PLATFORM =~ /win32/
+      if Gem.win_platform?
         data_dir = File.join(ENV['APPDATA'], "NicInfo")
       elsif RUBY_PLATFORM =~ /linux/
         data_dir = File.join(ENV['HOME'], ".NicInfo")
@@ -282,6 +287,13 @@ output:
   # or cannot be detected
   default_width: 80
 
+  # The color scheme to use. Possible values are
+  # - DARK for terminals with dark background
+  # - LIGHT for terminals with light background
+  # - NONE for no color
+  # color is turned off automatically if a pager is used and the pager is not 'less'.
+  color_scheme: DARK
+
 cache:
 
   # The maximum age an item from the cache will be used.
@@ -303,9 +315,9 @@ cache:
 bootstrap:
 
   # The base or bootstrap URL. Specifying this will bypass all built-in bootstrapping.
-  #base_url: https://rdap.arin.net/bootstrap
+  #base_url: https://rdap-bootstrap.arin.net/bootstrap
 
-  help_root_url: https://rdap.arin.net/bootstrap
+  help_root_url: https://rdap-bootstrap.arin.net/bootstrap
 
   entity_root_url: https://rdap.arin.net/registry
 

data/lib/nicinfo/constants.rb

@@ -18,7 +18,7 @@
 
 module NicInfo
 
-  VERSION = "1.3.0-alpha1"
+  VERSION = "1.5.0"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
   CONFIG_VERSION = 4
@@ -43,7 +43,7 @@ module NicInfo
   IPV6_REGEX = /\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\z/
   IPV6_HEXCOMPRESS_REGEX = /\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\z/
 
-  #File Name Constants
+  # File Name Constants
   LASTTREE_YAML          = "lasttree.yaml"
   DEMO_DIR               = "demo"
   BOOTSTRAP_FILE_DIR     = "bsfiles"
@@ -53,6 +53,21 @@ module NicInfo
   IPV4_BOOTSTRAP         = "ipv4.json"
   IPV6_BOOTSTRAP         = "ipv6.json"
 
+  # JCR Constants
+  JCR_DIR                    = "jcr"
+  RDAP_JCR                   = "rdap.jcr"
+  STRICT_RDAP_JCR            = "strict.jcr"
+  JCR_ROOT_ENTITY            = "entity_response"
+  JCR_ROOT_NAMESERVER        = "nameserver_response"
+  JCR_ROOT_DOMAIN            = "domain_response"
+  JCR_ROOT_NETWORK           = "network_response"
+  JCR_ROOT_AUTNUM            = "autnum_response"
+  JCR_ROOT_ERROR             = "error_response"
+  JCR_ROOT_HELP              = "help_response"
+  JCR_ROOT_DOMAIN_SEARCH     = "domainSearch_response"
+  JCR_ROOT_NAMESERVER_SEARCH = "nameserverSearch_response"
+  JCR_ROOT_ENTITY_SEARCH     = "entitySearch_response"
+
   # Config constants
   OUTPUT = "output"
   MESSAGES = "messages"
@@ -63,6 +78,7 @@ module NicInfo
   AUTO_WRAP = "auto_wrap"
   DETECT_WIDTH = "detect_width"
   DEFAULT_WIDTH = "default_width"
+  COLOR_SCHEME = "color_scheme"
   CACHE = "cache"
   CACHE_EXPIRY = "cache_expiry"
   CACHE_EVICTION = "cache_eviction"

data/lib/nicinfo/data_tree.rb

@@ -144,7 +144,7 @@ module NicInfo
       end
       num_count = 1
       @logger.start_data_item if print_tree
-      @logger.prose( @data_amount, "[ RESPONSE DATA ]", " ")
+      @logger.prose( @data_amount, "[ RESPONSE DATA ]", " ", NicInfo::AttentionType::SUCCESS )
       @roots.each do |root|
         if annotate
           if root.alert
@@ -157,7 +157,7 @@ module NicInfo
         else
           s = root.to_s
         end
-        retval = @logger.log_tree_item( @data_amount, s )
+        retval = @logger.log_tree_item( @data_amount, s, NicInfo::AttentionType::SUCCESS )
         if annotate
           prefix = " "
           child_num = 1
@@ -193,7 +193,7 @@ module NicInfo
         child_num = 0
       end
       prefix = prefix.tr( "`", " ") + spacer + ( node == parent.children.last ? "`" : "|" )
-      @logger.log_tree_item( @data_amount, prefix + num_str + node.to_s )
+      @logger.log_tree_item( @data_amount, prefix + num_str + node.to_s, NicInfo::AttentionType::SUCCESS )
       node.children.each do |child|
         rprint( child_num, node, child, prefix )
         child_num += 1 if child_num > 0

data/lib/nicinfo/demo/domain-dnr.json

@@ -506,9 +506,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/domain/xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/domain/xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/domain/xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/domain/xn--fo-5ja.example"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/demo/entities.json

@@ -147,9 +147,9 @@
       ],
       "links": [
         {
-          "value": "https://rdap.arin.net/bootstrap/entity/entity-dnr",
+          "value": "https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr",
           "rel": "self",
-          "href": "https://rdap.arin.net/bootstrap/entity/entity-dnr"
+          "href": "https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr"
         }
       ],
       "port43": "whois.example.net",
@@ -286,9 +286,9 @@
       ],
       "links": [
         {
-          "value": "https://rdap.arin.net/bootstrap/entity/foo1",
+          "value": "https://rdap-bootstrap.arin.net/bootstrap/entity/foo1",
           "rel": "self",
-          "href": "https://rdap.arin.net/bootstrap/entity/foo1"
+          "href": "https://rdap-bootstrap.arin.net/bootstrap/entity/foo1"
         }
       ],
       "events": [

data/lib/nicinfo/demo/entity-dnr.json

@@ -123,9 +123,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/entity/entity-dnr",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/entity/entity-dnr"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/entity/entity-dnr"
         }
     ],
     "port43":"whois.example.net",

data/lib/nicinfo/demo/entity-rir.json

@@ -132,9 +132,9 @@
     ],
     "links":[
         {
-            "value":"https://rdap.arin.net/bootstrap/entity/foo1",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/foo1",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/entity/foo1"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/entity/foo1"
         }
     ],
     "events":[

data/lib/nicinfo/demo/error-code.json

@@ -14,12 +14,41 @@
             ],
             "links":[
                 {
-                    "value":"https://rdap.arin.net/bootstrap/entity/restricted",
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
                     "rel":"terms-of-service",
                     "type":"text/html",
                     "href":"http://www.example.com/tos.html"
                 }
             ]
+        },
+        {
+            "title":"Copyright",
+            "description":[
+                "This test data is Copyright (C) 2015-2018 ARIN."
+            ],
+            "links":[
+                {
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
+                    "rel":"copyright",
+                    "type":"text/html",
+                    "href":"http://www.example.com/copyright.html"
+                }
+            ]
+        },
+        {
+            "title":"About",
+            "description":[
+                "Questions regarding ARIN's RDAP service should be sent to arin-tech-discuss@arin.net.",
+                "See our mailing list for more info."
+            ],
+            "links":[
+                {
+                    "value":"https://rdap-bootstrap.arin.net/bootstrap/entity/restricted",
+                    "rel":"about",
+                    "type":"text/html",
+                    "href":"https://lists.arin.net/mailman/listinfo/arin-tech-discuss"
+                }
+            ]
         }
     ],
     "errorCode":418,

data/lib/nicinfo/demo/nameservers.json

@@ -27,8 +27,9 @@
     "nameserverSearchResults": [
       {
         "handle":"XXXX",
+        "objectClassName" : "nameserver",
         "ldhName":"ns1.xn--fo-5ja.example",
-        "unicodeName":"foo.example",
+        "unicodeName":"ns1.foo.example",
         "status":[ "active" ],
         "ipAddresses":{
           "v4":[ "192.0.2.1", "192.0.2.2" ],
@@ -44,9 +45,9 @@
         ],
         "links":[
           {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
           }
         ],
         "port43":"whois.example.net",
@@ -229,9 +230,9 @@
       },
       {
         "handle":"XXXX2",
-        "objectClassName":"domain",
+        "objectClassName":"nameserver",
         "ldhName":"ns1.xn--fo-5ja.example",
-        "unicodeName":"foo.example",
+        "unicodeName":"ns1.foo.example",
         "status":[ "active" ],
         "ipAddresses":{
           "v4":[ "192.0.2.1", "192.0.2.2" ],
@@ -247,9 +248,9 @@
         ],
         "links":[
           {
-            "value":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
+            "value":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example",
             "rel":"self",
-            "href":"https://rdap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
+            "href":"https://rdap-bootstrap.arin.net/bootstrap/nameserver/ns1.xn--fo-5ja.example"
           }
         ],
         "port43":"whois.example.net",