color-console 0.3.2 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c6caaaa3c163e9a30514ae3426ad18e3cc9b2b8f
+  data.tar.gz: 6fe85bf1de6c9be81efaaacc12e4ffeb473dd583
+SHA512:
+  metadata.gz: 811f6cd628eaadc98f4ad020c509eb04f96dc891be98eae94674cb32fcb60ed529fdcc6c6176281bcea98fc84d4e074eaa0dcca27280ba5b60f01caa2371d295
+  data.tar.gz: 7e538adcae1183a166f1611b6ce5756051d655ea9d08aa433343e1fa6f0d2384bd30aef90d9a6a93f62605475f2ffdbff94c43e301d71db3e9ecd6372fb527a5

data/README.md

@@ -1,6 +1,6 @@
 # ColorConsole
 
-ColorConsole is a small cross-platform library for outputting color text to the console, as well as providing utilities for drawing progress bars and outputting tabular data.
+ColorConsole is a small *cross-platform* library for outputting color text to the console on both Linux and Windows, as well as providing utilities for drawing progress bars and outputting tabular data.
 
 On Windows, Fiddler (under MRI) or FFI (other engines) is used to dynamically link to the Windows Console API functions, while on other platforms, ANSI escape sequences are used. As such, there are no dependencies and no libraries to install other than this gem.
 

data/lib/color_console/java_util_logger.rb

@@ -11,8 +11,8 @@ module Console
         include_package 'java.util.logging'
 
 
-        # Extends the java.util.ConsoleHandler, adding colorised logging output to
-        # the console.
+        # Extends the java.util.logging.ConsoleHandler, adding colorised logging
+        # output to the console.
         class ColorConsoleHandler < ConsoleHandler
 
             def initialize(format = RubyFormatter::DEFAULT_FORMAT)
@@ -72,6 +72,12 @@ module Console
             attr_accessor :indent
             # Level labels
             attr_reader :level_labels
+            # Optional proc for processing formatted msg before line wrapping.
+            # If a proc is set on this formatter, it will be called with the
+            # log record and message text before the message is formatted. It
+            # should return the revised message text to be logged (or nil if
+            # the message should be ignored).
+            attr_accessor :msg_proc
 
 
             # Constructs a new formatter for formatting log records according to
@@ -82,7 +88,7 @@ module Console
             def initialize(format = DEFAULT_FORMAT, width = nil)
                 super()
                 @format_string = format
-                @width = width || Console.width
+                @width = width || Console.width || -1
                 mark = java.lang.String.format(@format_string, Time.now,
                                                '', '', '', '!$!', nil, nil)
                 @indent = mark.lines.first.index('!$!')
@@ -94,7 +100,13 @@ module Console
 
 
             # Format a log record and return a string for publishing by a log handler.
+            # If a +msg_proc+ handler has been set on this formatter, it will get passed
+            # the +log_record+ for pre-processing before it is formatted by this method.
             def format(log_record)
+                msg_txt = self.formatMessage(log_record)
+                msg_txt = msg_proc.call(log_record, msg_txt) if msg_proc
+                return unless msg_txt
+
                 lvl = @level_labels[log_record.level]
                 indent = @indent || 0
                 spacer = ''
@@ -103,9 +115,7 @@ module Console
                     spacer = '  '
                     wrap_width -= 2
                 end
-
-                msg = wrap_width > 0 ? Console.wrap_text(log_record.message, wrap_width) :
-                    [log_record.message]
+                msg = wrap_width > 0 ? Console.wrap_text(msg_txt, wrap_width) : [msg_txt]
                 sb = java.lang.StringBuilder.new()
                 msg.each_with_index do |line, i|
                     if i == 0
@@ -148,7 +158,12 @@ module Console
         # Remove any existing console handler
         l = Java::JavaUtilLogging::Logger.getLogger(logger)
         l.getHandlers.each do |h|
-            l.removeHandler(h) if h.is_a?(Java::JavaUtilLogging::ConsoleHandler)
+            case h
+            when Console::JavaUtilLogger::ColorConsoleHandler
+                return
+            when Java::JavaUtilLogging::ConsoleHandler
+                l.removeHandler(h)
+            end
         end
 
         # Add a ColorConsoleHandler

data/lib/color_console/log4r_logger.rb

@@ -36,7 +36,10 @@ module Console
                         case
                         when event.data.is_a?(Exception) || (RUBY_ENGINE == 'jruby' &&
                                                              event.data.java_kind_of?(java.lang.Throwable))
-                            msg = Exception.format(event.data)
+                            e = event.data
+                            msg = "%-8s %-2s  %s: %s\n" % [level, thread, e.class, e.message]
+                            bt = e.backtrace.take(3).map{ |s| "                 from #{s}" }.join("\n")
+                            msg += bt
                         when event.data.is_a?(Array)
                             msg = event.data
                             case msg.first

data/lib/color_console/progress.rb

@@ -45,7 +45,7 @@ module Console
     # @see #status for other supported options
     def show_progress(label, complete, opts = {})
         if self.width
-            opts = {total: opts} if opts.is_a?(Fixnum)
+            opts = {total: opts} if opts.is_a?(Numeric)
             total = opts.fetch(:total, 100)
             complete = total if complete > total
             bar_length = opts.fetch(:bar_length, 40)

metadata

@@ -1,27 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: color-console
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.5
 platform: ruby
 authors:
 - Adam Gardiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies: []
-description: ! "        ColorConsole supports cross-platform (ANSI and Windows) colored
-  text output to the console.\n        It also provides useful methods for building
-  command-line interfaces that provide status\n        messages and progress bars.\n"
+description: |2
+          ColorConsole supports cross-platform (ANSI and Windows) colored text output to the console.
+          It also provides useful methods for building command-line interfaces that provide status
+          messages and progress bars.
 email: adam.b.gardiner@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
 - lib/color-console.rb
+- lib/color_console.rb
 - lib/color_console/console.rb
 - lib/color_console/java_util_logger.rb
 - lib/color_console/log4r_logger.rb
@@ -31,30 +32,28 @@ files:
 - lib/color_console/platform/windows_fiddle.rb
 - lib/color_console/progress.rb
 - lib/color_console/table.rb
-- lib/color_console.rb
 homepage: https://github.com/agardiner/color-console
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.5.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ColorConsole is a cross-platform library for outputting colored text to the
   console
 test_files: []