logging 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.6 / 2009-02-02
+
+2 minor enhancements
+  - Ruby 1.9.1 compatability
+  - JRuby 1.1.5 compatability
+
 == 0.9.5 / 2009-01-25
 
 2 minor enhancements

data/Rakefile

@@ -34,6 +34,7 @@ PROJ.rdoc.remote_dir = ''
 
 PROJ.ann.email[:server] = 'smtp.gmail.com'
 PROJ.ann.email[:port] = 587
+PROJ.ann.email[:from] = 'Tim Pease'
 
 depend_on 'flexmock'
 depend_on 'lockfile'

data/lib/logging.rb

@@ -17,7 +17,7 @@ begin require 'fastthread'; rescue LoadError; end
 module Logging
 
   # :stopdoc:
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM

data/lib/logging/appenders/growl.rb

@@ -36,7 +36,7 @@ module Logging::Appenders
       setup_coalescing if @coalesce
 
       # make sure the growlnotify command can be called
-      unless system('growlnotify -v 2>&1 > /dev/null')
+      unless system('growlnotify -v >> /dev/null 2>&1')
         self.level = :off
         ::Logging.log_internal {'growl notifications have been disabled'}
       end

data/lib/logging/config/configurator.rb

@@ -133,7 +133,7 @@ module Logging::Config
       alias :__instance_eval :instance_eval
 
       instance_methods.each do |m|
-        undef_method m unless m[%r/^__/]
+        undef_method m unless m[%r/^(__|object_id)/]
       end
 
       def self.process( &block )

data/lib/logging/log_event.rb

@@ -13,6 +13,8 @@ module Logging
     # * $2 == line number
     # * $3 == method name (might be nil)
     CALLER_RGXP = %r/([\.\/\(\)\w]+):(\d+)(?::in `(\w+)')?/o
+
+    CALLER_INDEX = RUBY_PLATFORM[%r/^java/i] ? 1 : 2
     # :startdoc:
 
     # call-seq:
@@ -30,7 +32,7 @@ module Logging
       @file = @line = @method = ''
 
       if trace
-        t = Kernel.caller[2]
+        t = Kernel.caller[CALLER_INDEX]
         return if t.nil?
 
         m = CALLER_RGXP.match(t)

data/lib/logging/utils.rb

@@ -81,7 +81,7 @@ class Module
   # anonymous module, the string 'anonymous' will be returned.
   #
   def logger_name
-    return name unless name.empty?
+    return name unless name.nil? or name.empty?
 
     # check if this is a metaclass (or eigenclass)
     if ancestors.include? Class

data/logging.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{logging}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Pease"]
-  s.date = %q{2009-01-25}
+  s.date = %q{2009-02-01}
   s.description = %q{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.}
   s.email = %q{tim.pease@gmail.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "data/bad_logging_1.rb", "data/bad_logging_2.rb", "data/logging.rb", "data/logging.yaml", "data/simple_logging.rb", "lib/logging.rb", "lib/logging/appender.rb", "lib/logging/appenders/buffering.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", "lib/logging/appenders/rolling_file.rb", "lib/logging/appenders/syslog.rb", "lib/logging/config/configurator.rb", "lib/logging/config/yaml_configurator.rb", "lib/logging/layout.rb", "lib/logging/layouts/basic.rb", "lib/logging/layouts/pattern.rb", "lib/logging/log_event.rb", "lib/logging/logger.rb", "lib/logging/repository.rb", "lib/logging/root_logger.rb", "lib/logging/stats.rb", "lib/logging/utils.rb", "test/appenders/test_buffered_io.rb", "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", "test/benchmark.rb", "test/config/test_configurator.rb", "test/config/test_yaml_configurator.rb", "test/layouts/test_basic.rb", "test/layouts/test_pattern.rb", "test/setup.rb", "test/test_appender.rb", "test/test_layout.rb", "test/test_log_event.rb", "test/test_logger.rb", "test/test_logging.rb", "test/test_repository.rb", "test/test_root_logger.rb", "test/test_stats.rb", "test/test_utils.rb"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "data/bad_logging_1.rb", "data/bad_logging_2.rb", "data/logging.rb", "data/logging.yaml", "data/simple_logging.rb", "lib/logging.rb", "lib/logging/appender.rb", "lib/logging/appenders/buffering.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", "lib/logging/appenders/rolling_file.rb", "lib/logging/appenders/syslog.rb", "lib/logging/config/configurator.rb", "lib/logging/config/yaml_configurator.rb", "lib/logging/layout.rb", "lib/logging/layouts/basic.rb", "lib/logging/layouts/pattern.rb", "lib/logging/log_event.rb", "lib/logging/logger.rb", "lib/logging/repository.rb", "lib/logging/root_logger.rb", "lib/logging/stats.rb", "lib/logging/utils.rb", "logging.gemspec", "test/appenders/test_buffered_io.rb", "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", "test/benchmark.rb", "test/config/test_configurator.rb", "test/config/test_yaml_configurator.rb", "test/layouts/test_basic.rb", "test/layouts/test_pattern.rb", "test/setup.rb", "test/test_appender.rb", "test/test_layout.rb", "test/test_log_event.rb", "test/test_logger.rb", "test/test_logging.rb", "test/test_repository.rb", "test/test_root_logger.rb", "test/test_stats.rb", "test/test_utils.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://logging.rubyforge.org/}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -25,17 +25,17 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<flexmock>, [">= 0.8.2"])
+      s.add_runtime_dependency(%q<flexmock>, [">= 0.8.3"])
       s.add_runtime_dependency(%q<lockfile>, [">= 1.4.3"])
-      s.add_development_dependency(%q<bones>, [">= 2.3.0"])
+      s.add_development_dependency(%q<bones>, [">= 2.3.1"])
     else
-      s.add_dependency(%q<flexmock>, [">= 0.8.2"])
+      s.add_dependency(%q<flexmock>, [">= 0.8.3"])
       s.add_dependency(%q<lockfile>, [">= 1.4.3"])
-      s.add_dependency(%q<bones>, [">= 2.3.0"])
+      s.add_dependency(%q<bones>, [">= 2.3.1"])
     end
   else
-    s.add_dependency(%q<flexmock>, [">= 0.8.2"])
+    s.add_dependency(%q<flexmock>, [">= 0.8.3"])
     s.add_dependency(%q<lockfile>, [">= 1.4.3"])
-    s.add_dependency(%q<bones>, [">= 2.3.0"])
+    s.add_dependency(%q<bones>, [">= 2.3.1"])
   end
 end

data/tasks/setup.rb

@@ -262,12 +262,16 @@ def manifest
  
   # process the ignore file and add the items there to the exclude list
   if test(?f, PROJ.ignore_file)
-    ary = File.readlines(PROJ.ignore_file).map do |line|
+    ary = []
+    File.readlines(PROJ.ignore_file).each do |line|
       next if line =~ comment
-      line.chomp.strip
+      line.chomp!
+      line.strip!
+      next if line.nil? or line.empty?
+
+      glob = line =~ %r/\*\./ ? File.join('**', line) : line
+      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
     end
-    ary.compact!
-    ary.delete ''
     exclude.concat ary
   end
 

data/test/appenders/test_syslog.rb

@@ -14,6 +14,9 @@ module TestAppenders
       super
       ::Logging.init
       @levels = ::Logging::LEVELS
+      @logopt = defined?(::Syslog::LOG_NDELAY) ?
+                    (::Syslog::LOG_PERROR | ::Syslog::LOG_NDELAY) :
+                    (::Syslog::LOG_PERROR)
     end
 
     def test_append
@@ -148,7 +151,7 @@ module TestAppenders
     def test_initialize_map
       appender = ::Logging::Appenders::Syslog.new(
         'syslog_test',
-        :logopt => ::Syslog::LOG_PERROR | ::Syslog::LOG_NDELAY,
+        :logopt => @logopt,
         :map => {
           :debug  =>  :log_debug,
           :info   =>  :log_info,
@@ -171,7 +174,7 @@ module TestAppenders
       layout = ::Logging::Layouts::Pattern.new(:pattern => '%5l  %c : %m')
       ::Logging::Appenders::Syslog.new(
           'syslog_test',
-          :logopt => ::Syslog::LOG_PERROR | ::Syslog::LOG_NDELAY,
+          :logopt => @logopt,
           :facility => ::Syslog::LOG_USER,
           :layout => layout
       )

data/test/setup.rb

@@ -45,7 +45,12 @@ module LoggingTestCase
         @__instance__ = nil
         class << self
           nonce = class << Singleton; self; end
-          define_method(:instance, nonce::FirstInstanceCall)
+          if defined?(nonce::FirstInstanceCall)
+            define_method(:instance, nonce::FirstInstanceCall)
+          else
+            remove_method(:instance)
+            Singleton.__init__(::Logging::Repository)
+          end
         end
       end
     end

data/test/test_utils.rb

@@ -87,24 +87,26 @@ module TestLogging
     def test_logger_name
       assert_equal 'Array', Array.logger_name
 
+      # some lines are commented out for compatibility with ruby 1.9
+
       c = Class.new(Array)
-      assert_equal '', c.name
+#     assert_equal '', c.name
       assert_equal 'Array', c.logger_name
 
       meta = class << Array; self; end
-      assert_equal '', meta.name
+#     assert_equal '', meta.name
       assert_equal 'Array', meta.logger_name
 
       m = Module.new
-      assert_equal '', m.name
+#     assert_equal '', m.name
       assert_equal 'anonymous', m.logger_name
 
       c = Class.new(::Logging::Logger)
-      assert_equal '', c.name
+#     assert_equal '', c.name
       assert_equal 'Logging::Logger', c.logger_name
       
       meta = class << ::Logging::Logger; self; end
-      assert_equal '', meta.name
+#     assert_equal '', meta.name
       assert_equal 'Logging::Logger', meta.logger_name
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -07:00
+date: 2009-02-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.4.0
     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