color-console 0.3 → 0.3.2

data/lib/color_console/java_util_logger.rb

@@ -49,7 +49,10 @@ module Console
         # suitable for output to the console.
         class RubyFormatter < Formatter
 
-            DEFAULT_FORMAT  = '%4$-6s %5$s%n'
+            # Default format pattern
+            DEFAULT_FORMAT  = '%4$-6s  %7$s%5$s'
+            # System line-ending
+            LINE_END = java.lang.String.format('%n')
 
             # A format string to use when formatting a log record.
             # @see Java function String.format for the format string syntax. The
@@ -59,8 +62,16 @@ module Console
             #   - logger_name The name of the logger that logged the record
             #   - level   The level of the message
             #   - message The log message
-            #   - thrown  Any exception that forms part of the log record.
+            #   - thrown  Any exception that forms part of the log record
+            #   - spacer  A spacer that will consist of 2 spaces if the log level
+            #       is config or greater.
             attr_accessor :format_string
+            # Width at which to split lines
+            attr_accessor :width
+            # Amount by which to indent lines
+            attr_accessor :indent
+            # Level labels
+            attr_reader :level_labels
 
 
             # Constructs a new formatter for formatting log records according to
@@ -68,27 +79,52 @@ module Console
             #
             # @param format The format string to use when building a String for
             #   logging.
-            def initialize(format = DEFAULT_FORMAT)
+            def initialize(format = DEFAULT_FORMAT, width = nil)
                 super()
                 @format_string = format
+                @width = width || Console.width
+                mark = java.lang.String.format(@format_string, Time.now,
+                                               '', '', '', '!$!', nil, nil)
+                @indent = mark.lines.first.index('!$!')
+                @level_labels = Hash.new{ |h, k| h[k] = k }
+                @level_labels[JavaUtilLogger::Level::WARNING] = 'WARN'
+                @level_labels[JavaUtilLogger::Level::SEVERE] = 'ERROR'
+                @level_labels[JavaUtilLogger::Level::FINEST] = 'DEBUG'
             end
 
 
             # Format a log record and return a string for publishing by a log handler.
             def format(log_record)
-                lvl = case log_record.level
-                      when JavaUtilLogger::Level::WARNING then 'WARN'
-                      when JavaUtilLogger::Level::SEVERE then 'ERROR'
-                      when JavaUtilLogger::Level::FINEST then 'DEBUG'
-                      else log_record.level
-                      end
-                java.lang.String.format(@format_string,
-                                        log_record.millis,
-                                        log_record.logger_name,
-                                        log_record.logger_name,
-                                        lvl,
-                                        log_record.message,
-                                        log_record.thrown)
+                lvl = @level_labels[log_record.level]
+                indent = @indent || 0
+                spacer = ''
+                wrap_width = @width - indent
+                if log_record.level.intValue < JavaUtilLogger::Level::INFO.intValue
+                    spacer = '  '
+                    wrap_width -= 2
+                end
+
+                msg = wrap_width > 0 ? Console.wrap_text(log_record.message, wrap_width) :
+                    [log_record.message]
+                sb = java.lang.StringBuilder.new()
+                msg.each_with_index do |line, i|
+                    if i == 0
+                        fmt = java.lang.String.format(@format_string,
+                                                      log_record.millis,
+                                                      log_record.logger_name,
+                                                      log_record.logger_name,
+                                                      lvl,
+                                                      msg[i],
+                                                      log_record.thrown,
+                                                      spacer)
+                    else
+                        fmt = java.lang.String.format(@format_string,
+                                                      log_record.millis, '', '', '', msg[i], nil, spacer)
+                    end
+                    sb.append(fmt)
+                    sb.append(LINE_END) if @width < 0 || fmt.length < @width
+                end
+                sb.toString()
             end
 
         end
@@ -117,6 +153,9 @@ module Console
 
         # Add a ColorConsoleHandler
         h = JavaUtilLogger::ColorConsoleHandler.new(format)
+        if lbls = options[:level_labels]
+            h.formatter.level_labels.merge!(lbls)
+        end
         l.addHandler(h)
 
         # Set the log level

data/lib/color_console/log4r_logger.rb

@@ -2,7 +2,7 @@ require 'log4r'
 require_relative '../color_console'
 
 
-# A module for using our color console for log output with the java.util.logging
+# A module for using our color console for log output with the Log4r
 # log framework.
 module Console
 
@@ -22,7 +22,8 @@ module Console
             def format(event)
                 @fg = case event.level
                 when Log4r::INFO then :white
-                when Log4r::WARN then :yellow
+                when Log4r::CONFIG then :cyan
+                when Log4r::WARNING then :yellow
                 when Log4r::ERROR then :red
                 when Log4r::DEBUG then :dark_gray
                 else :light_gray
@@ -33,7 +34,8 @@ module Console
                         thread = Log4r::NDC.peek.to_s.upcase[0, 2]
                         level = Log4r::LNAMES[event.level]
                         case
-                        when event.data.is_a?(Exception) || event.data.java_kind_of?(java.lang.Throwable)
+                        when event.data.is_a?(Exception) || (RUBY_ENGINE == 'jruby' &&
+                                                             event.data.java_kind_of?(java.lang.Throwable))
                             msg = Exception.format(event.data)
                         when event.data.is_a?(Array)
                             msg = event.data
@@ -42,17 +44,18 @@ module Console
                             when Array then msg[0][0] = "%-8s %-2s  %s" % [level, thread, msg[0][0]]
                             end
                         else
-                            msg = Console.wrap_text(event.data, @console_width - 16)
-                            msg = msg.each_with_index.map do |line, i|
-                              "%-8s %-2s  %s" % [[level][i], [thread][i], line]
-                            end.join("\n")
+                            msg_lines = Console.wrap_text(event.data, @console_width - 13)
+                            msg = ""
+                            msg_lines.each_with_index do |line, i|
+                                fmt = "%-8s %-2s  %s" % [[level][i], [thread][i], line]
+                                msg += fmt
+                                msg += "\n" if @console_width < 0 || fmt.length < @console_width
+                            end
                         end
-                        msg
+                        msg.chomp
                     rescue Object => ex
-                        "(Unable to format event.data)" # due to #{ex})\n"
+                        "(Unable to format event.data due to #{ex})\n"
                     end
-                else
-                    ""
                 end
             end
 
@@ -60,14 +63,14 @@ module Console
             def write(data)
                 if data.is_a?(Array)
                     if data[0].is_a?(String) && (data.length == 0 || data[1].is_a?(Symbol))
-                        Console.puts *data
+                        Console.puts(*data)
                     else
                         data.each do |chunk|
-                            Console.write *chunk
+                            Console.write(*chunk)
                         end
                         Console.puts
                     end
-                else
+                elsif data
                     Console.puts(data, @fg)
                 end
             end
@@ -91,14 +94,15 @@ module Console
         level = case options.delete(:level)
         when String, Symbol then Log4r::LNAMES.index(options[:level].to_s.upcase)
         end
-        STDOUT.puts level
 
-        # Remove any existing console handler
         log = logger ? Log4r::Logger[logger] : Log4r::Logger.root
         log = Log4r::Logger.new(logger) unless log
 
-        log.outputters.each do |o|
-            log.remove(o.name) if h.is_a?(Log4r::StdoutOutputter)
+        # Remove any existing console handler
+        Log4r::Logger.each_logger do |l|
+            l.outputters.each do |o|
+                l.remove(o.name) if o.is_a?(Log4r::StdoutOutputter)
+            end
         end
 
         # Add a ColorConsoleHandler

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: color-console
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Adam Gardiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies: []
-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.
+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"
 email: adam.b.gardiner@gmail.com
 executables: []
 extensions: []
@@ -34,26 +34,27 @@ files:
 - 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: 2.0.14
+rubygems_version: 1.8.21
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ColorConsole is a cross-platform library for outputting colored text to the
   console
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: eac6c2a764d6f516366d6f5e8470d2ed3b63170d
-  data.tar.gz: aa2c094cf2ad8961fda8bdc3a74c484e0752bab5
-SHA512:
-  metadata.gz: 118c4ed399645b94a34d071314f3c0716048ca7044522421cb79b73c337992eab90f41e1326c4983c54d10f90c844fffef86982aa8508022b6ae77cc06b65b60
-  data.tar.gz: 3d60e42deccc08d8e9a9b318e8832b93413410dd9dc7390992fc92bc6ac9cc45a838d258acef608aed02af18fd37457bd7c8730b64cc0201f5f090de35dc3193