logging 1.6.1 → 1.6.2

data/.gitignore

@@ -0,0 +1,12 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage/
+doc/
+pkg/
+tmp/
+.rbx

data/.rvmrc

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p290@logging"
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    exit 1
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+

data/History.txt

@@ -1,3 +1,14 @@
+== 1.6.2 / 2012-01-05
+
+Bug Fixes
+- Fix typo in the Readme [issue #14]
+- Fix spelling in a variety of places [issue #15]
+- Solaris does not have Syslog#LOG_PERROR defined [issue #17]
+- Fix failing tests for Ruby 1.9.3 [issue #18]
+- Check for RUBY_ENGINE for Ruby 1.8.7 [issue #19]
+- Whitespace and '# EOF' cleanup
+- Support for Rubinious
+
 == 1.6.1 / 2011-09-09
 
 Bug Fixes

data/README.rdoc

@@ -30,7 +30,7 @@ logged.
   logger.debug "this debug message will not be output by the logger"
   logger.warn "this is your last warning"
 
-In this example, a single logger is crated that will append to STDOUT and to a
+In this example, a single logger is created that will append to STDOUT and to a
 file. Only log messages that are informational or higher will be logged.
 
   require 'logging'

data/examples/fork.rb

@@ -1,9 +1,9 @@
 # :stopdoc:
 #
 # Because of the global interpreter lock, Kernel#fork is the best way
-# to acheive true concurrency in Ruby scripts. However, there are pecularities
-# when using frok and passing file descriptors between process. These
-# pecularities affect the logging framework.
+# to achieve true concurrency in Ruby scripts. However, there are peculiarities
+# when using fork and passing file descriptors between process. These
+# peculiarities affect the logging framework.
 #
 # In short, always reopen file descriptors in the child process after fork has
 # been called. The RollingFile appender uses flock to safely coordinate the

data/examples/simple.rb

@@ -2,7 +2,7 @@
 #
 # Logging provides a simple, default logger configured in the same manner as
 # the default Ruby Logger class -- i.e. the output of the two will be the
-# same. All log messags at "warn" or higher are printed to STDOUT; any
+# same. All log messages at "warn" or higher are printed to STDOUT; any
 # message below the "warn" level are discarded.
 #
 

data/lib/logging.rb

@@ -192,8 +192,8 @@ module Logging
     #
     # If the "root" logger name is passed to this method then all loggers
     # will consolidate to the root logger. In other words, only the root
-    # logger will be created, and it will be used by all classes and moduels
-    # in the applicaiton.
+    # logger will be created, and it will be used by all classes and modules
+    # in the application.
     #
     # ==== Example
     #
@@ -363,7 +363,7 @@ module Logging
     end
 
     # Returns the library path for the module. If any arguments are given,
-    # they will be joined to the end of the libray path using
+    # they will be joined to the end of the library path using
     # <tt>File.join</tt>.
     #
     def libpath( *args, &block )
@@ -419,7 +419,7 @@ module Logging
     #
     #    1) name       - the name of the logger
     #
-    #    2) level      - the logger level; if it is preceeded by an
+    #    2) level      - the logger level; if it is preceded by an
     #                    asterisk then the level was explicitly set for that
     #                    logger (as opposed to being inherited from the parent
     #                    logger)
@@ -470,7 +470,7 @@ module Logging
     end
 
     # :stopdoc:
-    # Convert the given level into a connaconical form - a lowercase string.
+    # Convert the given level into a canonical form - a lowercase string.
     def levelify( level )
       case level
       when String; level.downcase

data/lib/logging/appender.rb

@@ -122,7 +122,7 @@ class Appender
   #    appender.level = 'off'
   #    appender.level = :all
   #
-  # These prodcue an +ArgumentError+
+  # These produce an +ArgumentError+
   #
   #    appender.level = Object
   #    appender.level = -1
@@ -257,4 +257,3 @@ private
 end  # class Appender
 end  # module Logging
 
-# EOF

data/lib/logging/appenders.rb

@@ -74,7 +74,7 @@ module Logging
     # call-seq:
     #    Appenders[name]
     #
-    # Returns the appender instance stroed in the appender hash under the
+    # Returns the appender instance stored in the appender hash under the
     # key _name_, or +nil+ if no appender has been created using that name.
     #
     def []( name ) @appenders[name] end
@@ -134,4 +134,3 @@ Logging.libpath {
   require 'logging/appenders/syslog'
 }
 
-# EOF

data/lib/logging/appenders/buffering.rb

@@ -43,7 +43,7 @@ module Logging::Appenders
       super(*args, &block)
     end
 
-    # Close the message buffer by flusing all log events to the appender. If a
+    # Close the message buffer by flushing all log events to the appender. If a
     # periodic flusher thread is running, shut it down and allow it to exit.
     #
     def close( *args )
@@ -58,7 +58,7 @@ module Logging::Appenders
       super(*args)
     end
 
-    # Reopen the connection to the underlying logging destination. In addtion
+    # Reopen the connection to the underlying logging destination. In addition
     # if the appender is configured for periodic flushing, then the flushing
     # thread will be stopped and restarted.
     #
@@ -91,8 +91,8 @@ module Logging::Appenders
     # even though it is a higher level. Both must be explicitly passed to
     # this assignment.
     #
-    # You can pass in a single leveal name or number, and array of level
-    # names or numbers, or a string containg a comma separated list of level
+    # You can pass in a single level name or number, an array of level
+    # names or numbers, or a string containing a comma separated list of level
     # names or numbers.
     #
     #   immediate_at = :error
@@ -132,8 +132,8 @@ module Logging::Appenders
     #   nil    OR
     #   0      : only flush when the buffer is full (500 messages)
     #
-    # If the default buffer size of 500 is too small, you can manuall
-    # configure to be as large as you want. This will consume more memory.
+    # If the default buffer size of 500 is too small, then you can manually
+    # configure it to be as large as you want. This will consume more memory.
     #
     #   auto_flushing = 42_000
     #
@@ -274,7 +274,7 @@ module Logging::Appenders
 
     # Using the flush_period, create a new PeriodicFlusher attached to this
     # appender. If the flush_period is nil, then no action will be taken. If a
-    # PeriodicFlusher alreayd exists, it will be stopped and a new one will be
+    # PeriodicFlusher already exists, it will be stopped and a new one will be
     # created.
     #
     def _setup_periodic_flusher

data/lib/logging/appenders/console.rb

@@ -22,7 +22,7 @@ module Logging::Appenders
     #
     def initialize( *args )
       opts = Hash === args.last ? args.pop : {}
-      name = args.empty? ? 'stdout' : args.shift 
+      name = args.empty? ? 'stdout' : args.shift
 
       super(name, STDOUT, opts)
     end
@@ -49,7 +49,7 @@ module Logging::Appenders
     #
     def initialize( *args )
       opts = Hash === args.last ? args.pop : {}
-      name = args.empty? ? 'stderr' : args.shift 
+      name = args.empty? ? 'stderr' : args.shift
 
       super(name, STDERR, opts)
     end
@@ -57,4 +57,3 @@ module Logging::Appenders
 
 end  # module Logging::Appenders
 
-# EOF

data/lib/logging/appenders/email.rb

@@ -2,7 +2,7 @@
 require 'net/smtp'
 require 'time' # get rfc822 time format
 
-# a replacement EmailOutputter.  This is essentially the default EmailOutptter from Log4r but with the following
+# a replacement EmailOutputter.  This is essentially the default EmailOutputter from Log4r but with the following
 # changes:
 #   1) if there is data to send in an email, then do not send anything
 #   2) connect to the smtp server at the last minute, do not connect at startup and then send later on.

data/lib/logging/appenders/file.rb

@@ -37,7 +37,7 @@ module Logging::Appenders
     # logging destination. If the file does not already exist it will be
     # created. If the :truncate option is set to +true+ then the file will
     # be truncated before writing begins; otherwise, log messages will be
-    # appened to the file.
+    # appended to the file.
     #
     def initialize( name, opts = {} )
       @fn = opts.getopt(:filename, name)
@@ -73,4 +73,3 @@ module Logging::Appenders
   end  # class FileAppender
 end  # module Logging::Appenders
 
-# EOF

data/lib/logging/appenders/growl.rb

@@ -49,7 +49,7 @@ module Logging::Appenders
     # notification levels. This is needed in order to log events at the
     # proper Growl level.
     #
-    # Without any configuration, the following maping will be used:
+    # Without any configuration, the following mapping will be used:
     #
     #    :debug  =>  -2
     #    :info   =>  -1
@@ -73,7 +73,7 @@ module Logging::Appenders
     #    write( event )
     #
     # Write the given _event_ to the growl notification facility. The log
-    # event will be processed through the Layout assciated with this
+    # event will be processed through the Layout associated with this
     # appender. The message will be logged at the level specified by the
     # event.
     #
@@ -145,7 +145,7 @@ module Logging::Appenders
           qmsg = @c_queue.last
           if qmsg.first != msg.first or qmsg.last != msg.last
             @c_queue << msg
-          else 
+          else
             qmsg[1] << "\n" << msg[1]
           end
         end
@@ -194,4 +194,3 @@ module Logging::Appenders
   end  # class Growl
 end  # module Logging::Appenders
 
-# EOF

data/lib/logging/appenders/io.rb

@@ -49,7 +49,7 @@ module Logging::Appenders
       unless [STDIN, STDERR, STDOUT].include?(io)
         io.send(@close_method) if @close_method and io.respond_to? @close_method
       end
-    rescue IOError => err
+    rescue IOError
     ensure
       return self
     end

data/lib/logging/appenders/rolling_file.rb

@@ -256,7 +256,7 @@ module Logging::Appenders
 
         files = Dir.glob(@glob).find_all {|fn| @rgxp =~ fn}
         unless files.empty?
-          # sort the files in revese order based on their count number
+          # sort the files in reverse order based on their count number
           files = files.sort do |a,b|
                     a = Integer(@rgxp.match(a)[1])
                     b = Integer(@rgxp.match(b)[1])
@@ -274,7 +274,7 @@ module Logging::Appenders
           end
         end
 
-        # finally reanme the copied log file
+        # finally rename the copied log file
         ::File.rename(@fn_copy, sprintf(@logname_fmt, 1))
       ensure
         @roll = false
@@ -307,7 +307,7 @@ module Logging::Appenders
       def roll_files
         return unless @roll and ::File.exist?(@fn_copy)
 
-        # reanme the copied log file
+        # rename the copied log file
         ::File.rename(@fn_copy, Time.now.strftime(@logname_fmt))
 
         # prune old log files

data/lib/logging/appenders/string_io.rb

@@ -12,7 +12,7 @@ module Logging::Appenders
     # call-seq:
     #    StringIo.new( name, opts = {} )
     #
-    # Creates a new StrinIo appender that will append log messages to a
+    # Creates a new StringIo appender that will append log messages to a
     # StringIO instance.
     #
     def initialize( name, opts = {} )

data/lib/logging/appenders/syslog.rb

@@ -39,7 +39,7 @@ module Logging::Appenders
     #                  which file descriptors are allocated.
     #
     #    LOG_PERROR    Write the message to standard error output as well to
-    #                  the system log.
+    #                  the system log.  Not available on Solaris.
     #
     #    LOG_PID       Log the process id with each message: useful for
     #                  identifying instantiations of daemons.
@@ -107,7 +107,7 @@ module Logging::Appenders
     # Configure the mapping from the Logging levels to the syslog levels.
     # This is needed in order to log events at the proper syslog level.
     #
-    # Without any configuration, the following maping will be used:
+    # Without any configuration, the following mapping will be used:
     #
     #    :debug  =>  LOG_DEBUG
     #    :info   =>  LOG_INFO
@@ -127,7 +127,7 @@ module Logging::Appenders
     # call-seq:
     #    close
     #
-    # Closes the connetion to the syslog facility.
+    # Closes the connection to the syslog facility.
     #
     def close( footer = true )
       super
@@ -168,7 +168,7 @@ module Logging::Appenders
     #    write( event )
     #
     # Write the given _event_ to the syslog facility. The log event will be
-    # processed through the Layout assciated with this appender. The message
+    # processed through the Layout associated with this appender. The message
     # will be logged at the level specified by the event.
     #
     def write( event )
@@ -207,4 +207,3 @@ module Logging::Appenders
 end  # module Logging::Appenders
 end  # HAVE_SYSLOG
 
-# EOF

data/lib/logging/color_scheme.rb

@@ -17,13 +17,13 @@ module Logging
   # ColorScheme objects are used by the Pattern layout code to colorize log
   # messages. Each color scheme is given a unique name which is used by the
   # Pattern layout to lookup the appropriate color scheme to use. Please
-  # refere to the Pattern layout documentation for more details - specifically
+  # refer to the Pattern layout documentation for more details - specifically
   # the initializer documentation.
   #
   # The color scheme can be applied to the Pattern layout in several ways.
   # Each token in the log pattern can be colorized with the log level (debug,
   # info, warn, etc) receiving unique colors based on the level itself.
-  # Another option is to colorize the enitre log message based on the log
+  # Another option is to colorize the entire log message based on the log
   # level; in this mode tokens do not get their own colors. Please see the
   # ColorScheme initializer for the list of colorization options.
   #
@@ -71,7 +71,7 @@ module Logging
     # end of this file. Multiple color codes can be aliased by grouping them
     # in an array as shown in the example above.
     #
-    # Since color schems are primary inteneded to be used with the Pattern
+    # Since color schemes are primary intended to be used with the Pattern
     # layout, there are a few special options of note. First the log levels
     # are enumerated in their own hash:
     #
@@ -85,7 +85,7 @@ module Logging
     #
     # The log level token will be colorized differently based on the value of
     # the log level itself. Similarly the entire log message can be colorized
-    # based on the value of the log level. A dfferent option should be given
+    # based on the value of the log level. A different option should be given
     # for this behavior:
     #
     #    :lines => {

data/lib/logging/config/configurator.rb

@@ -10,7 +10,7 @@ module Logging::Config
     class Error < StandardError; end  # :nodoc:
 
     # call-seq:
-    #    Configuraotr.process( &block )
+    #    Configurator.process( &block )
     #
     def self.process( &block )
       new.load(&block)
@@ -79,7 +79,7 @@ module Logging::Config
       ary.each do |name, config|
         l = Logging::Logger[name]
         l.level     = config[:level] if config[:level]
-        l.additive  = config[:additive] if l.respond_to? :additive= 
+        l.additive  = config[:additive] if l.respond_to? :additive=
         l.trace     = config[:trace]
         l.appenders = Array(config[:appenders]).
                             map {|nm| ::Logging::Appenders[nm]}
@@ -105,7 +105,7 @@ module Logging::Config
 
       clazz = ::Logging::Appenders.const_get type
       clazz.new(name, config)
-    rescue NameError => err
+    rescue NameError
       raise Error, "unknown appender class Logging::Appenders::#{type}"
     end
 
@@ -125,7 +125,7 @@ module Logging::Config
 
       clazz = ::Logging::Layouts.const_get type
       clazz.new config
-    rescue NameError => err
+    rescue NameError
       raise Error, "unknown layout class Logging::Layouts::#{type}"
     end
 
@@ -185,4 +185,3 @@ module Logging::Config
   end  # class Configurator
 end  # module Logging::Config
 
-# EOF

data/lib/logging/config/yaml_configurator.rb

@@ -188,4 +188,3 @@ module Logging::Config
   end  # class YamlConfigurator
 end  # module Logging::Config
 
-# EOF

data/lib/logging/layout.rb

@@ -1,4 +1,4 @@
- 
+
 module Logging
 
 # The +Layout+ class provides methods for formatting log events into a
@@ -14,7 +14,7 @@ class Layout
   # call-seq:
   #    Layout.new( :format_as => :string )
   #
-  # Creates a new layout that will format objecs as strings using the
+  # Creates a new layout that will format objects as strings using the
   # given <tt>:format_as</tt> style. This can be one of <tt>:string</tt>,
   # <tt>:inspect</tt>, or <tt>:yaml</tt>. These formatting commands map to
   # the following object methods:
@@ -52,7 +52,7 @@ class Layout
   # call-seq:
   #    format( event )
   #
-  # Returns a string representation of the given loggging _event_. It is
+  # Returns a string representation of the given logging _event_. It is
   # up to subclasses to implement this method.
   #
   def format( event ) nil end
@@ -70,19 +70,19 @@ class Layout
   #
   # Returns a footer string to be used at the end of a logging appender.
   #
-  def footer( ) '' end 
+  def footer( ) '' end
 
   # call-seq:
   #    format_obj( obj )
   #
   # Return a string representation of the given object. Depending upon
   # the configuration of the logger system the format will be an +inspect+
-  # based represenation or a +yaml+ based representation.
+  # based representation or a +yaml+ based representation.
   #
   def format_obj( obj )
     case obj
     when String; obj
-    when Exception 
+    when Exception
       str = "<#{obj.class.name}> #{obj.message}"
       if @backtrace && !obj.backtrace.nil?
         str << "\n\t" << obj.backtrace.join("\n\t")
@@ -114,4 +114,3 @@ class Layout
 end  # class Layout
 end  # module Logging
 
-# EOF

data/lib/logging/layouts.rb

@@ -44,4 +44,3 @@ Logging.libpath {
   require 'logging/layouts/pattern'
 }
 
-# EOF

data/lib/logging/layouts/basic.rb

@@ -17,7 +17,7 @@ module Logging::Layouts
     # call-seq:
     #    format( event )
     #
-    # Returns a string representation of the given loggging _event_. See the
+    # Returns a string representation of the given logging _event_. See the
     # class documentation for details about the formatting used.
     #
     def format( event )

data/lib/logging/layouts/parseable.rb

@@ -58,10 +58,10 @@ module Logging::Layouts
   #
   # The output order of the fields is not guaranteed to be the same as the
   # order specified in the _items_ list. This is because Ruby hashes are not
-  # ordered by default (unless your running this in Ruby 1.9).
+  # ordered by default (unless you're running this in Ruby 1.9).
   #
   # When configured to output log events in JSON format, each log message
-  # will be formatted as an object (in the JSON sense of the work) on it's
+  # will be formatted as an object (in the JSON sense of the word) on it's
   # own line in the log output. Therefore, to parse the output you must read
   # it line by line and parse the individual objects. Taking the same
   # example above the JSON output would be:
@@ -78,7 +78,7 @@ module Logging::Layouts
     # Arguments to sprintf keyed to directive letters
     DIRECTIVE_TABLE = {
       'logger'    => 'event.logger',
-      'timestamp' => 'event.time.strftime(Pattern::ISO8601)',
+      'timestamp' => 'event.time',
       'level'     => '::Logging::LNAMES[event.level]',
       'message'   => 'format_obj(event.data)',
       'file'      => 'event.file',
@@ -132,7 +132,7 @@ module Logging::Layouts
     # call-seq:
     #    Parseable.json( opts )
     #
-    # Create a new Parseable layout that outputs log events usig JSON style
+    # Create a new Parseable layout that outputs log events using JSON style
     # formatting. See the initializer documentation for available options.
     #
     def self.json( opts = {} )
@@ -143,7 +143,7 @@ module Logging::Layouts
     # call-seq:
     #    Parseable.yaml( opts )
     #
-    # Create a new Parseable layout that outputs log events usig YAML style
+    # Create a new Parseable layout that outputs log events using YAML style
     # formatting. See the initializer documentation for available options.
     #
     def self.yaml( opts = {} )
@@ -191,7 +191,8 @@ module Logging::Layouts
       case value
       when String, Integer, Float; value.inspect
       when nil; 'null'
-      else value.to_s.inspect end
+      when Time; %Q{"#{iso8601_format(value)}"}
+      else %Q{"#{value.inspect}"} end
     end
 
     # Call the appropriate class level create format method based on the
@@ -204,6 +205,19 @@ module Logging::Layouts
       else raise ArgumentError, "unknown format style '#@style'" end
     end
 
+    # Convert the given time _value_ into an ISO8601 formatted time string.
+    #
+    def iso8601_format( value )
+      str = value.strftime('%Y-%m-%dT%H:%M:%S')
+      str << ('.%06d' % value.usec)
+
+      offset = value.gmt_offset.abs
+      return str << 'Z' if offset == 0
+
+      offset = sprintf('%02d:%02d', offset / 3600, offset % 3600 / 60)
+      return str << (value.gmt_offset < 0 ? '-' : '+') << offset
+    end
+
   end  # Parseable
 end  # Logging::Layouts
 

data/lib/logging/log_event.rb

@@ -13,7 +13,7 @@ module Logging
     # * $3 == method name (might be nil)
     CALLER_RGXP = %r/([-\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o
     #CALLER_INDEX = 2
-    CALLER_INDEX = (defined? JRUBY_VERSION and JRUBY_VERSION[%r/^1.6/]) ? 1 : 2
+    CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION[%r/^1.6/]) or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
     # :startdoc:
 
     # call-seq:

data/lib/logging/logger.rb

@@ -209,7 +209,7 @@ module Logging
     # This method returns +true+ if the message was logged, and +false+ is
     # returned if the message was not logged.
     #
-    def add( lvl, data = nil )
+    def add( lvl, data = nil, progname = nil )
       lvl = Integer(lvl)
       return false if lvl < level
 
@@ -280,7 +280,7 @@ module Logging
     #    log.level = 'off'
     #    log.level = :all
     #
-    # These prodcue an +ArgumentError+
+    # These produce an +ArgumentError+
     #
     #    log.level = Object
     #    log.level = -1

data/lib/logging/proxy.rb

@@ -17,7 +17,7 @@ module Logging
   #     result   # <-- always return the result
   #   end
   #
-  # The proxied object is avaiable as the "@object" variable. The logger is
+  # The proxied object is available as the "@object" variable. The logger is
   # available as the "@logger" variable.
   #
   class Proxy
@@ -30,7 +30,7 @@ module Logging
 
     # Create a new proxy for the given _object_. If an optional _block_ is
     # given it will be called before the proxied method. This _block_ will
-    # replace the +method_missing+ implementation 
+    # replace the +method_missing+ implementation
     #
     def initialize( object, &block )
       @object = object

data/lib/logging/rails_compat.rb

@@ -14,7 +14,7 @@ module Logging
 
     # A no-op implementation of the +silence+ method. Setting of log levels
     # should be done during the Logging configuration. It is the author's
-    # opinion that overriding the log level programmaticaly is a logical
+    # opinion that overriding the log level programmatically is a logical
     # error.
     #
     # Please see https://github.com/TwP/logging/issues/11 for a more detail

data/lib/logging/repository.rb

@@ -185,7 +185,7 @@ module Logging
     # call-seq:
     #    master_for( key )
     #
-    # Retruns the consolidation master name for the given _key_. If there is
+    # Returns the consolidation master name for the given _key_. If there is
     # no consolidation master, then +nil+ is returned.
     #
     def master_for( key )
@@ -229,4 +229,3 @@ module Logging
   end  # class Repository
 end  # module Logging
 
-# EOF

data/lib/logging/root_logger.rb

@@ -3,7 +3,7 @@ module Logging
 
   # The root logger exists to ensure that all loggers have a parent and a
   # defined logging level. If a logger is additive, eventually its log
-  # events will propogate up to the root logger.
+  # events will propagate up to the root logger.
   #
   class RootLogger < Logger
 
@@ -58,4 +58,3 @@ module Logging
   end  # class RootLogger
 end  # module Logging
 
-# EOF

data/lib/logging/stats.rb

@@ -40,7 +40,7 @@ module Logging::Stats
     # Coalesce the statistics from the _other_ sampler into this one. The
     # _other_ sampler is not modified by this method.
     #
-    # Coalescing the same two samplers mutliple times should only be done if
+    # Coalescing the same two samplers multiple times should only be done if
     # one of the samplers is reset between calls to this method. Otherwise
     # statistics will be counted multiple times.
     #
@@ -72,7 +72,7 @@ module Logging::Stats
 
     # Returns statistics in a common format.
     #
-    def to_s  
+    def to_s
       "[%s]: SUM=%0.6f, SUMSQ=%0.6f, NUM=%d, MEAN=%0.6f, SD=%0.6f, MIN=%0.6f, MAX=%0.6f" % to_a
     end
 
@@ -127,7 +127,7 @@ module Logging::Stats
 
     # Adds a time delta between now and the last time you called this.  This
     # will give you the average time between two activities.
-    # 
+    #
     # An example is:
     #
     #  t = Sampler.new("do_stuff")
@@ -148,7 +148,7 @@ module Logging::Stats
 
     attr_reader :stats
 
-    # Create a new Tracker instance. An optional boolean can be bassed in to
+    # Create a new Tracker instance. An optional boolean can be passed in to
     # change the "threadsafe" value of the tracker. By default all trackers
     # are created to be threadsafe.
     #
@@ -163,7 +163,7 @@ module Logging::Stats
     # Coalesce the samplers from the _other_ tracker into this one. The
     # _other_ tracker is not modified by this method.
     #
-    # Coalescing the same two trackers mutliple times should only be done if
+    # Coalescing the same two trackers multiple times should only be done if
     # one of the trackers is reset between calls to this method. Otherwise
     # statistics will be counted multiple times.
     #
@@ -275,4 +275,3 @@ module Logging::Stats
 
 end  # module Logging::Stats
 
-# EOF

data/lib/logging/utils.rb

@@ -19,7 +19,7 @@ class Hash
   #     String
   #     Symbol
   #
-  # If the value is +nil+, then no converstion will be performed.
+  # If the value is +nil+, then no conversion will be performed.
   #
   def getopt( *args )
     opts = args.last.instance_of?(Hash) ? args.pop : {}

data/lib/rspec/logging_helper.rb

@@ -4,7 +4,7 @@ module RSpec
 
     # Capture log messages from the Logging framework and make them
     # available via a @log_output instance variable. The @log_output
-    # supports a readline method to access the log messags.
+    # supports a readline method to access the log messages.
     #
     def capture_log_messages( opts = {} )
       from = opts.getopt(:from, 'root')

data/test/appenders/test_syslog.rb

@@ -14,9 +14,9 @@ module TestAppenders
       super
       Logging.init
       @levels = Logging::LEVELS
-      @logopt = defined?(::Syslog::LOG_NDELAY) ?
-                    (::Syslog::LOG_PERROR | ::Syslog::LOG_NDELAY) :
-                    (::Syslog::LOG_PERROR)
+      @logopt  = 0
+      @logopt |= ::Syslog::LOG_NDELAY if defined?(::Syslog::LOG_NDELAY)
+      @logopt |= ::Syslog::LOG_PERROR if defined?(::Syslog::LOG_PERROR)
     end
 
     def test_append
@@ -51,12 +51,14 @@ module TestAppenders
       stderr[1].close
       Process.waitpid(pid)
 
-      assert_equal("syslog_test:  INFO  TestLogger : <Array> #{[1,2,3,4]}\n",
-                   stderr[0].gets)
-      assert_equal("syslog_test: DEBUG  TestLogger : the big log message\n",
-                   stderr[0].gets)
-      assert_equal("syslog_test:  WARN  TestLogger : this is your last warning\n",
-                   stderr[0].gets)
+      if defined?(::Syslog::LOG_PERROR)
+        assert_equal("syslog_test:  INFO  TestLogger : <Array> #{[1,2,3,4]}\n",
+                     stderr[0].gets)
+        assert_equal("syslog_test: DEBUG  TestLogger : the big log message\n",
+                     stderr[0].gets)
+        assert_equal("syslog_test:  WARN  TestLogger : this is your last warning\n",
+                     stderr[0].gets)
+      end
     end
 
     def test_append_error
@@ -98,9 +100,11 @@ module TestAppenders
       stderr[1].close
       Process.waitpid(pid)
 
-      assert_equal("syslog_test: this is a test message\n", stderr[0].gets)
-      assert_equal("syslog_test: this is another message\n", stderr[0].gets)
-      assert_equal("syslog_test: some other line\n", stderr[0].gets)
+      if defined?(::Syslog::LOG_PERROR)
+        assert_equal("syslog_test: this is a test message\n", stderr[0].gets)
+        assert_equal("syslog_test: this is another message\n", stderr[0].gets)
+        assert_equal("syslog_test: some other line\n", stderr[0].gets)
+      end
     end
 
     def test_concat_error

data/test/layouts/test_json.rb

@@ -11,7 +11,7 @@ module TestLayouts
       super
       @layout = Logging.layouts.json({})
       @levels = Logging::LEVELS
-      @date_fmt = '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}'
+      @date_fmt = '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}(Z|[+-]\d{2}:\d{2})'
       Thread.current[:name] = nil
     end
 

data/test/layouts/test_yaml.rb

@@ -11,7 +11,7 @@ module TestLayouts
       super
       @layout = Logging.layouts.yaml({})
       @levels = Logging::LEVELS
-      @date_fmt = '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}'
+      @date_fmt = '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{6,9} (Z|[+-]\d{2}:\d{2})'
       Thread.current[:name] = nil
     end
 
@@ -55,7 +55,7 @@ module TestLayouts
 
       @layout.items = %w[timestamp]
       assert_equal %w[timestamp], @layout.items
-      assert_match %r/--- \ntimestamp: #@date_fmt\n/, @layout.format(event)
+      assert_match %r/\A--- ?\ntimestamp: '?#@date_fmt'?\n/, @layout.format(event)
 
       # 'foo' is not a recognized item
       assert_raise(ArgumentError) {
@@ -71,36 +71,36 @@ module TestLayouts
       event.method = 'method_name'
 
       @layout.items = %w[logger]
-      assert_equal %Q[--- \nlogger: TestLogger\n], @layout.format(event)
+      assert_match %r/\A--- ?\nlogger: TestLogger\n/, @layout.format(event)
 
       @layout.items = %w[file]
-      assert_equal %Q[--- \nfile: test_file.rb\n], @layout.format(event)
+      assert_match %r/\A--- ?\nfile: test_file.rb\n/, @layout.format(event)
 
       @layout.items = %w[level]
-      assert_equal %Q[--- \nlevel: INFO\n], @layout.format(event)
+      assert_match %r/\A--- ?\nlevel: INFO\n/, @layout.format(event)
 
       @layout.items = %w[line]
-      assert_equal %Q[--- \nline: 123\n], @layout.format(event)
+      assert_match %r/\A--- ?\nline: 123\n/, @layout.format(event)
 
       @layout.items = %w[message]
-      assert_equal %Q[--- \nmessage: log message\n], @layout.format(event)
+      assert_match %r/\A--- ?\nmessage: log message\n/, @layout.format(event)
 
       @layout.items = %w[method]
-      assert_equal %Q[--- \nmethod: method_name\n], @layout.format(event)
+      assert_match %r/\A--- ?\nmethod: method_name\n/, @layout.format(event)
 
       @layout.items = %w[pid]
-      assert_match %r/\A--- \npid: \d+\n\z/, @layout.format(event)
+      assert_match %r/\A--- ?\npid: \d+\n\z/, @layout.format(event)
 
       @layout.items = %w[millis]
-      assert_match %r/\A--- \nmillis: \d+\n\z/, @layout.format(event)
+      assert_match %r/\A--- ?\nmillis: \d+\n\z/, @layout.format(event)
 
       @layout.items = %w[thread_id]
-      assert_match %r/\A--- \nthread_id: -?\d+\n\z/, @layout.format(event)
+      assert_match %r/\A--- ?\nthread_id: -?\d+\n\z/, @layout.format(event)
 
       @layout.items = %w[thread]
-      assert_equal %Q[--- \nthread: \n], @layout.format(event)
+      assert_match %r/\A--- ?\nthread: \n/, @layout.format(event)
       Thread.current[:name] = "Main"
-      assert_equal %Q[--- \nthread: Main\n], @layout.format(event)
+      assert_match %r/\A--- ?\nthread: Main\n/, @layout.format(event)
     end
 
     private
@@ -108,7 +108,7 @@ module TestLayouts
     def assert_yaml_match( expected, actual )
       actual = YAML.load(actual)
 
-      assert_match %r/#@date_fmt/o, actual['timestamp']
+      assert_instance_of Time, actual['timestamp']
       assert_equal expected['level'], actual['level']
       assert_equal expected['logger'], actual['logger']
       assert_equal expected['message'], actual['message']

data/test/test_layout.rb

@@ -75,10 +75,14 @@ module TestLogging
 
       @layout = ::Logging::Layout.new :format_as => :yaml
       r = @layout.format_obj obj
-      assert_equal "<Array> \n--- \n- one\n- two\n- three\n- four\n", r
-      
+      assert_match %r/\A<Array> \n--- ?\n- one\n- two\n- three\n- four\n/, r
+
       r = @layout.format_obj Class
-      assert_equal "<Class> Class", r
+      if defined? YAML::ENGINE and YAML::ENGINE.yamler == 'psych'
+        assert_equal "<Class> \n--- !ruby/class 'Class'\n", r
+      else
+        assert_equal "<Class> Class", r
+      end
     end
 
     def test_format_obj_without_backtrace

data/test/test_log_event.rb

@@ -48,7 +48,7 @@ module TestLogging
 
       @logger.trace = true
       @logger.error 'error message'
-      assert_equal 50, @appender.event.line
+      assert_equal __LINE__-1, @appender.event.line
     end
 
     def test_logger

data/version.txt

@@ -1 +1 @@
-1.6.1
+1.6.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logging
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger
-  requirement: &2162102160 !ruby/object:Gem::Requirement
+  requirement: &2157085220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2162102160
+  version_requirements: *2157085220
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2162101340 !ruby/object:Gem::Requirement
+  requirement: &2157077040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2162101340
+  version_requirements: *2157077040
 - !ruby/object:Gem::Dependency
   name: bones-git
-  requirement: &2162100820 !ruby/object:Gem::Requirement
+  requirement: &2157076220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *2162100820
+  version_requirements: *2157076220
 - !ruby/object:Gem::Dependency
   name: bones-rcov
-  requirement: &2162100100 !ruby/object:Gem::Requirement
+  requirement: &2157075340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,18 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2162100100
+  version_requirements: *2157075340
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &2162099500 !ruby/object:Gem::Requirement
+  requirement: &2157074540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.2
   type: :development
   prerelease: false
-  version_requirements: *2162099500
+  version_requirements: *2157074540
 description: ! 'Logging is a flexible logging library for use in Ruby programs based
   on the
 
@@ -81,6 +81,8 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 files:
+- .gitignore
+- .rvmrc
 - History.txt
 - README.rdoc
 - Rakefile
@@ -184,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logging
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A flexible and extendable logging library for Ruby