log4r 1.1.9 → 1.1.10

data/tests/testoutputter.rb

@@ -1,10 +1,9 @@
-$: << File.join("..","lib")
-require "test/unit"
-require "log4r"
-include Log4r
+# encoding: utf-8
+require 'test_helper'
 
+class TestOutputter < TestCase
+  include Log4r
 
-class TestOutputter < Test::Unit::TestCase
   def test_validation
     assert_raise(ArgumentError) { Outputter.new }
     assert_raise(ArgumentError) { Outputter.new 'fonda', :level=>-10}
@@ -55,13 +54,13 @@ class TestOutputter < Test::Unit::TestCase
     assert_raise(TypeError) { o.formatter = "bogus" }
     assert_raise(TypeError) { o.formatter = -3 }
     # the formatter should be preserved
-    assert(o.formatter.class == Formatter) 
+    assert(o.formatter.class == Formatter)
   end
   def test_file
     assert_raise(TypeError) { FileOutputter.new 'f' }
     assert_raise(TypeError) { FileOutputter.new('fa', :filename => DEBUG) }
     assert_raise(TypeError) { FileOutputter.new('fo', :filename => nil) }
-    assert_nothing_raised { 
+    assert_nothing_raised {
       FileOutputter.new('fi', :filename => './junk/tmp')
       FileOutputter.new('fum', :filename=>'./junk/tmp', :trunc => "true")
     }
@@ -80,11 +79,11 @@ class TestOutputter < Test::Unit::TestCase
     for mname in LNAMES
       next if mname == 'OFF' || mname == 'ALL'
       assert_respond_to(o, mname.downcase.to_sym, "Test respond to #{mname.to_s}")
-    end 
+    end
     return # cuz the rest is borked
     # we rely on BasicFormatter's inability to reference a nil Logger to test
     # the log methods. Everything from WARN to FATAL should choke.
-    event = LogEvent.new(nil, nil, nil, nil) 
+    event = LogEvent.new(nil, nil, nil, nil)
     assert_nothing_raised { o.debug event }
     assert_nothing_raised { o.info event }
     assert_raise(NameError) { o.warn event }
@@ -94,7 +93,7 @@ class TestOutputter < Test::Unit::TestCase
     o.level = ERROR
     assert_nothing_raised { o.debug event}
     assert_nothing_raised { o.info event}
-    assert_nothing_raised { o.warn event}  
+    assert_nothing_raised { o.warn event}
     assert_raise(NameError) { o.error event}
     assert_raise(NameError) { o.fatal event}
   end
@@ -113,6 +112,18 @@ class TestOutputter < Test::Unit::TestCase
     assert_nothing_raised { o.info event}
     assert_nothing_raised { o.fatal event}
   end
+  if defined?( Encoding )
+    # tests that files are opened in binary mode
+    def test_file_encoding
+      Encoding.default_internal = Encoding::UTF_8
+      File.open( './junk/tmp2', 'w' ) { |f| f.write( 'scheiß encoding' ) }
+      fenc = FileOutputter.new('fenc', :filename => './junk/tmp2')
+      event = LogEvent.new(1, Logger.root, nil, 'scheiß encoding'.force_encoding('ASCII-8BIT'))
+      assert_nothing_raised(Encoding::UndefinedConversionError) do
+        fenc.debug event
+      end
+    end
+  end
   def broken_test_threading
     class << self
       def log_work
@@ -129,4 +140,4 @@ class TestOutputter < Test::Unit::TestCase
     ts = Thread.new(log_thread_start)
     ts.join
   end
-end 
+end

data/tests/testpatternformatter.rb

@@ -1,16 +1,14 @@
-$: << File.join("..","lib")
-require "test/unit"
-require "log4r"
-include Log4r
+require 'test_helper'
 
+class TestPatternFormatter < TestCase
+  include Log4r
 
-class TestPatternFormatter < Test::Unit::TestCase
   def test_pattern
     l = Logger.new 'test::this::that'
     l.trace = true
-    o = StdoutOutputter.new 'test' 
+    o = StdoutOutputter.new 'test'
     l.add o
-    assert_nothing_raised { 
+    assert_nothing_raised {
     f = PatternFormatter.new :pattern=> "'%t' T-'%T' %d %6l [%C]%c %% %-40.30M"
                              #:date_pattern=> "%Y"
                              #:date_method => :usec
@@ -28,7 +26,7 @@ class TestPatternFormatter < Test::Unit::TestCase
   def test_ndc
     l = Logger.new 'test::this::that::other'
     l.trace = true
-    o = StdoutOutputter.new 'testy' 
+    o = StdoutOutputter.new 'testy'
     l.add o
     f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%x} %% %-40.30M"
                              #:date_pattern=> "%Y"
@@ -49,7 +47,7 @@ class TestPatternFormatter < Test::Unit::TestCase
   def test_gdc
     l = Logger.new 'test::this::that::other'
     l.trace = true
-    o = StdoutOutputter.new 'testy' 
+    o = StdoutOutputter.new 'testy'
     l.add o
     f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%g} %% %-40.30M"
                              #:date_pattern=> "%Y"
@@ -64,7 +62,7 @@ class TestPatternFormatter < Test::Unit::TestCase
   def test_mdc
     l = Logger.new 'test::this::that::other'
     l.trace = true
-    o = StdoutOutputter.new 'testy' 
+    o = StdoutOutputter.new 'testy'
     l.add o
     f = PatternFormatter.new :pattern=> "%d %6l [%C]%c {%X{user}} %% %-40.30M"
                              #:date_pattern=> "%Y"

data/tests/testthreads.rb

@@ -1,6 +1,6 @@
 # $Id$
 # Test guts sent in by chetreddy bug #27184
-# 
+#
 # Note: this test won't always catch a threading problem, as it
 # relies on a brute force approach.  NUM_THREADS can be increased
 # to stress the system longer and therefore increasing the chance
@@ -8,14 +8,10 @@
 # test.
 #
 
+require 'test_helper'
 
-$: << File.join("..","lib")
-
-require "test/unit"
-require 'log4r'
-include Log4r
-
-class TestThreads < Test::Unit::TestCase
+class TestThreads < TestCase
+  include Log4r
 
   NUMTHREADS = 1000
 
@@ -24,11 +20,11 @@ class TestThreads < Test::Unit::TestCase
     assert_nothing_raised do
       (0..NUMTHREADS).map do |i|
         Thread.new do
-	  Thread.current[:logger] = Log4r::Logger.new "Hello #{i}"
-	  Thread.current[:logger].outputters = [StdoutOutputter.new "log4r#{i}"]
-	  Thread.current[:logger].outputters.each { |i| i.flush }
-	  Thread.current.exit()
-	end
+          Thread.current[:logger] = Log4r::Logger.new "Hello #{i}"
+          Thread.current[:logger].outputters = [StdoutOutputter.new("log4r#{i}")]
+          Thread.current[:logger].outputters.each { |j| j.flush }
+          Thread.current.exit()
+        end
       end.each do |thr| thr.join end
     end
   end

data/tests/testxmlconf.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 
 One=<<-EOX
 <log4r_config><pre_config><custom_levels> Foo </custom_levels>
@@ -14,28 +15,30 @@ EOX
 
 # must be run independently
 class TestXmlConf < TestCase
+  include Log4r
+
   def test_load1
     Configurator.load_xml_string(One)
-    assert_no_exception{ 
+    assert_nothing_raised{ 
       assert(Foo == 1) 
       assert(Logger.global.level == ALL)
     }
   end
   def test_load2
     Configurator.load_xml_string(Two)
-    assert_no_exception{ 
+    assert_nothing_raised{ 
       assert(Logger.global.level == DEBUG)
     }
   end
   def test_load3
     Configurator.load_xml_string(Three)
-    assert_no_exception{ 
+    assert_nothing_raised{ 
       assert(Foo == 1) 
       assert(Logger.global.level == Foo)
     }
   end
   def test_load4
-    assert_no_exception {
+    assert_nothing_raised {
       Configurator['logpath'] = '.'
       Configurator.load_xml_file "xml/testconf.xml"
       a = Logger['first::second']

data/tests/testyaml.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+
+# Define a custom outputter that allows arrays in configuration hash
+module Log4r
+  class TestYamlOutputter < Outputter
+    # expose array parameter
+    attr_reader :array_param
+
+    def initialize(name, hash = {})
+      @array_param = hash['array_param']
+    end
+  end
+end
+
+
+class TestYaml < TestCase
+  include Log4r
+
+  def setup
+    @cfg = YamlConfigurator # shorthand
+    @cfg['CUSTOM_DOMAIN'] = 'bar.com'
+  end
+
+  def test_injection
+    assert_nothing_raised("Exception injected") do
+      @cfg.load_yaml_file(File.join(File.dirname(__FILE__),'testyaml_injection.yaml'))
+    end
+  end
+
+  def test_arrays
+    assert_nothing_raised("Parser couldn't handle arrays in YAML") do
+      @cfg.load_yaml_file(File.join(File.dirname(__FILE__),'testyaml_arrays.yaml'))
+    end
+    log = Logger['mylogger']
+    assert_instance_of(Array, log.outputters.first.array_param, 'Array not loaded properly from YAML')
+    assert_equal('wilma@bar.com', log.outputters.first.array_param[2], '#{}-style parameter interpolation doesn\'t work properly in arrays')
+  end
+end
+

data/tests/testyaml_arrays.yaml

@@ -0,0 +1,25 @@
+log4r_config:
+
+  # define all loggers ...
+  loggers:
+    - name      : mylogger
+      level     : INFO
+      additive  : 'false'
+      trace     : 'false'      
+      outputters:
+        - testyaml
+
+  # define all outputters (incl. formatters)      
+  outputters:
+    - type     : TestYamlOutputter
+      name     : testyaml 
+      level    : INFO
+      array_param:
+        - fred@foo.com
+        - barney@foo.com
+        - 'wilma@#{CUSTOM_DOMAIN}'
+      formatter:
+        date_pattern: '%y%m%d %H:%M:%S'
+        pattern     : '%d %l: %m '
+        type        : PatternFormatter
+

data/tests/testyaml_injection.yaml

@@ -0,0 +1,22 @@
+log4r_config:
+
+  # define all loggers ...
+  loggers:
+    - name      : mylogger
+      level     : INFO
+      additive  : 'false'
+      trace     : 'false'      
+      outputters:
+        - stderr
+
+  # define all outputters (incl. formatters)      
+  outputters:
+    - type     : StderrOutputter
+      name     : stderr 
+      level    : INFO
+      crash    : "'; raise Exception #"
+      formatter:
+        date_pattern: '%y%m%d %H:%M:%S'
+        pattern     : '%d %l: %m '
+        type        : PatternFormatter
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 10
+  version: 1.1.10
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -15,27 +15,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2012-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id002
 description: "See also: http://logging.apache.org/log4j"
 email: colby@astro.berkeley.edu
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
+extra_rdoc_files: []
+
 files: 
-- LICENSE
-- LICENSE.LGPLv3
-- README
-- INSTALL
-- Rakefile
-- TODO
 - doc/content/contact.html
 - doc/content/contribute.html
 - doc/content/index.html
@@ -95,6 +117,7 @@ files:
 - 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
@@ -102,6 +125,7 @@ files:
 - lib/log4r/rdoc/emailoutputter
 - lib/log4r/rdoc/formatter
 - lib/log4r/rdoc/GDC
+- lib/log4r/rdoc/log4jxmlformatter
 - lib/log4r/rdoc/log4r
 - lib/log4r/rdoc/logger
 - lib/log4r/rdoc/logserver
@@ -109,14 +133,17 @@ files:
 - 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/version.rb
 - lib/log4r/yamlconfigurator.rb
 - lib/log4r.rb
 - tests/README
+- tests/test_helper.rb
 - tests/testall.rb
 - tests/testbase.rb
 - tests/testchainsaw.rb
@@ -131,7 +158,9 @@ files:
 - tests/testpatternformatter.rb
 - tests/testthreads.rb
 - tests/testxmlconf.rb
-has_rdoc: true
+- tests/testyaml.rb
+- tests/testyaml_arrays.yaml
+- tests/testyaml_injection.yaml
 homepage: http://log4r.rubyforge.org
 licenses: []
 
@@ -160,10 +189,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: log4r
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Log4r, logging framework for ruby
-test_files: []
-
+test_files: 
+- tests/README
+- tests/test_helper.rb
+- tests/testall.rb
+- tests/testbase.rb
+- tests/testchainsaw.rb
+- tests/testconf.xml
+- tests/testcustom.rb
+- tests/testformatter.rb
+- tests/testGDC.rb
+- tests/testlogger.rb
+- tests/testMDC.rb
+- tests/testNDC.rb
+- tests/testoutputter.rb
+- tests/testpatternformatter.rb
+- tests/testthreads.rb
+- tests/testxmlconf.rb
+- tests/testyaml.rb
+- tests/testyaml_arrays.yaml
+- tests/testyaml_injection.yaml