log4r 1.1.6 → 1.1.7

data/examples/rdoc-gen

@@ -0,0 +1,2 @@
+rdoc --exclude *CVS* --exclude .*patch --exclude diff
+

data/src/log4r.rb

@@ -3,7 +3,7 @@
 # == Other Info
 #
 # Author::      Leon Torres
-# Version::     $Id: log4r.rb,v 1.9 2010/03/11 22:59:51 colbygk Exp $
+# Version::     $Id: log4r.rb,v 1.10 2010/03/12 17:54:27 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, 6].join '.'
+  Log4rVersion = [1, 1, 7].join '.'
 end

data/src/log4r/formatter/patternformatter.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: patternformatter.rb,v 1.8 2010/01/12 09:28:49 colbygk Exp $
+# Version:: $Id: patternformatter.rb,v 1.9 2010/03/12 04:04:54 colbygk Exp $
 
 require "log4r/formatter/formatter"
 require "log4r/GDC"
@@ -13,20 +13,20 @@ module Log4r
   # See log4r/formatter/patternformatter.rb
   class PatternFormatter < BasicFormatter
   
-    # Arguments to sprintf keyed to directive letters
-    # %c - event short name
-    # %C - event fullname
-    # %d - date
-    # %g - Global Diagnostic Context (GDC)
-    # %t - trace
-    # %m - message
-    # %h - thread name
-    # %p - process ID aka PID
-    # %M - formatted message
-    # %l - Level in string form
-    # %x - Nested Diagnostic Context (NDC)
-    # %X - Mapped Diagnostic Context (MDC), syntax is "%X.key"
-    # %% - Insert a %
+    # Arguments to sprintf keyed to directive letters<br>
+    # %c - event short name<br>
+    # %C - event fullname<br>
+    # %d - date<br>
+    # %g - Global Diagnostic Context (GDC)<br>
+    # %t - trace<br>
+    # %m - message<br>
+    # %h - thread name<br>
+    # %p - process ID aka PID<br>
+    # %M - formatted message<br>
+    # %l - Level in string form<br>
+    # %x - Nested Diagnostic Context (NDC)<br>
+    # %X - Mapped Diagnostic Context (MDC), syntax is "%X{key}"<br>
+    # %% - Insert a %<br>
     DirectiveTable = {
       "c" => 'event.name',
       "C" => 'event.fullname',

data/src/log4r/outputter/udpoutputter.rb

@@ -2,7 +2,7 @@
 #
 # == Other Info
 #
-# Version:: $Id: udpoutputter.rb,v 1.2 2010/03/11 23:38:36 colbygk Exp $
+# Version:: $Id: udpoutputter.rb,v 1.3 2010/03/12 17:35:06 colbygk Exp $
 # Author:: Leon Torres <leon@ugcs.caltech.edu>
 
 require "log4r/outputter/outputter"
@@ -15,10 +15,10 @@ module Log4r
     attr_reader :host, :port
     attr_accessor :udpsock
      
-    def initialize(_name, _host, _port, hash={})
+    def initialize(_name, hash={})
       super(_name, hash)
-      @host = _host
-      @port = _port
+      @host = hash[:hostname]
+      @port = hash[:port]
 
       begin 
 	Logger.log_internal {

data/tests/testchainsaw.rb

@@ -14,7 +14,7 @@ log4r.outputters = StdoutOutputter.new 'log4r'
 log4r.level = ALL
 
 formatter = Log4jXmlFormatter.new
-outputter = UDPOutputter.new 'udp', "localhost", 8071
+outputter = UDPOutputter.new 'udp', :hostname => "localhost", :port => 8071
 outputter.formatter = formatter
 
 mylog = Logger.new 'mylog'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -08:00
+date: 2010-03-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +46,116 @@ files:
 - doc/images/log4r-logo.png
 - doc/images/logo2.png
 - doc/log4r.css
+- doc/rdoc/created.rid
+- doc/rdoc/images/brick.png
+- doc/rdoc/images/brick_link.png
+- doc/rdoc/images/bug.png
+- doc/rdoc/images/bullet_black.png
+- doc/rdoc/images/bullet_toggle_minus.png
+- doc/rdoc/images/bullet_toggle_plus.png
+- doc/rdoc/images/date.png
+- doc/rdoc/images/find.png
+- doc/rdoc/images/loadingAnimation.gif
+- doc/rdoc/images/macFFBgHack.png
+- doc/rdoc/images/package.png
+- doc/rdoc/images/page_green.png
+- doc/rdoc/images/page_white_text.png
+- doc/rdoc/images/page_white_width.png
+- doc/rdoc/images/plugin.png
+- doc/rdoc/images/ruby.png
+- doc/rdoc/images/tag_green.png
+- doc/rdoc/images/wrench.png
+- doc/rdoc/images/wrench_orange.png
+- doc/rdoc/images/zoom.png
+- doc/rdoc/index.html
+- doc/rdoc/js/darkfish.js
+- doc/rdoc/js/jquery.js
+- doc/rdoc/js/quicksearch.js
+- doc/rdoc/js/thickbox-compressed.js
+- doc/rdoc/Log4r/base_rb.html
+- doc/rdoc/Log4r/BasicFormatter.html
+- doc/rdoc/Log4r/config_rb.html
+- doc/rdoc/Log4r/ConfigError.html
+- doc/rdoc/Log4r/Configurator.html
+- doc/rdoc/Log4r/configurator_rb.html
+- doc/rdoc/Log4r/DateFileOutputter.html
+- doc/rdoc/Log4r/DefaultFormatter.html
+- doc/rdoc/Log4r/EmailOutputter.html
+- doc/rdoc/Log4r/FileOutputter.html
+- doc/rdoc/Log4r/formatter/formatter_rb.html
+- doc/rdoc/Log4r/formatter/log4jxmlformatter_rb.html
+- doc/rdoc/Log4r/formatter/patternformatter_rb.html
+- doc/rdoc/Log4r/Formatter.html
+- doc/rdoc/Log4r/GDC.html
+- doc/rdoc/Log4r/GDC_rb.html
+- doc/rdoc/Log4r/IOOutputter.html
+- doc/rdoc/Log4r/lib/drbloader_rb.html
+- doc/rdoc/Log4r/lib/xmlloader_rb.html
+- doc/rdoc/Log4r/Log4jXmlFormatter.html
+- doc/rdoc/Log4r/Log4rConfig.html
+- doc/rdoc/Log4r/Log4rTools.html
+- doc/rdoc/Log4r/LogEvent.html
+- doc/rdoc/Log4r/logevent_rb.html
+- doc/rdoc/Log4r/Logger/LoggerFactory.html
+- doc/rdoc/Log4r/Logger/Repository.html
+- doc/rdoc/Log4r/Logger.html
+- doc/rdoc/Log4r/logger_rb.html
+- doc/rdoc/Log4r/loggerfactory_rb.html
+- doc/rdoc/Log4r/LogServer.html
+- doc/rdoc/Log4r/logserver_rb.html
+- doc/rdoc/Log4r/MDC.html
+- doc/rdoc/Log4r/MDC_rb.html
+- doc/rdoc/Log4r/NDC.html
+- doc/rdoc/Log4r/NDC_rb.html
+- doc/rdoc/Log4r/ObjectFormatter.html
+- doc/rdoc/Log4r/Outputter/consoleoutputters_rb.html
+- doc/rdoc/Log4r/Outputter/datefileoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/emailoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/fileoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/iooutputter_rb.html
+- doc/rdoc/Log4r/Outputter/outputter_rb.html
+- doc/rdoc/Log4r/Outputter/OutputterFactory.html
+- doc/rdoc/Log4r/Outputter/outputterfactory_rb.html
+- doc/rdoc/Log4r/Outputter/remoteoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/rollingfileoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/staticoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/syslogoutputter_rb.html
+- doc/rdoc/Log4r/Outputter/udpoutputter_rb.html
+- doc/rdoc/Log4r/Outputter.html
+- doc/rdoc/Log4r/PatternFormatter.html
+- doc/rdoc/Log4r/rdoc/configurator.html
+- doc/rdoc/Log4r/rdoc/emailoutputter.html
+- doc/rdoc/Log4r/rdoc/formatter.html
+- doc/rdoc/Log4r/rdoc/GDC.html
+- doc/rdoc/Log4r/rdoc/log4r.html
+- doc/rdoc/Log4r/rdoc/logger.html
+- doc/rdoc/Log4r/rdoc/logserver.html
+- doc/rdoc/Log4r/rdoc/MDC.html
+- doc/rdoc/Log4r/rdoc/NDC.html
+- doc/rdoc/Log4r/rdoc/outputter.html
+- doc/rdoc/Log4r/rdoc/patternformatter.html
+- doc/rdoc/Log4r/rdoc/syslogoutputter.html
+- doc/rdoc/Log4r/rdoc/win32eventoutputter.html
+- doc/rdoc/Log4r/rdoc/yamlconfigurator.html
+- doc/rdoc/Log4r/RemoteOutputter.html
+- doc/rdoc/Log4r/repository_rb.html
+- doc/rdoc/Log4r/RollingFileOutputter.html
+- doc/rdoc/Log4r/ROMPClient.html
+- doc/rdoc/Log4r/ROMPServer.html
+- doc/rdoc/Log4r/RootLogger.html
+- doc/rdoc/Log4r/SimpleFormatter.html
+- doc/rdoc/Log4r/staticlogger_rb.html
+- doc/rdoc/Log4r/StderrOutputter.html
+- doc/rdoc/Log4r/StdoutOutputter.html
+- doc/rdoc/Log4r/SyslogOutputter.html
+- doc/rdoc/Log4r/UDPOutputter.html
+- doc/rdoc/Log4r/YamlConfigurator.html
+- doc/rdoc/Log4r/yamlconfigurator_rb.html
+- doc/rdoc/log4r-rdoc.css
+- doc/rdoc/Log4r.html
+- doc/rdoc/log4r_rb.html
+- doc/rdoc/rdoc.css
+- doc/rdoc/REXML.html
 - doc/rdoc-log4r.css
 - doc/templates/main.html
 - examples/chainsaw_settings.xml
@@ -54,6 +169,7 @@ files:
 - examples/moderateconfig.rb
 - examples/myformatter.rb
 - examples/outofthebox.rb
+- examples/rdoc-gen
 - examples/README
 - examples/rrconfig.xml
 - examples/rrsetup.rb
@@ -77,13 +193,10 @@ files:
 - src/log4r/MDC.rb
 - src/log4r/NDC.rb
 - src/log4r/outputter/consoleoutputters.rb
-- src/log4r/outputter/datefileoutputter.patch
 - src/log4r/outputter/datefileoutputter.rb
-- src/log4r/outputter/diff
 - src/log4r/outputter/emailoutputter.rb
 - src/log4r/outputter/fileoutputter.rb
 - src/log4r/outputter/iooutputter.rb
-- src/log4r/outputter/new-datefileoutputter.rb
 - src/log4r/outputter/outputter.rb
 - src/log4r/outputter/outputterfactory.rb
 - src/log4r/outputter/remoteoutputter.rb
@@ -137,18 +250,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: log4r
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Log4r, logging framework for ruby

data/src/log4r/outputter/datefileoutputter.patch

@@ -1,24 +0,0 @@
---- datefileoutputter.rb	2004-03-18 19:31:09.000000000 -0800
-+++ new-datefileoutputter.rb	2010-03-11 18:36:37.000000000 -0800
-@@ -54,12 +54,19 @@
-         if not FileTest.directory?( _dirname)
-           raise StandardError, "'#{_dirname}' must be a valid directory", caller
-         end
-+      end
-+
-+      _filename = (hash[:filename] or hash['filename'])
-+      if _filename.nil?
-         @filebase = File.basename( $0, '.rb') + ".log"
-       else
-         @filebase = File.basename((hash[:filename] or hash['filename'] or ""))
-       end
--      hash['filename'] = File.join(_dirname,
--                    @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1'))
-+
-+      # Get rid of the 'nil' in the path
-+      path = [_dirname, @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1')].compact
-+      hash[:filename] = hash['filename'] = File.join(path)
-+
-       super(_name, hash)
-     end
- 

data/src/log4r/outputter/diff

@@ -1,14 +0,0 @@
-56a57,60
->       end
-> 
->       _filename = (hash[:filename] or hash['filename'])
->       if _filename.nil?
-61,62c65,69
-<       hash['filename'] = File.join(_dirname,
-<                     @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1'))
----
-> 
->       # Get rid of the 'nil' in the path
->       path = [_dirname, @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1')].compact
->       hash[:filename] = hash['filename'] = File.join(path)
-> 

data/src/log4r/outputter/new-datefileoutputter.rb

@@ -1,117 +0,0 @@
-# = DateFileOutputter
-#
-# Subclass of FileOutputter that changes the log file daily. When a new
-# day begins, a new file is created with the date included in the name.
-#
-# == Usage
-#
-#   df_out = DateFileOutputter.new('name',
-#              :dirname="/tmp", :date_pattern=>"%m-%d" 
-#            )
-#
-# == Rate of Change
-#
-# A new logfile is created whenever the current time as formatted by the date
-# pattern no longer matches the previous time. (This is a simple String 
-# comparison.) So, in order to change the frequency of the rollover, just
-# alter the date pattern to match how fast the files should be generated. 
-# For instance, to generate files by the minute,
-#
-#   df_out.date_pattern = "%M"
-#
-# This causes the following files to show up one minute apart, asuming the
-# script starts at the 4th minute of the hour:
-#
-#   file_04.rb
-#   file_05.rb
-#   file_06.rb
-#   ...
-#
-# The only limitation of this approach is that the precise time cannot be
-# recorded as the smallest time interval equals the rollover period for this
-# system.
-
-require "log4r/outputter/fileoutputter"
-require "log4r/staticlogger"
-
-module Log4r
-
-  # Additional hash arguments are:
-  #
-  # [<tt>:dirname</tt>]         Directory of the log file
-  # [<tt>:date_pattern</tt>]    Time.strftime format string (default is "%Y-%m-%d")
-
-  class DateFileOutputter < FileOutputter
-    DEFAULT_DATE_FMT = "%Y-%m-%d"
-
-    def initialize(_name, hash={})
-      @DatePattern = (hash[:date_pattern] or hash['date_pattern'] or
-                      DEFAULT_DATE_FMT)
-      @DateStamp = Time.now.strftime( @DatePattern);
-      _dirname = (hash[:dirname] or hash['dirname'])
-      # hash[:dirname] masks hash[:filename]
-      if _dirname
-        if not FileTest.directory?( _dirname)
-          raise StandardError, "'#{_dirname}' must be a valid directory", caller
-        end
-      end
-
-      _filename = (hash[:filename] or hash['filename'])
-      if _filename.nil?
-        @filebase = File.basename( $0, '.rb') + ".log"
-      else
-        @filebase = File.basename((hash[:filename] or hash['filename'] or ""))
-      end
-
-      # Get rid of the 'nil' in the path
-      path = [_dirname, @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1')].compact
-      hash[:filename] = hash['filename'] = File.join(path)
-
-      super(_name, hash)
-    end
-
-    #######
-    private
-    #######
-
-    # perform the write
-    def write(data)
-      change if requiresChange
-      super
-    end
-
-    # construct a new filename from the DateStamp
-    def makeNewFilename
-        @DateStamp = Time.now.strftime( @DatePattern);
-        @filename = File.join(File.dirname(@filename),
-                    @filebase.sub(/(\.\w*)$/, "_#{@DateStamp}" + '\1'))
-    end
-
-    # does the file require a change?
-    def requiresChange
-      _DateStamp = Time.now.strftime( @DatePattern);
-      if not _DateStamp == @DateStamp
-        @DateStamp = _DateStamp
-        return true
-      end
-      false
-    end
-
-    # change the file 
-    def change
-      begin
-        @out.close
-      rescue
-        Logger.log_internal {
-          "DateFileOutputter '#{@name}' could not close #{@filename}"
-        }
-      end
-      makeNewFilename
-      @out = File.new(@filename, (@trunc ? "w" : "a"))
-      Logger.log_internal {
-        "DateFileOutputter '#{@name}' now writing to #{@filename}"
-      }
-    end
-  end
-
-end