logging 0.8.0 → 0.9.0

data/lib/logging/config/yaml_configurator.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'yaml'
 

data/lib/logging/layout.rb

@@ -1,4 +1,3 @@
-# $Id$
  
 require 'yaml'
 

data/lib/logging/layouts/basic.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 module Logging
 module Layouts

data/lib/logging/layouts/pattern.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 module Logging
 module Layouts
@@ -165,7 +164,7 @@ module Layouts
       end
       code << "end\n"
 
-      pf.meta_eval code
+      pf._meta_eval(code, __FILE__, __LINE__)
     end
 
     # call-seq:
@@ -205,7 +204,7 @@ module Layouts
       code << ")\n"
       code << "end\n"
 
-      pf.meta_eval code
+      pf._meta_eval(code, __FILE__, __LINE__)
     end
     # :startdoc:
 
@@ -274,14 +273,14 @@ module Layouts
     # :stopdoc:
 
     # call-seq:
-    #    meta_eval( code )
+    #    _meta_eval( code )
     #
     # Evaluates the given string of _code_ if the singleton class of this
     # Pattern Layout object.
     #
-    def meta_eval( code )
+    def _meta_eval( code, file = nil, line = nil )
       meta = class << self; self end
-      meta.class_eval code
+      meta.class_eval code, file, line
     end
     # :startdoc:
 

data/lib/logging/log_event.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 module Logging
 

data/lib/logging/logger.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'thread'
 
@@ -105,8 +104,9 @@ module Logging
             CODE
           end
 
-          logger.meta_eval code
+          logger._meta_eval(code, __FILE__, __LINE__)
         end
+        logger
       end
       # :startdoc:
 
@@ -143,14 +143,7 @@ module Logging
       else raise(ArgumentError, "logger name must be a String") end
 
       repo = ::Logging::Repository.instance
-      @name = name
-      @parent = repo.parent(name)
-      @appenders = []
-      @additive = true
-      @trace = false
-      @level = nil
-      ::Logging::Logger.define_log_methods(self)
-
+      _setup(name, :parent => repo.parent(name))
       repo.children(name).each {|c| c.parent = self}
     end
 
@@ -407,21 +400,38 @@ module Logging
       ::Logging::Repository.instance.children(name).each do |c|
         c.define_log_methods
       end
+      self
     end
 
     # :stopdoc:
+    public
 
     # call-seq:
-    #    meta_eval( code )
+    #    _meta_eval( code )
     #
     # Evaluates the given string of _code_ if the singleton class of this
     # Logger object.
     #
-    def meta_eval( code )
+    def _meta_eval( code, file = nil, line = nil )
       meta = class << self; self end
-      meta.class_eval code
+      meta.class_eval code, file, line
+    end
+
+    # call-seq:
+    #    _setup( name, opts = {} )
+    #
+    # Configures internal variables for the logger. This method can be used
+    # to avoid storing the logger in the repository.
+    # 
+    def _setup( name, opts = {} )
+      @name      = name
+      @parent    = opts.getopt(:parent)
+      @appenders = opts.getopt(:appenders, [])
+      @additive  = opts.getopt(:additive, true)
+      @trace     = opts.getopt(:trace, false)
+      @level     = opts.getopt(:level)
+      ::Logging::Logger.define_log_methods(self)
     end
-    public :meta_eval
     # :startdoc:
 
   end  # class Logger

data/lib/logging/repository.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'singleton'
 
@@ -20,6 +19,15 @@ module Logging
     #
     def initialize
       @h = {:root => ::Logging::RootLogger.new}
+
+      logger = ::Logging::Logger.allocate
+      logger._setup(
+          to_key(::Logging),
+          :parent   => @h[:root],
+          :additive => false,
+          :level    => ::Logging::LEVELS.length   # turns this logger off
+      )
+      @h[logger.name] = logger
     end
 
     # call-seq:
@@ -153,8 +161,10 @@ module Logging
     #
     def to_key( key )
       case key
-      when Symbol, String; key
-      when Class; key.name
+      when :root, 'root'; :root
+      when String; key
+      when Symbol; key.to_s
+      when Module; key.name
       when Object; key.class.name
       end
     end

data/lib/logging/root_logger.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 module Logging
 

data/lib/logging/utils.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 class Hash
 

data/tasks/ann.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 begin
   require 'bones/smtp_tls'

data/tasks/bones.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 if HAVE_BONES
 

data/tasks/gem.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'rake/gempackagetask'
 

data/tasks/git.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 if HAVE_GIT
 
@@ -34,7 +33,7 @@ namespace :git do
 
 end  # namespace :git
 
-#task 'gem:release' => 'git:create_tag'
+task 'gem:release' => 'git:create_tag'
 
 end  # if HAVE_GIT
 

data/tasks/manifest.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'find'
 

data/tasks/notes.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 if HAVE_BONES
 

data/tasks/post_load.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.

data/tasks/rdoc.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'rake/rdoctask'
 

data/tasks/rubyforge.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 if PROJ.rubyforge.name.valid? && HAVE_RUBYFORGE
 
@@ -18,7 +17,7 @@ namespace :gem do
     end
 
     rf = RubyForge.new
-    rf.configure
+    rf.configure rescue nil
     puts 'Logging in'
     rf.login
 

data/tasks/setup.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'rubygems'
 require 'rake'

data/tasks/test.rake

@@ -1,4 +1,3 @@
-# $Id$
 
 require 'rake/testtask'
 

data/test/appenders/test_console.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 

data/test/appenders/test_email.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 require 'flexmock'

data/test/appenders/test_file.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 

data/test/appenders/test_growl.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 require 'flexmock'
@@ -24,8 +23,7 @@ module TestAppenders
     end
 
     def test_initialize
-      assert_equal('growlnotify -w -n "growl" -t "%s" -m "%s" -p %d &', 
-                   @appender.instance_variable_get(:@growl))
+      assert_equal('growlnotify -w -n "growl" -t "%s" -m "%s" -p %d &', @growl)
       assert_equal(true, @appender.instance_variable_get(:@coalesce))
       assert_equal("\000", @appender.instance_variable_get(:@title_sep))
     end
@@ -36,13 +34,13 @@ module TestAppenders
       warn = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
                                      'warning message', false)
 
-      flexmock(@appender).should_receive(:system).once.with(
+      flexmock(@appender).should_receive(:system => true).once.with(
           @growl % ['WARN - Test', "warning message\nwarning message\nwarning message", 0])
 
-      flexmock(@appender).should_receive(:system).once.with(
+      flexmock(@appender).should_receive(:system => true).once.with(
           @growl % ['INFO - Test', "info message\ninfo message", -1])
 
-      flexmock(@appender).should_receive(:system).once.with(
+      flexmock(@appender).should_receive(:system => true).once.with(
           @growl % ['WARN - Test', "warning message", 0])
 
       @appender.append warn
@@ -59,7 +57,7 @@ module TestAppenders
       event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
                                       'warning message', false)
 
-      flexmock(@appender).should_receive(:system).twice.with(
+      flexmock(@appender).should_receive(:system => true).twice.with(
           @growl % ['WARN - Test', 'warning message', 0])
 
       @appender.append event
@@ -67,7 +65,7 @@ module TestAppenders
     end
 
     def test_concat
-      flexmock(@appender).should_receive(:system).once.with(
+      flexmock(@appender).should_receive(:system => true).once.with(
           @growl % ['', "first message\nsecond message\nthird message", 0])
 
       @appender << 'first message'
@@ -79,7 +77,7 @@ module TestAppenders
     def test_concat_without_coalescing
       @appender.instance_variable_set(:@coalesce, false)
 
-      flexmock(@appender).should_receive(:system).twice.with(
+      flexmock(@appender).should_receive(:system => true).twice.with(
           @growl % ['', 'concat message', 0])
 
       @appender << 'concat message'
@@ -108,6 +106,21 @@ module TestAppenders
       end
     end
 
+    def test_disabling
+      @appender.instance_variable_set(:@coalesce, false)
+      event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
+                                      'warning message', false)
+
+      flexmock(@appender).should_receive(:system => false).once.with(
+          @growl % ['WARN - Test', 'warning message', 0])
+
+      assert_equal 0, @appender.level
+      @appender.append event
+      assert_equal 5, @appender.level
+      @appender.append event
+      @appender.append event
+    end
+
   end  # class TestGrowl
 end  # module TestLogging
 end  # module TestAppenders

data/test/appenders/test_io.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 
@@ -36,10 +35,24 @@ module TestAppenders
     end
 
     def test_append_error
+      # setup an internal logger to capture error messages from the IO
+      # appender
+      log = StringIO.new
+      Logging::Logger[Logging::Appenders::IO].add_appenders(
+        Logging::Appenders::IO.new('__internal_io', log)
+      )
+      Logging::Logger[Logging::Appenders::IO].level = 'all'
+
+
+      # close the string IO object so we get an error
       @sio.close
       event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
                                       [1, 2, 3, 4], false)
-      assert_raise(IOError) {@appender.append event}
+      @appender.append event
+
+      log.seek 0
+      assert_equal "ERROR  Logging::Appenders::IO : <IOError> not opened for writing", log.readline.strip
+
       assert_equal false, @appender.closed?
       assert_equal 5, @appender.level
     end
@@ -76,8 +89,22 @@ module TestAppenders
     end
 
     def test_concat_error
+      # setup an internal logger to capture error messages from the IO
+      # appender
+      log = StringIO.new
+      Logging::Logger[Logging::Appenders::IO].add_appenders(
+        Logging::Appenders::IO.new('__internal_io', log)
+      )
+      Logging::Logger[Logging::Appenders::IO].level = 'all'
+
+      # close the string IO object so we get an error
       @sio.close
-      assert_raise(IOError) {@appender << 'oopsy'}
+      @appender << 'oopsy'
+
+      log.seek 0
+      assert_equal "ERROR  Logging::Appenders::IO : <IOError> not opened for writing", log.readline.strip
+
+      # and the appender does not close itself
       assert_equal false, @appender.closed?
       assert_equal 5, @appender.level
     end

data/test/appenders/test_rolling_file.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 

data/test/appenders/test_syslog.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 require File.join(File.dirname(__FILE__), %w[.. setup])
 

data/test/benchmark.rb

@@ -1,4 +1,3 @@
-# $Id$
 
 begin
   require 'logging'

data/test/config/test_configurator.rb

@@ -0,0 +1,70 @@
+
+require File.join(File.dirname(__FILE__), %w[.. setup])
+
+module TestLogging
+module TestConfig
+
+  class TestConfigurator < Test::Unit::TestCase
+    include LoggingTestCase
+
+    def test_configuration
+      begin
+        load Logging.path(%w[data logging.rb])
+      rescue Exception => err
+        flunk err.inspect
+      end
+
+      levels = {
+        'deb' => 0,
+        'inf' => 1,
+        'prt' => 2,
+        'wrn' => 3,
+        'err' => 4,
+        'fat' => 5
+      }
+      assert_equal levels, Logging::LEVELS
+      assert_equal :inspect, Logging::OBJ_FORMAT
+
+      hash = Logging::Repository.instance.instance_variable_get(:@h)
+      assert hash.has_key?('A::B::C')
+      assert hash.has_key?('yourlogger')
+    end
+
+    def test_simple_configuration
+      begin
+        load Logging.path(%w[data simple_logging.rb])
+      rescue Exception => err
+        flunk err.inspect
+      end
+
+      levels = {
+        'debug' => 0,
+        'info'  => 1,
+        'warn'  => 2,
+        'error' => 3,
+        'fatal' => 4
+      }
+      assert_equal levels, Logging::LEVELS
+      assert_equal false, Logging.const_defined?('OBJ_FORMAT')
+
+      root = Logging::Logger.root
+      assert_equal 1, root.level
+    end
+
+    def test_bad_appender_configuration
+      assert_raise(Logging::Config::Configurator::Error) {
+        load Logging.path(%w[data bad_logging_1.rb])
+      }
+    end
+
+    def test_bad_layout_configuration
+      assert_raise(Logging::Config::Configurator::Error) {
+        load Logging.path(%w[data bad_logging_2.rb])
+      }
+    end
+  end
+
+end  # module TestConfig
+end  # module TestLogging
+
+# EOF