nicinfo 1.3.0.pre.alpha2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1541e4e748c2ac0eeddfefd4288d65ea85af1826
-  data.tar.gz: 49e3d7584b192966fe458b2cd57911d4e48d244e
+  metadata.gz: d5fa366b19d52c697ed3b9beb65369186526be04
+  data.tar.gz: 902ebca0583c04b04a124f42ea3dfb76d9addbe5
 SHA512:
-  metadata.gz: 8a0849a883b4cd8339ee447054c1dbcd5638403b7e75038c507c8dcb6a48a4accacb862c005fa45da22c93590072502478b9011461b0a586cc7ecd0277a8ef55
-  data.tar.gz: cacddfe85ad2b640fd8b7622ca098dd7f3c4abca3e5245fdedf0c377935b3364395cb0b74ff272d2845f3b49f0b83f1495cb122f2ae71c668a85afbc0a42269b
+  metadata.gz: 4690149f62fc7a1c8fd1b91af76544ea64ed4373cf95b1b6f0633ba48f12fcc89cc37ca2e3f365ceb6f5a094449a3b3a625fca5a52990911da3d0a110d22d1c6
+  data.tar.gz: a43cdd24bcae1d910a97e92722e732cac56ab33b28b524b15b399ce8821281829e1d8503777776dec1bd962578db29364a6590ba04c04233e289b3bd181e2e5a

data/lib/nicinfo/autnum.rb

@@ -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.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
       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/config.rb

@@ -101,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
@@ -224,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
@@ -233,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")
@@ -284,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.

data/lib/nicinfo/constants.rb

@@ -18,7 +18,7 @@
 
 module NicInfo
 
-  VERSION = "1.3.0-alpha2"
+  VERSION = "1.3.0"
   VERSION_LABEL = "NicInfo v." + VERSION
   COPYRIGHT = "Copyright (c) 2011-2017 American Registry for Internet Numbers (ARIN)"
   CONFIG_VERSION = 4
@@ -63,6 +63,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/domain.rb

@@ -140,10 +140,10 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ DOMAIN ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Domain Name", NicInfo::get_ldhName( @objectclass )
-      @config.logger.datum "I18N Domain Name", NicInfo::get_unicodeName( @objectclass )
+      @config.logger.terse "Domain Name", NicInfo::get_ldhName( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.datum "I18N Domain Name", NicInfo::get_unicodeName( @objectclass ), NicInfo::AttentionType::SUCCESS
       variants = @objectclass[ "variants" ]
       variant_no = 1
       variants.each do |variant|

data/lib/nicinfo/entity.rb

@@ -282,20 +282,20 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ ENTITY ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
       @jcard.fns.each do |fn|
-        @config.logger.terse "Name", fn
+        @config.logger.terse "Name", fn, NicInfo::AttentionType::SUCCESS
       end
       @jcard.names.each do |n|
-        @config.logger.extra "Name", n
+        @config.logger.extra "Name", n, NicInfo::AttentionType::SUCCESS
       end
       @jcard.orgs.each do |org|
         item_value = org.names.join( ", " )
         if !org.type.empty?
           item_value << " ( #{org.type.join( ", " )} )"
         end
-        @config.logger.terse "Organization", item_value
+        @config.logger.terse "Organization", item_value, NicInfo::AttentionType::SUCCESS
       end
       @jcard.titles.each do |title|
         @config.logger.extra "Title", title

data/lib/nicinfo/error_code.rb

@@ -33,7 +33,7 @@ module NicInfo
       if title == nil
         title = ""
       end
-      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ ERROR ]", title
+      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ ERROR ]", title, NicInfo::AttentionType::ERROR
       @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Code", ec[ "errorCode" ]
       description = ec[ "description" ]
       i = 1

data/lib/nicinfo/ip.rb

@@ -50,10 +50,10 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ IP NETWORK ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Start Address", NicInfo.get_startAddress( @objectclass )
-      @config.logger.terse "End Address", NicInfo.get_endAddress( @objectclass )
+      @config.logger.terse "Start Address", NicInfo.get_startAddress( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.terse "End Address", NicInfo.get_endAddress( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.terse "CIDRs", get_CIDRs
       @config.logger.datum "IP Version", @objectclass[ "ipVersion" ]
       @config.logger.extra "Name", NicInfo.get_name( @objectclass )

data/lib/nicinfo/nicinfo_logger.rb

@@ -15,6 +15,7 @@
 # The run_pager code came from http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
 # and is credited to Nathan Weizenbaum
 
+require 'rainbow'
 require 'nicinfo/enum'
 
 module NicInfo
@@ -47,18 +48,44 @@ module NicInfo
 
   end
 
+  class AttentionType < NicInfo::Enum
+
+    AttentionType.add_item(:SUCCESS, "SUCCESS" )
+    AttentionType.add_item(:INFO, "INFO" )
+    AttentionType.add_item(:PRIMARY, "PRIMARY" )
+    AttentionType.add_item(:SECONDARY, "SECONDARY" )
+    AttentionType.add_item(:ERROR, "ERROR" )
+
+  end
+
+  class ColorScheme < NicInfo::Enum
+
+    # dark background
+    ColorScheme.add_item(:DARK, "DARK")
+
+    # light background
+    ColorScheme.add_item(:LIGHT, "LIGHT")
+
+    # none
+    ColorScheme.add_item(:NONE, "NONE")
+
+  end
+
   # A logger for this application.
   class Logger
 
     attr_accessor :message_level, :data_amount, :message_out, :data_out, :item_name_length, :item_name_rjust, :pager
     attr_accessor :auto_wrap, :detect_width, :default_width, :prose_name_rjust, :prose_name_length
+    attr_accessor :is_less_available, :color_scheme, :rainbow
 
     def initialize
 
       @message_level = MessageLevel::SOME_MESSAGES
       @data_amount = DataAmount::NORMAL_DATA
+      @color_scheme = ColorScheme::DARK
       @message_out = $stdout
       @data_out = $stdout
+      @rainbow = Rainbow.new
       @item_name_length = 25
       @item_name_rjust = true
       @prose_name_length = 10
@@ -67,7 +94,7 @@ module NicInfo
       @message_last_written_to = false
       @data_last_written_to = false
 
-      return if RUBY_PLATFORM =~ /win32/
+      return if Gem.win_platform?
       #else
       @columns = get_terminal_columns( `stty -a`, @default_width )
     end
@@ -80,12 +107,17 @@ module NicInfo
 
     def validate_message_level
       raise ArgumentError, "Message log level not defined" if @message_level == nil
-      raise ArgumentError, "Unknown message log level '" + @message_level.to_s + "'" if !MessageLevel.has_value?(@message_level.to_s)
+      raise ArgumentError, "Unknown message log level '" + @message_level.to_s + "'" unless MessageLevel.has_value?(@message_level.to_s)
     end
 
     def validate_data_amount
       raise ArgumentError, "Data log level not defined" if @data_amount == nil
-      raise ArgumentError, "Unknown data log level '" + @data_amount.to_s + "'" if !DataAmount.has_value?(@data_amount.to_s)
+      raise ArgumentError, "Unknown data log level '" + @data_amount.to_s + "'" unless DataAmount.has_value?(@data_amount.to_s)
+    end
+
+    def validate_color_scheme
+      raise ArgumentError, "Color scheme not defined" if @color_scheme == nil
+      raise ArgumentError, "Unknown color scheme '" + @color_scheme.to_s + "'" unless ColorScheme.has_value?(@color_scheme.to_s)
     end
 
     def start_data_item
@@ -107,147 +139,167 @@ module NicInfo
     end
 
     # Outputs at the :SOME_MESSAGES level
-    def mesg message
+    def mesg message, attention_type = nil
       validate_message_level()
       if (@message_level != MessageLevel::NO_MESSAGES)
-        log_info("# " + message.to_s)
+        log_info("# " + message.to_s, attention_type )
         return true
       end
       return false
     end
 
     # Outputs at the :ALL_MESSAGES level
-    def trace message
+    def trace message, attention_type = nil
       validate_message_level()
       if (@message_level != MessageLevel::NO_MESSAGES && @message_level != MessageLevel::SOME_MESSAGES)
-        log_info("## " + message.to_s)
+        log_info("## " + message.to_s, attention_type )
         return true
       end
       return false
     end
 
     # Outputs a datum at :TERSE_DATA level
-    def terse item_name, item_value
+    def terse item_name, item_value, attention_type = nil
       validate_data_amount()
-      log_data(item_name, item_value)
+      log_data(item_name, item_value, attention_type )
       return true
     end
 
     # Outputs a data at :NORMAL_DATA level
-    def datum item_name, item_value
+    def datum item_name, item_value, attention_type = nil
       validate_data_amount()
       if (@data_amount != DataAmount::TERSE_DATA)
-        log_data(item_name, item_value)
+        log_data(item_name, item_value, attention_type )
         return true
       end
       return false
     end
 
-    def extra item_name, item_value
+    def extra item_name, item_value, attention_type = nil
       validate_data_amount()
       if (@data_amount != DataAmount::TERSE_DATA && @data_amount != DataAmount::NORMAL_DATA)
-        log_data(item_name, item_value)
+        log_data(item_name, item_value, attention_type )
         return true
       end
       return false
     end
 
-    def data_title title
+    def data_title title, attention_type = nil
       validate_data_amount()
-      log_just title, " ", @item_name_length, @item_name_rjust, ""
+      log_just title, " ", @item_name_length, @item_name_rjust, "", attention_type
       return true
     end
 
-    def info data_amount, item_name, item_value
+    def info data_amount, item_name, item_value, attention_type = nil
       retval = false
       validate_data_amount()
       case data_amount
         when DataAmount::TERSE_DATA
-          log_data(item_name, item_value)
+          log_data(item_name, item_value, attention_type )
           retval = true
         when DataAmount::NORMAL_DATA
           if (@data_amount != DataAmount::TERSE_DATA)
-            log_data( item_name, item_value)
+            log_data( item_name, item_value, attention_type )
             retval = true
           end
         when DataAmount::EXTRA_DATA
           if (@data_amount != DataAmount::TERSE_DATA && @data_amount != DataAmount::NORMAL_DATA)
-            log_data( item_name, item_value )
+            log_data( item_name, item_value, attention_type )
             retval = true
           end
       end
       return retval
     end
 
-    def raw data_amount, raw_data, wrap = true
+    def raw data_amount, raw_data, wrap = true, attention_type = nil
       retval = false
       validate_data_amount()
       case data_amount
         when DataAmount::TERSE_DATA
-          log_raw(raw_data, wrap)
+          log_raw(raw_data, wrap, attention_type )
           retval = true
         when DataAmount::NORMAL_DATA
           if (@data_amount != DataAmount::TERSE_DATA)
-            log_raw(raw_data, wrap)
+            log_raw(raw_data, wrap, attention_type )
             retval = true
           end
         when DataAmount::EXTRA_DATA
           if (@data_amount != DataAmount::TERSE_DATA && @data_amount != DataAmount::NORMAL_DATA)
-            log_raw(raw_data, wrap)
+            log_raw(raw_data, wrap, attention_type )
             retval = true
           end
       end
       return retval
     end
 
-    def prose data_amount, prose_name, prose_value
+    def prose data_amount, prose_name, prose_value, attention_type = nil
       retval = false
       validate_data_amount()
       case data_amount
         when DataAmount::TERSE_DATA
-          log_prose prose_name, prose_value
+          log_prose prose_name, prose_value, attention_type
           retval = true
         when DataAmount::NORMAL_DATA
           if (@data_amount != DataAmount::TERSE_DATA)
-            log_prose prose_name, prose_value
+            log_prose prose_name, prose_value, attention_type
             retval = true
           end
         when DataAmount::EXTRA_DATA
           if (@data_amount != DataAmount::TERSE_DATA && @data_amount != DataAmount::NORMAL_DATA)
-            log_prose prose_name, prose_value
+            log_prose prose_name, prose_value, attention_type
             retval = true
           end
       end
       return retval
     end
 
-    def log_tree_item data_amount, tree_item
+    def log_tree_item data_amount, tree_item, attention_type = nil
       retval = false
       validate_data_amount()
       case data_amount
         when DataAmount::TERSE_DATA
-          log_raw(tree_item, true)
+          log_raw(tree_item, true, attention_type )
           retval = true
         when DataAmount::NORMAL_DATA
           if (@data_amount != DataAmount::TERSE_DATA)
-            log_raw(tree_item, true)
+            log_raw(tree_item, true, attention_type )
             retval = true
           end
         when DataAmount::EXTRA_DATA
           if (@data_amount != DataAmount::TERSE_DATA && @data_amount != DataAmount::NORMAL_DATA)
-            log_raw(tree_item, true)
+            log_raw(tree_item, true, attention_type )
             retval = true
           end
       end
       return retval
     end
 
+    def is_less_available?
+      if @is_less_available == nil
+        avail = ENV['PATH'].split(File::PATH_SEPARATOR).any? do |dir|
+          File.executable?(File.join(dir, "less"))
+        end
+        if avail
+          @is_less_available = "less"
+        else
+          @is_less_available = false
+        end
+      end
+      return @is_less_available
+    end
+
+    def get_pager
+      ENV['PAGER'] || is_less_available? || 'more'
+    end
+
     # This code came from http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
     def run_pager
       return unless @pager
-      return if RUBY_PLATFORM =~ /win32/
+      return if Gem.win_platform?
       return unless STDOUT.tty?
 
+      @color_scheme = ColorScheme::NONE unless get_pager == "less"
+
       read, write = IO.pipe
 
       unless Kernel.fork # Child process
@@ -266,7 +318,7 @@ module NicInfo
       ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
 
       Kernel.select [STDIN] # Wait until we have input before we start the pager
-      pager = ENV['PAGER'] || 'more'
+      pager = get_pager
       exec pager rescue exec "/bin/sh", "-c", pager
     end
 
@@ -310,24 +362,24 @@ module NicInfo
 
     private
 
-    def log_info message
+    def log_info message, attention_type
       if @data_last_written_to && @message_out == @data_out
         @data_out.puts
       end
-      @message_out.puts(message)
+      puts_color( @message_out, message, attention_type)
       @message_last_written_to = true
       @data_last_written_to = false
     end
 
-    def log_data item_name, item_value
-      log_just item_name, item_value, @item_name_length, @item_name_rjust, ":  "
+    def log_data item_name, item_value, attention_type
+      log_just item_name, item_value, @item_name_length, @item_name_rjust, ":  ", attention_type
     end
 
-    def log_prose item_name, item_value
-      log_just item_name, item_value, @prose_name_length, @prose_name_rjust, " "
+    def log_prose item_name, item_value, attention_type
+      log_just item_name, item_value, @prose_name_length, @prose_name_rjust, " ", attention_type
     end
 
-    def log_just item_name, item_value, name_length, name_rjust, separator
+    def log_just item_name, item_value, name_length, name_rjust, separator, attention_type
       if (item_value != nil && !item_value.to_s.empty?)
         format_string = "%" + name_length.to_s + "s%s%s"
         if (!name_rjust)
@@ -338,33 +390,80 @@ module NicInfo
           i = 0
           lines.each do |line|
             if i == 0
-              @data_out.puts(format(format_string, item_name, separator, line))
+              puts_color( @data_out, format(format_string, item_name, separator, line), attention_type )
             else
-              @data_out.puts(format(format_string, " ", separator, line))
+              puts_color( @data_out, format(format_string, " ", separator, line), attention_type )
             end
             i = i + 1
           end
         else
-          @data_out.puts(format(format_string, item_name, separator, item_value))
+          puts_color( @data_out, format(format_string, item_name, separator, item_value), attention_type )
         end
         @data_last_written_to = true
         @message_last_written_to = false
       end
     end
 
-    def log_raw item_value, wrap
+    def log_raw item_value, wrap, attention_type
       if @auto_wrap and wrap
         lines = break_up_line item_value, get_width
         lines.each do |line|
-          @data_out.puts(line)
+          puts_color( @data_out, line, attention_type )
         end
       else
-        @data_out.puts(item_value)
+        puts_color( @data_out, item_value, attention_type )
       end
       @data_last_written_to = true
       @message_last_written_to = false
     end
 
+    def puts_color out, string, attention_type
+      if !attention_type || @color_scheme == ColorScheme::NONE || attention_type == AttentionType::PRIMARY
+        out.puts string
+      else
+        case attention_type
+          when AttentionType::SUCCESS
+            case @color_scheme
+              when ColorScheme::DARK
+                out.puts @rainbow.wrap(string).aqua
+              when ColorScheme::LIGHT
+                out.puts @rainbow.wrap(string).blue
+              else
+                out.puts string
+            end
+          when AttentionType::SECONDARY
+            case @color_scheme
+              when ColorScheme::DARK
+                out.puts @rainbow.wrap(string).green
+              when ColorScheme::LIGHT
+                out.puts @rainbow.wrap(string).green
+              else
+                out.puts string
+            end
+          when AttentionType::INFO
+            case @color_scheme
+              when ColorScheme::DARK
+                out.puts @rainbow.wrap(string).yellow.bright
+              when ColorScheme::LIGHT
+                out.puts @rainbow.wrap(string).blue.bright
+              else
+                out.puts string
+            end
+          when AttentionType::ERROR
+            case @color_scheme
+              when ColorScheme::DARK
+                out.puts @rainbow.wrap(string).red.bright
+              when ColorScheme::LIGHT
+                out.puts @rainbow.wrap(string).red
+              else
+                out.puts string
+            end
+          else
+            out.puts string
+        end
+      end
+    end
+
   end
 
 end

data/lib/nicinfo/nicinfo_main.rb

@@ -199,6 +199,15 @@ module NicInfo
           raise OptionParser::InvalidArgument, pager.to_s unless pager =~ /yes|no|true|false/i
         end
 
+        opts.on( "--color-scheme DARK|LIGHT|NONE",
+                 "Determines color scheme to use:",
+                 "  dark  - for terminals with dark backgrounds",
+                 "  light - for terminals with light backgrounds",
+                 "  none  - turn off colors" ) do |cs|
+          @config.logger.color_scheme = cs.to_s.upcase
+          raise OptionParser::InvalidArgument, cs.to_s unless cs =~ /dark|light|none/i
+        end
+
         opts.on( "-V",
                  "Equivalent to --messages all and --data extra" ) do |v|
           @config.logger.data_amount = NicInfo::DataAmount::EXTRA_DATA
@@ -379,7 +388,7 @@ module NicInfo
     def run
 
       @config.logger.run_pager
-      @config.logger.mesg(NicInfo::VERSION_LABEL)
+      @config.logger.mesg(NicInfo::VERSION_LABEL, NicInfo::AttentionType::PRIMARY )
       @config.setup_workspace
       @config.check_config_version
       @cache = Cache.new(@config)
@@ -395,16 +404,16 @@ module NicInfo
         check_bsfiles_age = @config.check_bsfiles_age?
         update_bsfiles = @config.update_bsfiles?( check_bsfiles_age )
         if update_bsfiles
-          @config.logger.mesg( "IANA RDAP bootstrap files are old and need to be updated." )
+          @config.logger.mesg( "IANA RDAP bootstrap files are old and need to be updated.", NicInfo::AttentionType::ERROR )
           get_iana_files
         elsif check_bsfiles_age
-          @config.logger.mesg( "IANA RDAP bootstrap files are old. Update them with --iana option" )
+          @config.logger.mesg( "IANA RDAP bootstrap files are old. Update them with --iana option", NicInfo::AttentionType::ERROR )
         end
       end
 
       if @config.options.demo
-        @config.logger.mesg( "Populating cache with demonstration results" )
-        @config.logger.mesg( "Try the following demonstration queries:" )
+        @config.logger.mesg( "Populating cache with demonstration results", NicInfo::AttentionType::INFO )
+        @config.logger.mesg( "Try the following demonstration queries:", NicInfo::AttentionType::INFO )
         demo_dir = File.join( File.dirname( __FILE__ ), NicInfo::DEMO_DIR )
         demo_files = Dir::entries( demo_dir )
         demo_files.each do |file|
@@ -415,7 +424,7 @@ module NicInfo
             demo_url = json_data[ NicInfo::NICINFO_DEMO_URL ]
             demo_hint = json_data[ NicInfo::NICINFO_DEMO_HINT ]
             @cache.create( demo_url, demo_data )
-            @config.logger.mesg( "  " + demo_hint )
+            @config.logger.mesg( "  " + demo_hint, NicInfo::AttentionType::INFO )
           end
         end
       end
@@ -442,7 +451,7 @@ module NicInfo
           @config.logger.mesg("Unable to determine your IP Address. You must specify it.")
           exit
         elsif
-          @config.logger.mesg("Your IP address is " + json_data["data"]["ip"])
+          @config.logger.mesg("Your IP address is " + json_data["data"]["ip"], NicInfo::AttentionType::SUCCESS )
           @config.options.argv[0] = json_data["data"]["ip"]
         end
       end
@@ -581,39 +590,39 @@ module NicInfo
         cache_self_references json_data
         retval = json_data
       rescue JSON::ParserError => a
-        @config.logger.mesg( "Server returned invalid JSON!" )
+        @config.logger.mesg( "Server returned invalid JSON!", NicInfo::AttentionType::ERROR )
       rescue SocketError => a
-        @config.logger.mesg(a.message)
+        @config.logger.mesg(a.message, NicInfo::AttentionType::ERROR )
       rescue ArgumentError => a
-        @config.logger.mesg(a.message)
+        @config.logger.mesg(a.message, NicInfo::AttentionType::ERROR )
       rescue Net::HTTPServerException => e
         case e.response.code
           when "200"
-            @config.logger.mesg( e.message )
+            @config.logger.mesg( e.message, NicInfo::AttentionType::SUCCESS )
           when "401"
-            @config.logger.mesg("Authorization is required.")
+            @config.logger.mesg("Authorization is required.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
           when "404"
-            @config.logger.mesg("Query yielded no results.")
+            @config.logger.mesg("Query yielded no results.", NicInfo::AttentionType::INFO )
             handle_error_response e.response
           else
-            @config.logger.mesg("Error #{e.response.code}.")
+            @config.logger.mesg("Error #{e.response.code}.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
         end
         @config.logger.trace("Server response code was " + e.response.code)
       rescue Net::HTTPFatalError => e
         case e.response.code
           when "500"
-            @config.logger.mesg("RDAP server is reporting an internal error.")
+            @config.logger.mesg("RDAP server is reporting an internal error.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
           when "501"
-            @config.logger.mesg("RDAP server does not implement the query.")
+            @config.logger.mesg("RDAP server does not implement the query.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
           when "503"
-            @config.logger.mesg("RDAP server is reporting that it is unavailable.")
+            @config.logger.mesg("RDAP server is reporting that it is unavailable.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
           else
-            @config.logger.mesg("Error #{e.response.code}.")
+            @config.logger.mesg("Error #{e.response.code}.", NicInfo::AttentionType::ERROR )
             handle_error_response e.response
         end
         @config.logger.trace("Server response code was " + e.response.code)
@@ -705,7 +714,7 @@ module NicInfo
       rdap_conformance = json[ "rdapConformance" ]
       if rdap_conformance
         rdap_conformance.each do |conformance|
-          @config.logger.trace( "Server conforms to #{conformance}" )
+          @config.logger.trace( "Server conforms to #{conformance}", NicInfo::AttentionType::SECONDARY )
         end
       else
         @config.conf_msgs << "Response has no RDAP Conformance level specified."
@@ -967,10 +976,10 @@ HELP_SUMMARY
 
     def show_conformance_messages
       return if @config.conf_msgs.size == 0
-      @config.logger.mesg( "** WARNING: There are problems in the response that might cause some data to discarded. **" )
+      @config.logger.mesg( "** WARNING: There are problems in the response that might cause some data to discarded. **", NicInfo::AttentionType::ERROR )
       i = 1
       @config.conf_msgs.each do |msg|
-        @config.logger.trace( "#{i} : #{msg}" )
+        @config.logger.trace( "#{i} : #{msg}", NicInfo::AttentionType::ERROR )
         i = i + 1
       end
     end
@@ -979,7 +988,7 @@ HELP_SUMMARY
       truncated = json_data[ "searchResultsTruncated" ]
       if truncated.instance_of?(TrueClass) || truncated.instance_of?(FalseClass)
         if truncated
-          @config.logger.mesg( "Results have been truncated by the server." )
+          @config.logger.mesg( "Results have been truncated by the server.", NicInfo::AttentionType::INFO )
         end
       end
       if truncated != nil

data/lib/nicinfo/notices.rb

@@ -52,10 +52,10 @@ module NicInfo
       return if notices == nil
       if (is_excessive_notice(notices) ) && (@config.logger.data_amount != NicInfo::DataAmount::EXTRA_DATA) && !ignore_excessive
         @config.logger.start_data_item
-        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Excessive Notices"
-        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "-----------------"
-        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Response contains excessive notices."
-        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Use the \"-V\" or \"--data extra\" options to see them."
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Excessive Notices", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "-----------------", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Response contains excessive notices.", NicInfo::AttentionType::INFO
+        @config.logger.raw NicInfo::DataAmount::NORMAL_DATA, "Use the \"-V\" or \"--data extra\" options to see them.", NicInfo::AttentionType::INFO
         @config.logger.end_data_item
       else
         notices.each do |notice|
@@ -72,17 +72,17 @@ module NicInfo
         title = ""
       end
       @config.conf_msgs << "'title' in 'notice' is not a string." unless title.instance_of?( String )
-      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ NOTICE ]", title
+      @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "[ NOTICE ]", title, NicInfo::AttentionType::SECONDARY
       type = notice[ "type" ]
       if type != nil
-        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Type", NicInfo.capitalize( type )
+        @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "Type", NicInfo.capitalize( type ), NicInfo::AttentionType::SECONDARY
       end
       description = notice[ "description" ]
       i = 1
       if description.instance_of?( Array )
         description.each do |line|
           if line.instance_of?( String )
-            @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line
+            @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, i.to_s, line, NicInfo::AttentionType::SECONDARY
             i = i + 1
           else
             @config.conf_msgs << "eleemnt of 'description' in 'notice' is not a string."
@@ -95,15 +95,15 @@ module NicInfo
       if links
         if links.instance_of?( Array )
           alternate = NicInfo.get_alternate_link links
-          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "More", alternate if alternate
+          @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 if about
+          @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 if tos
+          @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 if copyright
+          @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 if license
+          @config.logger.prose NicInfo::DataAmount::NORMAL_DATA, "License", license, NicInfo::AttentionType::SECONDARY if license
         else
           @config.conf_msgs << "'links' is not an array."
         end

data/lib/nicinfo/ns.rb

@@ -65,19 +65,19 @@ module NicInfo
     def display
       @config.logger.start_data_item
       @config.logger.data_title "[ NAME SERVER ]"
-      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass )
+      @config.logger.terse "Handle", NicInfo::get_handle( @objectclass ), NicInfo::AttentionType::SUCCESS
       @config.logger.extra "Object Class Name", NicInfo::get_object_class_name( @objectclass )
-      @config.logger.terse "Host Name", NicInfo::get_ldhName( @objectclass )
-      @config.logger.terse "IDN Host Name", NicInfo::get_unicodeName( @objectclass )
+      @config.logger.terse "Host Name", NicInfo::get_ldhName( @objectclass ), NicInfo::AttentionType::SUCCESS
+      @config.logger.terse "IDN Host Name", NicInfo::get_unicodeName( @objectclass ), NicInfo::AttentionType::SUCCESS
       ipAddrs = @objectclass[ "ipAddresses" ]
       if ipAddrs
         v6Addrs = ipAddrs[ "v6" ]
         v6Addrs.each do |v6|
-          @config.logger.terse "IPv6 Address", v6
+          @config.logger.terse "IPv6 Address", v6, NicInfo::AttentionType::SUCCESS
         end if v6Addrs
         v4Addrs = ipAddrs[ "v4" ]
         v4Addrs.each do |v4|
-          @config.logger.terse "IPv4 Address", v4
+          @config.logger.terse "IPv4 Address", v4, NicInfo::AttentionType::SUCCESS
         end if v4Addrs
       end
       @common.display_status @objectclass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicinfo
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.alpha2
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Newton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -101,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14