log4r 1.1.3 → 1.1.4

data/README

@@ -1,8 +1,8 @@
 Log4r - A flexible logging library for Ruby
 
 
-This release:      1.1.3 
-Release date:      2009/xx/xx
+This release:      1.1.4 
+Release date:      12/Jan/2010
 License:           Ruby's 
 Maintainer:        Colby Gutierrez-Kraybill
 Contributors:      Leon Torres          Original Maintainer
@@ -88,4 +88,4 @@ code yourself. It's well documented and written in Ruby. :)
 Also, try out the bug/request tracking system at 
 http://rubyforge.org/tracker/?group_id=203
 
-Version: $Id: README,v 1.6 2009/09/25 20:34:01 colbygk Exp $
+Version: $Id: README,v 1.7 2010/01/12 09:34:06 colbygk Exp $

data/Rakefile

@@ -1,5 +1,5 @@
 
-# $Id: Rakefile,v 1.6 2009/09/25 20:34:02 colbygk Exp $
+# $Id: Rakefile,v 1.7 2010/01/12 09:34:04 colbygk Exp $
 
 # incorporated from Revolution Health version of log4r
 
@@ -10,7 +10,7 @@ require 'date'
 require 'fileutils'
 
 GEM = "log4r"
-GEM_VERSION = "1.1.3"
+GEM_VERSION = "1.1.4"
 AUTHOR = "Colby Gutierrez-Kraybill"
 EMAIL = "colby@astro.berkeley.edu"
 HOMEPAGE = %q{http://log4r.rubyforge.org}

data/TODO

@@ -1 +1,4 @@
 
+Bring documentation on log4r.rubyforge.net up-to-date with 1.1.4
+Add documentation on Nested, Mapped and Global Diagnostic Contexts
+

data/src/log4r.rb

@@ -3,7 +3,7 @@
 # == Other Info
 #
 # Author::      Leon Torres
-# Version::     $Id: log4r.rb,v 1.5 2009/09/29 02:43:57 colbygk Exp $
+# Version::     $Id: log4r.rb,v 1.7 2010/01/12 09:35:04 colbygk Exp $
 
 require "log4r/outputter/fileoutputter"
 require "log4r/outputter/consoleoutputters"
@@ -16,5 +16,5 @@ require "log4r/NDC"
 require "log4r/MDC"
 
 module Log4r
-  Log4rVersion = [1, 1, 3].join '.'
+  Log4rVersion = [1, 1, 4].join '.'
 end

data/src/log4r/GDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: GDC.rb,v 1.1 2010/01/12 02:53:43 colbygk Exp $
+# Version:: $Id: GDC.rb,v 1.2 2010/01/12 08:19:29 colbygk Exp $
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 module Log4r

data/src/log4r/MDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: MDC.rb,v 1.1 2010/01/12 02:21:29 colbygk Exp $
+# Version:: $Id: MDC.rb,v 1.2 2010/01/12 08:19:30 colbygk Exp $
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 require 'monitor'

data/src/log4r/NDC.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 # 
-# Version:: $Id: NDC.rb,v 1.1 2010/01/12 02:21:29 colbygk Exp $
+# Version:: $Id: NDC.rb,v 1.3 2010/01/12 09:28:48 colbygk Exp $
 # Author:: Colby Gutierrez-Kraybill <colby(at)astro.berkeley.edu>
 
 module Log4r
@@ -18,7 +18,6 @@ module Log4r
       if ( Thread.current[NDCNAME] == nil ):
 	Thread.current[NDCNAME] = Array.new
 	Thread.current[NDCNAMEMAXDEPTH] = NDCDEFAULTMAXDEPTH
-	Thread.current[NDCNAME]
       end
     end
 

data/src/log4r/formatter/patternformatter.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: patternformatter.rb,v 1.6 2009/10/28 19:55:34 colbygk Exp $
+# Version:: $Id: patternformatter.rb,v 1.8 2010/01/12 09:28:49 colbygk Exp $
 
 require "log4r/formatter/formatter"
 require "log4r/GDC"
@@ -31,15 +31,15 @@ module Log4r
       "c" => 'event.name',
       "C" => 'event.fullname',
       "d" => 'format_date',
-      "g" => 'GDC.get()',
+      "g" => 'Log4r::GDC.get()',
       "t" => '(event.tracer.nil? ? "no trace" : event.tracer[0])',
       "m" => 'event.data',
       "h" => '(Thread.current[:name] or Thread.current.to_s)',
       "p" => 'Process.pid.to_s',
       "M" => 'format_object(event.data)',
       "l" => 'LNAMES[event.level]',
-      "x" => 'NDC.get()',
-      "X" => '($4 != "" ? MDC.get($4.to_s)',
+      "x" => 'Log4r::NDC.get()',
+      "X" => 'Log4r::MDC.get("DTR_REPLACE")',
       "%" => '"%"'
     }
   
@@ -52,7 +52,7 @@ module Log4r
     # * $5 is the directive letter
     # * $6 is the stuff after the directive or "" if not applicable
   
-    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdtmhpMl%]))?(.*)/
+    DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdgtmhpMlxX%]))?(\{.+?\})?(.*)/
   
     # default date format
     ISO8601 = "%Y-%m-%d %H:%M:%S"
@@ -116,9 +116,14 @@ module Log4r
         # deal with the directive by inserting a %#.#s where %#.# is copied
         # directy from the match
         ebuff << match[3] + "s"
-        args << DirectiveTable[match[5]] # cull the data for our argument list
-        break if match[6].empty?
-        _pattern = match[6]
+	if ( match[5] == 'X' && match[6] != nil ) then
+	  args <<
+	  DirectiveTable[match[5]].gsub("DTR_REPLACE", match[6]).gsub(/[\{\}]/,'')
+	else
+	  args << DirectiveTable[match[5]]  # cull the data for our argument list
+	end
+        break if match[7].empty?
+        _pattern = match[7]
       end
       ebuff << '\n", ' + args.join(', ') + ")\n"
       ebuff << "end\n"

data/tests/testpatternformatter.rb

@@ -1,10 +1,16 @@
-class TestPatternFormatter < TestCase
+$: << File.join("..","src")
+require "test/unit"
+require "log4r"
+include Log4r
+
+
+class TestPatternFormatter < Test::Unit::TestCase
   def test_pattern
     l = Logger.new 'test::this::that'
     l.trace = true
     o = StdoutOutputter.new 'test' 
     l.add o
-    assert_no_exception { 
+    assert_nothing_raised { 
     f = PatternFormatter.new :pattern=> "%d %6l [%C]%c %% %-40.30M"
                              #:date_pattern=> "%Y"
                              #:date_method => :usec
@@ -18,4 +24,55 @@ class TestPatternFormatter < TestCase
     l.info [1, 3, 5]
     }
   end
+
+  def test_ndc
+    l = Logger.new 'test::this::that::other'
+    l.trace = true
+    o = StdoutOutputter.new 'testy' 
+    l.add o
+    f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%x} %% %-40.30M"
+                             #:date_pattern=> "%Y"
+                             #:date_method => :usec
+    Outputter['testy'].formatter = f
+
+    l.info "no NDC"
+    NDC.push("start")
+    l.info "start NDC"
+    NDC.push("finish")
+    l.info "start finish NDC"
+    NDC.pop()
+    l.info "start NDC"
+    NDC.remove()
+    l.info "no NDC"
+  end
+
+  def test_gdc
+    l = Logger.new 'test::this::that::other'
+    l.trace = true
+    o = StdoutOutputter.new 'testy' 
+    l.add o
+    f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%g} %% %-40.30M"
+                             #:date_pattern=> "%Y"
+                             #:date_method => :usec
+    Outputter['testy'].formatter = f
+
+    l.info "GDC default"
+    GDC.set("non-default")
+    l.info "GDC non-default"
+  end
+
+  def test_mdc
+    l = Logger.new 'test::this::that::other'
+    l.trace = true
+    o = StdoutOutputter.new 'testy' 
+    l.add o
+    f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%X{user}} %% %-40.30M"
+                             #:date_pattern=> "%Y"
+                             #:date_method => :usec
+    Outputter['testy'].formatter = f
+
+    l.info "no user"
+    MDC.put("user","colbygk")
+    l.info "user colbygk"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: []