logging 0.5.3 → 0.6.0

data/test/appenders/test_syslog.rb

@@ -1,4 +1,4 @@
-# $Id: test_syslog.rb 53 2007-11-28 00:21:33Z tim_pease $
+# $Id: test_syslog.rb 72 2007-12-26 21:59:58Z tim_pease $
 
 require 'test/setup.rb'
 
@@ -17,10 +17,6 @@ module TestAppenders
       @levels = ::Logging::LEVELS
     end
 
-    def teardown
-      ::Syslog.close if ::Syslog.opened?
-    end
-
     def test_append
       return if RUBY_PLATFORM =~ %r/cygwin/
 
@@ -63,7 +59,7 @@ module TestAppenders
 
     def test_append_error
       appender = create_syslog
-      appender.close
+      appender.close false
 
       event = ::Logging::LogEvent.new('TestLogger', @levels['warn'],
                                       [1, 2, 3, 4], false)
@@ -75,7 +71,7 @@ module TestAppenders
       appender = create_syslog
       assert_equal false, appender.closed?
 
-      appender.close
+      appender.close false
       assert_equal true, appender.closed?
     end
 
@@ -107,7 +103,7 @@ module TestAppenders
 
     def test_concat_error
       appender = create_syslog
-      appender.close
+      appender.close false
 
       assert_raise(RuntimeError) {appender << 'oopsy'}
       assert_equal true, appender.closed?

data/test/config/test_yaml_configurator.rb

@@ -1,4 +1,4 @@
-# $Id: test_yaml_configurator.rb 38 2007-10-26 20:05:51Z tim_pease $
+# $Id: test_yaml_configurator.rb 72 2007-12-26 21:59:58Z tim_pease $
 
 require 'stringio'
 require 'yaml'
@@ -10,10 +10,6 @@ module TestConfig
   class TestYamlConfigurator < Test::Unit::TestCase
     include LoggingTestCase
 
-    def setup
-      super
-    end
-
     def test_class_load
       assert_raise(::Logging::Config::YamlConfigurator::Error) {
         ::Logging::Config::YamlConfigurator.load(Object.new)

data/test/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 53 2007-11-28 00:21:33Z tim_pease $
+# $Id: setup.rb 72 2007-12-26 21:59:58Z tim_pease $
 
 require 'test/unit'
 
@@ -8,6 +8,7 @@ require 'test/unit'
 KeyError = IndexError if not defined? KeyError
 
 begin
+  require 'rubygems'
   require 'logging'
 rescue LoadError
   path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -27,9 +28,14 @@ end
 module TestLogging
 module LoggingTestCase
 
+  TMP = 'tmp'
+
   def setup
     super
 
+    FileUtils.rm_rf TMP
+    FileUtils.mkdir TMP
+
     ::Logging.module_eval do
       ::Logging::LEVELS.clear
       ::Logging::LNAMES.clear
@@ -48,8 +54,14 @@ module LoggingTestCase
         end
       end
     end
+  end
     
-    ::Logging::Appender.instance_variable_get(:@appenders).clear
+  def teardown
+    super
+    h = ::Logging::Appender.instance_variable_get(:@appenders)
+    h.each_value {|a| a.close(false) unless a.nil? || a.closed?}
+    h.clear
+    FileUtils.rm_rf TMP
   end
 
 end  # module LoggingTestCase

data/test/test_appender.rb

@@ -1,4 +1,4 @@
-# $Id: test_appender.rb 26 2007-01-31 23:19:40Z tim_pease $
+# $Id: test_appender.rb 67 2007-12-26 16:27:06Z tim_pease $
 
 require 'test/setup.rb'
 
@@ -20,7 +20,10 @@ module TestLogging
     def test_append
       ary = []
       @appender.instance_variable_set :@ary, ary
-      def @appender.write( str ) @ary << str end
+      def @appender.write( event, do_layout = true )
+        str = do_layout ? @layout.format(event) : event.to_s
+        @ary << str
+      end
 
       assert_nothing_raised {@appender.append @event}
       assert_equal "DEBUG  logger : message\n", ary.pop
@@ -68,14 +71,17 @@ module TestLogging
     def test_concat
       ary = []
       @appender.instance_variable_set :@ary, ary
-      def @appender.write( str ) @ary << str end
+      def @appender.write( event, do_layout = true )
+        str = do_layout ? @layout.format(event) : event.to_s
+        @ary << str
+      end
 
       assert_nothing_raised {@appender << 'log message'}
       assert_equal 'log message', ary.pop
 
       @appender.level = :off
       @appender << 'another log message'
-      assert_equal 'another log message', ary.pop
+      assert_nil ary.pop
 
       layout = @appender.layout
       def layout.footer() 'this is the footer' end
@@ -85,6 +91,10 @@ module TestLogging
       assert_equal 'this is the footer', ary.pop
     end
 
+    def test_flush
+      assert_same @appender, @appender.flush
+    end
+
     def test_initialize
       assert_raise(TypeError) {::Logging::Appender.new 'test', :layout => []}
 

data/test/test_logging.rb

@@ -1,4 +1,4 @@
-# $Id: test_logging.rb 38 2007-10-26 20:05:51Z tim_pease $
+# $Id: test_logging.rb 72 2007-12-26 21:59:58Z tim_pease $
 
 require 'test/setup.rb'
 require 'fileutils'
@@ -8,25 +8,15 @@ module TestLogging
   class TestLogging < Test::Unit::TestCase
     include LoggingTestCase
 
-    TMP = 'tmp'
-
     def setup
       super
       @levels = ::Logging::LEVELS
       @lnames = ::Logging::LNAMES
 
-      FileUtils.rm_rf TMP
-      FileUtils.mkdir(TMP)
       @fn = File.join(TMP, 'test.log')
       @glob = File.join(TMP, '*.log')
     end
 
-    def teardown
-      h = ::Logging::Repository.instance.instance_variable_get :@h
-      h.values.each {|l| l.close if l.respond_to? :close}
-      FileUtils.rm_rf TMP
-    end
-
     def test_configure
       assert_raise(ArgumentError) {::Logging.configure 'blah.txt'}
 
@@ -48,7 +38,7 @@ module TestLogging
       logfile = ::Logging::Appender['logfile']
       assert_instance_of ::Logging::Appenders::File, logfile
       assert_equal 0, logfile.level
-      assert_equal 'temp.log', logfile.instance_variable_get(:@fn)
+      assert_equal 'tmp/temp.log', logfile.instance_variable_get(:@fn)
 
       layout = logfile.layout
       assert_instance_of ::Logging::Layouts::Pattern, layout
@@ -87,9 +77,6 @@ module TestLogging
       appenders = yourlogger.instance_variable_get :@appenders
       assert_equal 2, appenders.length
       assert_equal ['logfile', 'stderr'], appenders.map {|a| a.name}.sort
-
-      # cleanup
-      File.delete('temp.log') if File.exist?('temp.log')
     end
 
     def test_logger

data/test/test_utils.rb

@@ -0,0 +1,49 @@
+# $Id: test_utils.rb 65 2007-12-23 04:48:55Z tim_pease $
+
+require 'test/setup.rb'
+require 'stringio'
+
+module TestLogging
+
+  class TestUtils < Test::Unit::TestCase
+
+    def test_getopt
+      opts = {
+        :foo => 'foo_value',
+        'bar' => 'bar_value',
+        'one' => '1',
+        :two => '2',
+        :three => 3.0
+      }
+
+      assert_equal('foo_value', opts.getopt(:foo))
+      assert_equal('foo_value', opts.getopt('foo'))
+      assert_equal(:foo_value, opts.getopt(:foo, :as => Symbol))
+
+      assert_equal('bar_value', opts.getopt(:bar))
+      assert_equal('bar_value', opts.getopt('bar'))
+
+      assert_equal('1', opts.getopt(:one))
+      assert_equal(1, opts.getopt('one', :as => Integer))
+      assert_instance_of(Float, opts.getopt('one', :as => Float))
+
+      assert_equal('2', opts.getopt(:two))
+      assert_equal(['2'], opts.getopt(:two, :as => Array))
+
+      assert_equal(3.0, opts.getopt(:three))
+      assert_equal('3.0', opts.getopt('three', :as => String))
+
+      assert_equal(nil, opts.getopt(:baz))
+      assert_equal('default', opts.getopt('baz', 'default'))
+      assert_equal(:default, opts.getopt(:key, 'default', :as => Symbol))
+      assert_equal(['default'], opts.getopt('key', 'default', :as => Array))
+
+      assert_equal(3.0, opts.getopt(:three, :as => Object))
+
+      assert_nil opts.getopt(:key, :as => Symbol)
+    end
+
+  end  # class TestUtils
+end  # module TestLogging
+
+# EOF

metadata

@@ -1,33 +1,53 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
-date: 2007-12-08 00:00:00 -07:00
-summary: A flexible and extendable logging library for Ruby
-require_paths: 
-- lib
-email: tim.pease@gmail.com
-homepage: http://logging.rubyforge.org/
-rubyforge_project: logging
-description: Logging is a flexible logging library for use in Ruby programs based on the design of Java's log4j library. It features a hierarchical logging system, custom level names, multiple output destinations per log event, custom formatting, and more.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.6.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Tim Pease
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-26 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: lockfile
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+    version: 
+description: Logging is a flexible logging library for use in Ruby programs based on the design of Java's log4j library. It features a hierarchical logging system, custom level names, multiple output destinations per log event, custom formatting, and more.
+email: tim.pease@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -37,6 +57,7 @@ files:
 - lib/logging.rb
 - lib/logging/appender.rb
 - lib/logging/appenders/console.rb
+- lib/logging/appenders/email.rb
 - lib/logging/appenders/file.rb
 - lib/logging/appenders/growl.rb
 - lib/logging/appenders/io.rb
@@ -51,15 +72,18 @@ files:
 - lib/logging/logger.rb
 - lib/logging/repository.rb
 - lib/logging/root_logger.rb
-- tasks/doc.rake
-- tasks/gem.rake
-- tasks/manifest.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/test.rake
-- tasks/website.rake
+- lib/logging/utils.rb
+- rakelib/doc.rake
+- rakelib/gem.rake
+- rakelib/manifest.rake
+- rakelib/rubyforge.rake
+- rakelib/setup.rb
+- rakelib/test.rake
+- rakelib/website.rake
 - test/appenders/test_console.rb
+- test/appenders/test_email.rb
 - test/appenders/test_file.rb
+- test/appenders/test_growl.rb
 - test/appenders/test_io.rb
 - test/appenders/test_rolling_file.rb
 - test/appenders/test_syslog.rb
@@ -75,9 +99,39 @@ files:
 - test/test_logging.rb
 - test/test_repository.rb
 - test/test_root_logger.rb
+- test/test_utils.rb
+has_rdoc: true
+homepage: http://logging.rubyforge.org/
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: logging
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A flexible and extendable logging library for Ruby
 test_files: 
 - test/appenders/test_console.rb
+- test/appenders/test_email.rb
 - test/appenders/test_file.rb
+- test/appenders/test_growl.rb
 - test/appenders/test_io.rb
 - test/appenders/test_rolling_file.rb
 - test/appenders/test_syslog.rb
@@ -91,25 +145,4 @@ test_files:
 - test/test_logging.rb
 - test/test_repository.rb
 - test/test_root_logger.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- README.txt
-executables: []
-
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.3
-    version: 
+- test/test_utils.rb