log4r-color 1.1.11 → 1.2

data/Rakefile

@@ -10,7 +10,7 @@ require 'date'
 require 'fileutils'
 
 GEM = "log4r-color"
-GEM_VERSION = "1.1.11"
+GEM_VERSION = "1.2"
 AUTHORS = "Colby Gutierrez-Kraybill, Kristian Mandrup (color outputter)"
 EMAIL = "colby@astro.berkeley.edu, kmandrup@gmail.com"
 HOMEPAGE = %q{http://log4r.rubyforge.org}

data/examples/color_output.rb

@@ -2,13 +2,13 @@ $: << File.join("..","lib")
 
 require 'rubygems'
 
-require 'log4r'
+require 'log4r-color'
 include Log4r
 
 Logger.global.level = ALL
 formatter = PatternFormatter.new(:pattern => "%l - %m - %c")
 
-ColorOutputter.new 'color', {:colors => {:info => {:color => :light_blue, :background => :red}, :debug => :light_blue }}
+ColorOutputter.new 'color', {:colors => {:debug => :light_blue, :info => {:color => :light_blue, :background => :white}, :warn => :yellow, :error => :red, :fatal => {:color => :red, :background => :white} } }
 
 Logger.new('color_logger', DEBUG).add('color')
 
@@ -18,8 +18,11 @@ def do_logging(log)
   log.debug "This is debug"
   log.info "This is info"
   log.warn "This is warn"
+  Outputter['color'].colors[:info] = :green
+  log.info "This is info again"
   log.error "This is error"
   log.fatal "This is fatal"
+  
 end
 
 # This logger is configured to log at FATAL, and it does

data/examples/customlevels.rb

@@ -5,8 +5,8 @@
 
 $: << '../lib'
 
-require 'log4r'
-require 'log4r/configurator'
+require 'log4r-color'
+require 'log4r-color/configurator'
 include Log4r
 
 # This is how we specify our levels

data/examples/gmail.rb

@@ -1,11 +1,11 @@
 # Log4r can be configured using YAML to email using STARTTLS. This example uses gmail.yaml
 
 $: << File.join('..','lib') # path if log4r is not installed
-require 'log4r'
-require 'log4r/yamlconfigurator'
+require 'log4r-color'
+require 'log4r-color/yamlconfigurator'
 # we use various outputters, so require them, otherwise config chokes
-require 'log4r/outputter/datefileoutputter'
-require 'log4r/outputter/emailoutputter'
+require 'log4r-color/outputter/datefileoutputter'
+require 'log4r-color/outputter/emailoutputter'
 include Log4r
 
 cfg = YamlConfigurator # shorthand

data/examples/logclient.rb

@@ -1,8 +1,8 @@
 # How to use RemoteOutputter. See logserver.rb first.
 
 $: << File.join('..','lib')
-require 'log4r'
-require 'log4r/outputter/remoteoutputter'
+require 'log4r-color'
+require 'log4r-color/outputter/remoteoutputter'
 include Log4r
 
 Logger.new('log4r').add 'stdout'        # to see what's going on inside

data/examples/logserver.rb

@@ -1,8 +1,8 @@
 # How to use LogServer
 
 $: << File.join('..','lib')
-require 'log4r'
-require 'log4r/configurator'
+require 'log4r-color'
+require 'log4r-color/configurator'
 
 # XML configuration is simple enough to embed here
 xml = %(

data/examples/rrsetup.rb

@@ -2,8 +2,8 @@
 # The XML config file is called rrconfig.xml
 
 $: << File.join('..','lib')
-require 'log4r'
-require 'log4r/configurator'
+require 'log4r-color'
+require 'log4r-color/configurator'
 include Log4r
 
 # How to format component data - low noise

data/examples/syslogcustom.rb

@@ -8,10 +8,10 @@
 
 $: << '../lib'
 
-require 'log4r'
-require 'log4r/configurator'
-require 'log4r/formatter/patternformatter'
-require 'log4r/outputter/syslogoutputter'
+require 'log4r-color'
+require 'log4r-color/configurator'
+require 'log4r-color/formatter/patternformatter'
+require 'log4r-color/outputter/syslogoutputter'
 require 'syslog'
 include Log4r
 include Syslog::Constants

data/examples/xmlconfig.rb

@@ -3,8 +3,8 @@
 
 $: << '../lib'
 
-require 'log4r'
-require 'log4r/configurator'
+require 'log4r-color'
+require 'log4r-color/configurator'
 include Log4r
 
 # set any runtime XML variables

data/examples/yaml.rb

@@ -1,12 +1,12 @@
 # Log4r can be configured using YAML. This example uses log4r_yaml.yaml
 
 $: << File.join('..','lib') # path if log4r is not installed
-require 'log4r'
-require 'log4r/yamlconfigurator'
+require 'log4r-color'
+require 'log4r-color/yamlconfigurator'
 # we use various outputters, so require them, otherwise config chokes
-require 'log4r/outputter/datefileoutputter'
-require 'log4r/outputter/emailoutputter'
-require 'log4r/outputter/scribeoutputter'
+require 'log4r-color/outputter/datefileoutputter'
+require 'log4r-color/outputter/emailoutputter'
+require 'log4r-color/outputter/scribeoutputter'
 
 cfg = Log4r::YamlConfigurator # shorthand
 cfg['HOME'] = '.'      # the only parameter in the YAML, our HOME directory

data/lib/{log4r → log4r-color}/GDC.rb

@@ -11,7 +11,7 @@ module Log4r
   GDCNAME = "log4rGDC"
   $globalGDCLock = Monitor.new
 
-  # See log4r/GDC.rb
+  # See log4r-color/GDC.rb
   class GDC < Monitor
     private_class_method :new
 

data/lib/{log4r → log4r-color}/MDC.rb

@@ -12,7 +12,7 @@ module Log4r
   MDCNAMEMAXDEPTH = "log4rMDCMAXDEPTH"
   $globalMDCLock = Monitor.new
 
-  # See log4r/MDC.rb
+  # See log4r-color/MDC.rb
   class MDC < Monitor
     private_class_method :new
 

data/lib/{log4r → log4r-color}/NDC.rb

@@ -10,7 +10,7 @@ module Log4r
   NDCNAMEMAXDEPTH = "log4rNDCMAXDEPTH"
   NDCDEFAULTMAXDEPTH = 256
 
-  # See log4r/NDC.rb
+  # See log4r-color/NDC.rb
   class NDC
     private_class_method :new
 

data/lib/{log4r → log4r-color}/base.rb

@@ -1,5 +1,5 @@
 # :nodoc:
-require "log4r/config"
+require "log4r-color/config"
 
 module Log4r
   ALL = 0
@@ -61,11 +61,11 @@ module Log4r
     end
 
     def self.level_key level 
-      valid_levels[level]
+      valid_levels[level -1]
     end
 
     def self.valid_levels
-      [:debug, :info, :debug, :warn, :error, :fatal]
+      [:debug, :info, :warn, :error, :fatal]
     end
   
     # Shortcut for decoding 'true', 'false', true, false or nil into a bool

data/lib/{log4r → log4r-color}/configurator.rb

@@ -4,11 +4,11 @@
 #
 # Version:: $Id$
 
-require "log4r/logger"
-require "log4r/outputter/staticoutputter"
-require "log4r/lib/xmlloader"
-require "log4r/logserver"
-require "log4r/outputter/remoteoutputter"
+require "log4r-color/logger"
+require "log4r-color/outputter/staticoutputter"
+require "log4r-color/lib/xmlloader"
+require "log4r-color/logserver"
+require "log4r-color/outputter/remoteoutputter"
 
 # TODO: catch unparsed parameters #{FOO} and die
 module Log4r
@@ -16,7 +16,7 @@ module Log4r
   class ConfigError < Exception
   end
 
-  # See log4r/configurator.rb
+  # See log4r-color/configurator.rb
   class Configurator
     include REXML if HAVE_REXML
     @@params = Hash.new

data/lib/{log4r → log4r-color}/formatter/formatter.rb

@@ -4,7 +4,7 @@
 
 require "singleton"
 
-require "log4r/base"
+require "log4r-color/base"
 
 module Log4r
 

data/lib/{log4r → log4r-color}/formatter/log4jxmlformatter.rb

@@ -4,7 +4,7 @@
 #
 # Version:: $Id$
 
-require "log4r/formatter/formatter"
+require "log4r-color/formatter/formatter"
 
 require "rubygems"
 require "builder"

data/lib/{log4r → log4r-color}/formatter/patternformatter.rb

@@ -4,13 +4,13 @@
 #
 # Version:: $Id$
 
-require "log4r/formatter/formatter"
-require "log4r/GDC"
-require "log4r/MDC"
-require "log4r/NDC"
+require "log4r-color/formatter/formatter"
+require "log4r-color/GDC"
+require "log4r-color/MDC"
+require "log4r-color/NDC"
   
 module Log4r
-  # See log4r/formatter/patternformatter.rb
+  # See log4r-color/formatter/patternformatter.rb
   class PatternFormatter < BasicFormatter
   
     # Arguments to sprintf keyed to directive letters<br>

data/lib/{log4r → log4r-color}/logger.rb

@@ -5,14 +5,14 @@
 # Version:: $Id$
 # Author:: Leon Torres <leon(at)ugcs.caltech.edu>
 
-require "log4r/outputter/outputter"
-require "log4r/repository"
-require "log4r/loggerfactory"
-require "log4r/staticlogger"
+require "log4r-color/outputter/outputter"
+require "log4r-color/repository"
+require "log4r-color/loggerfactory"
+require "log4r-color/staticlogger"
 
 module Log4r
   
-  # See log4r/logger.rb
+  # See log4r-color/logger.rb
   class Logger
     attr_reader :name, :fullname, :path, :level, :parent
     attr_reader :additive, :trace, :outputters

data/lib/{log4r → log4r-color}/loggerfactory.rb

@@ -1,9 +1,9 @@
 # :nodoc:
 # Version:: $Id$
 
-require "log4r/base"
-require "log4r/repository"
-require 'log4r/logevent'
+require "log4r-color/base"
+require "log4r-color/repository"
+require 'log4r-color/logevent'
 
 module Log4r
 class Logger

data/lib/{log4r → log4r-color}/logserver.rb

@@ -1,10 +1,10 @@
 # :include: rdoc/logserver
 
-require 'log4r/logger'
-require 'log4r/lib/drbloader'
+require 'log4r-color/logger'
+require 'log4r-color/lib/drbloader'
 
 module Log4r
-  # See log4r/logserver.rb
+  # See log4r-color/logserver.rb
   class LogServer < Logger
     attr_reader :uri
 

data/lib/{log4r → log4r-color}/outputter/consoleoutputters.rb

@@ -1,5 +1,5 @@
 # :nodoc:
-require "log4r/outputter/iooutputter"
+require "log4r-color/outputter/iooutputter"
 require "colorize"
 
 module Log4r
@@ -32,6 +32,9 @@ module Log4r
     def write(data, lv)
       begin
         key = level_key(lv)
+        # puts "color key: #{key}, lv: #{lv}"
+        # puts "colors: #{colors}"
+        # puts "colors on key: #{colors[key]}"
         @out.print data.colorize(colors[key])
         @out.flush
         @out.print "".uncolorize

data/lib/{log4r → log4r-color}/outputter/datefileoutputter.rb

@@ -31,8 +31,8 @@
 # recorded as the smallest time interval equals the rollover period for this
 # system.
 
-require "log4r/outputter/fileoutputter"
-require "log4r/staticlogger"
+require "log4r-color/outputter/fileoutputter"
+require "log4r-color/staticlogger"
 
 module Log4r
 

data/lib/{log4r → log4r-color}/outputter/emailoutputter.rb

@@ -1,7 +1,7 @@
 # :include: ../rdoc/emailoutputter
 
-require 'log4r/outputter/outputter'
-require 'log4r/staticlogger'
+require 'log4r-color/outputter/outputter'
+require 'log4r-color/staticlogger'
 require 'net/smtp'
 
 module Log4r

data/lib/{log4r → log4r-color}/outputter/fileoutputter.rb

@@ -1,8 +1,8 @@
 # :nodoc:
 # Version:: $Id$
 
-require "log4r/outputter/iooutputter"
-require "log4r/staticlogger"
+require "log4r-color/outputter/iooutputter"
+require "log4r-color/staticlogger"
 
 module Log4r
 

data/lib/{log4r → log4r-color}/outputter/iooutputter.rb

@@ -1,6 +1,6 @@
 # :nodoc:
-require "log4r/outputter/outputter"
-require "log4r/staticlogger"
+require "log4r-color/outputter/outputter"
+require "log4r-color/staticlogger"
 
 module Log4r
   

data/lib/{log4r → log4r-color}/outputter/outputter.rb

@@ -7,9 +7,9 @@
 
 require "thread"
 
-require "log4r/outputter/outputterfactory"
-require "log4r/formatter/formatter"
-require "log4r/staticlogger"
+require "log4r-color/outputter/outputterfactory"
+require "log4r-color/formatter/formatter"
+require "log4r-color/staticlogger"
 
 require 'monitor'
 

data/lib/{log4r → log4r-color}/outputter/outputterfactory.rb

@@ -1,9 +1,9 @@
 # :nodoc:
 # Version: $Id$
 
-require "log4r/base"
-require "log4r/repository"
-require "log4r/logger"
+require "log4r-color/base"
+require "log4r-color/repository"
+require "log4r-color/logger"
 
 require 'monitor'
 

data/lib/{log4r → log4r-color}/outputter/remoteoutputter.rb

@@ -1,9 +1,9 @@
 # :nodoc:
-require 'log4r/lib/drbloader'
-require 'log4r/outputter/outputter'
+require 'log4r-color/lib/drbloader'
+require 'log4r-color/outputter/outputter'
 
 module Log4r
-  # See log4r/logserver.rb
+  # See log4r-color/logserver.rb
   class RemoteOutputter < Outputter
 
     def initialize(_name, hash={})

data/lib/{log4r → log4r-color}/outputter/rollingfileoutputter.rb

@@ -2,8 +2,8 @@
 # :nodoc:
 # Version:: $Id: rollingfileoutputter.rb,v 1.2 2009/09/29 18:13:13 colbygk Exp $
 
-require "log4r/outputter/fileoutputter"
-require "log4r/staticlogger"
+require "log4r-color/outputter/fileoutputter"
+require "log4r-color/staticlogger"
 
 require 'fileutils'
 

data/lib/{log4r → log4r-color}/outputter/scribeoutputter.rb

@@ -1,7 +1,7 @@
 # :nodoc:
 # Version:: $Id$
 
-require "log4r/outputter/outputter"
+require "log4r-color/outputter/outputter"
 require "rubygems"
 require "scribe"
 

data/lib/{log4r → log4r-color}/outputter/syslogoutputter.rb

@@ -4,9 +4,9 @@
 # Author:: Steve Lumos
 # Author:: Leon Torres
 
-require 'log4r/formatter/formatter'
-require 'log4r/outputter/outputter'
-require 'log4r/configurator'
+require 'log4r-color/formatter/formatter'
+require 'log4r-color/outputter/outputter'
+require 'log4r-color/configurator'
 require 'syslog'
 
 module Log4r

data/lib/{log4r → log4r-color}/outputter/udpoutputter.rb

@@ -5,8 +5,8 @@
 # Version:: $Id$
 # Author:: Leon Torres <leon@ugcs.caltech.edu>
 
-require "log4r/outputter/outputter"
-require 'log4r/staticlogger'
+require "log4r-color/outputter/outputter"
+require 'log4r-color/staticlogger'
 require "socket"
 
 module Log4r

data/lib/{log4r → log4r-color}/rdoc/configurator

@@ -7,14 +7,14 @@ customize the logging levels.
 
 Log4r is also configurable using YAML. For that, there is
 a class similar to Configurator called Log4r::YamlConfigurator. Please see
-log4r/yamlconfigurator.rb for details.
+log4r-color/yamlconfigurator.rb for details.
 
 REXML is required for XML configuration. Get REXML at 
 http://www.ruby-lang.org/en/raa-list.rhtml?name=REXML
 
 To use the Configurator class,
 
-  require 'log4r/configurator'
+  require 'log4r-color/configurator'
 
 == Custom Levels
 

data/lib/{log4r → log4r-color}/rdoc/emailoutputter

@@ -8,7 +8,7 @@ send email, it will set itself to OFF and stop logging.
 
 In order to use it,
 
-  require 'log4r/outputter/emailoutputter'
+  require 'log4r-color/outputter/emailoutputter'
 
 == SMTP Configuration
 
@@ -82,7 +82,7 @@ log events and sending immediates on CRIT and WARN
                      
 == XML Configuration
 
-See log4r/configurator.rb for details. Here's an example:
+See log4r-color/configurator.rb for details. Here's an example:
 
   <outputter name="security" type="EmailOutputter"
              buffsize="25" level="ALL">

data/lib/{log4r → log4r-color}/rdoc/formatter

@@ -7,7 +7,7 @@ Log4r::Formatter#format method prior to writing.
 == Available Formatters
 
 * Log4r::BasicFormatter -  default
-* Log4r::PatternFormatter - most flexible. See log4r/formatter/patternformatter.rb
+* Log4r::PatternFormatter - most flexible. See log4r-color/formatter/patternformatter.rb
 * Log4r::SimpleFormatter - like BasicFormatter for Strings only (low noise)
 * Log4r::ObjectFormatter - for inspecting objects
 * Log4r::NullFormatter - twirls on its feet and does nothing
@@ -21,7 +21,7 @@ Specify the Formatter and its class (as +type+) under an
     <formatter type="Log4r::BasicFormatter"/>
   </outputter>
 
-As explained in log4r/configurator.rb, the hash arguments you would normally
+As explained in log4r-color/configurator.rb, the hash arguments you would normally
 pass to +new+ are specified as <i>XML parameters</i>. Only PatternFormatter
 has any of these.
 
@@ -32,7 +32,7 @@ that extends Formatter and override the Formatter#format method.
 Then give it to any interested Outputters. 
 
 If you're interested in setting up your custom formatters in XML,
-please take a look at log4r/configurator.rb.
+please take a look at log4r-color/configurator.rb.
 
 == Data Available
 

data/lib/{log4r → log4r-color}/rdoc/log4r

@@ -41,7 +41,7 @@ You can have as many levels as you desire, with any naming scheme. Log4r
 will automatically define level constants and log method names after
 your custom specification.
 
-Please see log4r/configurator.rb for details.
+Please see log4r-color/configurator.rb for details.
 
 === Boundary Levels
 
@@ -56,10 +56,10 @@ whereas <tt>OFF</tt> will turn off logging completely.
 
 == File Overviews
 
-For Loggers::        log4r/logger.rb
-For Outputters::     log4r/outputter/outputter.rb
-For Formatters::     log4r/formatter/formatter.rb
-For configuration::  log4r/configurator.rb
+For Loggers::        log4r-color/logger.rb
+For Outputters::     log4r-color/outputter/outputter.rb
+For Formatters::     log4r-color/formatter/formatter.rb
+For configuration::  log4r-color/configurator.rb
 
 == Principal Classes of Log4r
 
@@ -75,7 +75,7 @@ look at the file overviews of those classes for more details.
 
 == Remote Logging
 
-Log4r provides a way to send log events over a network. See log4r/logserver.rb
+Log4r provides a way to send log events over a network. See log4r-color/logserver.rb
 for details.
 
 == What's Going on Inside?

data/lib/{log4r → log4r-color}/rdoc/logger

@@ -36,7 +36,7 @@ Logger#add method or set directly by modifying the Loggers#outputters array:
   mylog.add('out7')
   mylog.remove('out5','out7')
 
-Please see log4r/outputter/outputter.rb and Log4r::Outputter for more about
+Please see log4r-color/outputter/outputter.rb and Log4r::Outputter for more about
 outputters.
 
 == Logging Methods
@@ -154,7 +154,7 @@ RootLogger itself behaves as if its level were permanently set to
 
 = XML Configuration
 
-Please see log4r/configurator.rb for an overview of XML configuratoin.
+Please see log4r-color/configurator.rb for an overview of XML configuratoin.
 
 It's easy to configure a Logger in XML. The following example should be
 sufficient:

data/lib/{log4r → log4r-color}/rdoc/logserver

@@ -21,7 +21,7 @@ RemoteOutputter on another host.
 
 Setup is easy. First,
 
-  require 'log4r/logserver'
+  require 'log4r-color/logserver'
 
 The following sets up a LogServer named 'central' on localhost port 9999:
 
@@ -43,7 +43,7 @@ forwarding a LogEvent to another Logger (as is done in hierarchical logging).
 
 First,
 
-  require 'log4r/outputter/remoteoutputter'
+  require 'log4r-color/outputter/remoteoutputter'
 
 Unlike typical outputters, RemoteOutputter doesn't do any formatting. That's
 up to the LogServer's outputters. Otherwise, RemoteOutputter can be

data/lib/{log4r → log4r-color}/rdoc/outputter

@@ -37,9 +37,9 @@ The basic Outputter class is both abstract and a null object.
 
 == Interesting Outputters
 
-* log4r/outputter/syslogoutputter.rb - Logs to syslog
-* log4r/outputter/emailoutputter.rb - Email logs
-* log4r/logserver.rb - For remote logging
+* log4r-color/outputter/syslogoutputter.rb - Logs to syslog
+* log4r-color/outputter/emailoutputter.rb - Email logs
+* log4r-color/logserver.rb - For remote logging
 
 == Subclasses
 
@@ -98,7 +98,7 @@ Specify outputters as children of <tt><log4r_config></tt>:
     </outputter>
     ...
 
-As explained in log4r/configurator.rb, the hash arguments you would normally
+As explained in log4r-color/configurator.rb, the hash arguments you would normally
 pass to <tt>new</tt> are specified as <i>XML parameters</i>.
 It is given an IO object to write 
 to, a Formatter to call, and, optionally, levels to write at.

data/lib/{log4r → log4r-color}/rdoc/patternformatter

@@ -110,7 +110,7 @@ Symbol equivalent) to <tt>PatternFormatter.new</tt>.
 
 = XML Configuration
 
-As explained in log4r/configurator.rb, the hash arguments to PatternFormatter
+As explained in log4r-color/configurator.rb, the hash arguments to PatternFormatter
 are <i>XML parameters</i>. Here's an example:
 
   <formatter type="PatternFormatter" pattern="[%l] %d :: %.15m">

data/lib/{log4r → log4r-color}/rdoc/syslogoutputter

@@ -7,12 +7,12 @@ Since syslog has its own formatting system, log4r formatters are ignored.
 
 To use, 
 
-  <tt>require 'log4r/outputter/syslogoutputter'</tt>
+  <tt>require 'log4r-color/outputter/syslogoutputter'</tt>
 
 An example,
 
   require 'log4r'
-  require 'log4r/outputter/syslogoutputter'
+  require 'log4r-color/outputter/syslogoutputter'
 
   syslog = Log4r::SyslogOutputter.new("name", 'logopt'=>#, 'facility'=>#)
   syslog.err("this is an ERR message")

data/lib/{log4r → log4r-color}/rdoc/yamlconfigurator

@@ -15,6 +15,6 @@ examples directory.
 
 To use this class:
 
-  require 'log4r/yamlconfigurator'
+  require 'log4r-color/yamlconfigurator'
 
 Thanks to Andreas Hund for making this possible.

data/lib/{log4r → log4r-color}/repository.rb

@@ -18,7 +18,7 @@ module Log4r
   class Logger
 
     # The repository stores a Hash of loggers keyed to their fullnames and
-    # provides a few functions to reduce the code bloat in log4r/logger.rb.
+    # provides a few functions to reduce the code bloat in log4r-color/logger.rb.
     # This class is supposed to be transparent to end users, hence it is
     # a class within Logger. If anyone knows how to make this private,
     # let me know.

data/lib/{log4r → log4r-color}/yamlconfigurator.rb

@@ -4,10 +4,10 @@
 #
 # Version: $Id$
 
-require "log4r/logger"
-require "log4r/outputter/staticoutputter"
-require "log4r/logserver"
-require "log4r/outputter/remoteoutputter"
+require "log4r-color/logger"
+require "log4r-color/outputter/staticoutputter"
+require "log4r-color/logserver"
+require "log4r-color/outputter/remoteoutputter"
 
 require 'yaml'
 
@@ -16,7 +16,7 @@ module Log4r
   class ConfigError < Exception
   end
 
-  # See log4r/yamlconfigurator.rb
+  # See log4r-color/yamlconfigurator.rb
   class YamlConfigurator
     @@params = Hash.new
 

data/lib/log4r-color.rb

@@ -0,0 +1,20 @@
+# :include: log4r-color/rdoc/log4r
+#
+# == Other Info
+#
+# Author::      Leon Torres
+# Version::     $Id$
+
+require "log4r-color/outputter/fileoutputter"
+require "log4r-color/outputter/consoleoutputters"
+require "log4r-color/outputter/staticoutputter"
+require "log4r-color/outputter/rollingfileoutputter"
+require "log4r-color/formatter/patternformatter"
+require "log4r-color/loggerfactory"
+require "log4r-color/GDC"
+require "log4r-color/NDC"
+require "log4r-color/MDC"
+
+module Log4r
+  Log4rVersion = [1, 1, 9].join '.'
+end

data/tests/testchainsaw.rb

@@ -1,10 +1,10 @@
 $: << File.join("..", "lib")
 
 require 'log4r'
-require 'log4r/staticlogger'
-require 'log4r/formatter/log4jxmlformatter'
-require 'log4r/outputter/udpoutputter'
-require 'log4r/outputter/consoleoutputters'
+require 'log4r-color/staticlogger'
+require 'log4r-color/formatter/log4jxmlformatter'
+require 'log4r-color/outputter/udpoutputter'
+require 'log4r-color/outputter/consoleoutputters'
 
 include Log4r
 

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 11
-  version: 1.1.11
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill, Kristian Mandrup (color outputter)
@@ -96,53 +95,53 @@ files:
 - examples/syslogcustom.rb
 - examples/xmlconfig.rb
 - examples/yaml.rb
-- lib/log4r/base.rb
-- lib/log4r/config.rb
-- lib/log4r/configurator.rb
-- lib/log4r/formatter/formatter.rb
-- lib/log4r/formatter/log4jxmlformatter.rb
-- lib/log4r/formatter/patternformatter.rb
-- lib/log4r/GDC.rb
-- lib/log4r/lib/drbloader.rb
-- lib/log4r/lib/xmlloader.rb
-- lib/log4r/logevent.rb
-- lib/log4r/logger.rb
-- lib/log4r/loggerfactory.rb
-- lib/log4r/logserver.rb
-- lib/log4r/MDC.rb
-- lib/log4r/NDC.rb
-- lib/log4r/outputter/consoleoutputters.rb
-- lib/log4r/outputter/datefileoutputter.rb
-- lib/log4r/outputter/emailoutputter.rb
-- lib/log4r/outputter/fileoutputter.rb
-- lib/log4r/outputter/iooutputter.rb
-- lib/log4r/outputter/outputter.rb
-- lib/log4r/outputter/outputterfactory.rb
-- lib/log4r/outputter/remoteoutputter.rb
-- lib/log4r/outputter/rollingfileoutputter.rb
-- lib/log4r/outputter/scribeoutputter.rb
-- lib/log4r/outputter/staticoutputter.rb
-- lib/log4r/outputter/syslogoutputter.rb
-- lib/log4r/outputter/udpoutputter.rb
-- lib/log4r/rdoc/configurator
-- lib/log4r/rdoc/emailoutputter
-- lib/log4r/rdoc/formatter
-- lib/log4r/rdoc/GDC
-- lib/log4r/rdoc/log4r
-- lib/log4r/rdoc/logger
-- lib/log4r/rdoc/logserver
-- lib/log4r/rdoc/MDC
-- lib/log4r/rdoc/NDC
-- lib/log4r/rdoc/outputter
-- lib/log4r/rdoc/patternformatter
-- lib/log4r/rdoc/scribeoutputter
-- lib/log4r/rdoc/syslogoutputter
-- lib/log4r/rdoc/win32eventoutputter
-- lib/log4r/rdoc/yamlconfigurator
-- lib/log4r/repository.rb
-- lib/log4r/staticlogger.rb
-- lib/log4r/yamlconfigurator.rb
-- lib/log4r.rb
+- lib/log4r-color/base.rb
+- lib/log4r-color/config.rb
+- lib/log4r-color/configurator.rb
+- lib/log4r-color/formatter/formatter.rb
+- lib/log4r-color/formatter/log4jxmlformatter.rb
+- lib/log4r-color/formatter/patternformatter.rb
+- lib/log4r-color/GDC.rb
+- lib/log4r-color/lib/drbloader.rb
+- lib/log4r-color/lib/xmlloader.rb
+- lib/log4r-color/logevent.rb
+- lib/log4r-color/logger.rb
+- lib/log4r-color/loggerfactory.rb
+- lib/log4r-color/logserver.rb
+- lib/log4r-color/MDC.rb
+- lib/log4r-color/NDC.rb
+- lib/log4r-color/outputter/consoleoutputters.rb
+- lib/log4r-color/outputter/datefileoutputter.rb
+- lib/log4r-color/outputter/emailoutputter.rb
+- lib/log4r-color/outputter/fileoutputter.rb
+- lib/log4r-color/outputter/iooutputter.rb
+- lib/log4r-color/outputter/outputter.rb
+- lib/log4r-color/outputter/outputterfactory.rb
+- lib/log4r-color/outputter/remoteoutputter.rb
+- lib/log4r-color/outputter/rollingfileoutputter.rb
+- lib/log4r-color/outputter/scribeoutputter.rb
+- lib/log4r-color/outputter/staticoutputter.rb
+- lib/log4r-color/outputter/syslogoutputter.rb
+- lib/log4r-color/outputter/udpoutputter.rb
+- lib/log4r-color/rdoc/configurator
+- lib/log4r-color/rdoc/emailoutputter
+- lib/log4r-color/rdoc/formatter
+- lib/log4r-color/rdoc/GDC
+- lib/log4r-color/rdoc/log4r
+- lib/log4r-color/rdoc/logger
+- lib/log4r-color/rdoc/logserver
+- lib/log4r-color/rdoc/MDC
+- lib/log4r-color/rdoc/NDC
+- lib/log4r-color/rdoc/outputter
+- lib/log4r-color/rdoc/patternformatter
+- lib/log4r-color/rdoc/scribeoutputter
+- lib/log4r-color/rdoc/syslogoutputter
+- lib/log4r-color/rdoc/win32eventoutputter
+- lib/log4r-color/rdoc/yamlconfigurator
+- lib/log4r-color/repository.rb
+- lib/log4r-color/staticlogger.rb
+- lib/log4r-color/yamlconfigurator.rb
+- lib/log4r-color.rb
 - tests/README
 - tests/testall.rb
 - tests/testbase.rb

data/lib/log4r.rb

@@ -1,20 +0,0 @@
-# :include: log4r/rdoc/log4r
-#
-# == Other Info
-#
-# Author::      Leon Torres
-# Version::     $Id$
-
-require "log4r/outputter/fileoutputter"
-require "log4r/outputter/consoleoutputters"
-require "log4r/outputter/staticoutputter"
-require "log4r/outputter/rollingfileoutputter"
-require "log4r/formatter/patternformatter"
-require "log4r/loggerfactory"
-require "log4r/GDC"
-require "log4r/NDC"
-require "log4r/MDC"
-
-module Log4r
-  Log4rVersion = [1, 1, 9].join '.'
-end