logging 0.9.7 → 0.9.8

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.8 / 2009-04-11
+
+2 minor enhancements
+  - Adding a to_s method to the StringIo appender's StringIO object
+  - Added a Spec::LoggingHelper class that will capture log messages
+    when using rspec style testing
+
 == 0.9.7 / 2009-03-17
 
 1 minor enhancement

data/Rakefile

@@ -25,7 +25,7 @@ PROJ.version = Logging::VERSION
 PROJ.readme_file = 'README.rdoc'
 PROJ.ignore_file = '.gitignore'
 
-PROJ.exclude << %w[^tags$]
+PROJ.exclude << %w[^tags$ logging.gemspec]
 PROJ.rdoc.exclude << '^data'
 #PROJ.rdoc.dir = 'doc/rdoc'
 #PROJ.rdoc.remote_dir = 'rdoc'

data/lib/logging.rb

@@ -13,7 +13,7 @@ begin require 'fastthread'; rescue LoadError; end
 module Logging
 
   # :stopdoc:
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
   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
@@ -394,6 +394,7 @@ Logging.require_all_libs_relative_to(__FILE__, 'logging/config')
 # or e-mail servers, etc.
 #
 at_exit {
+  Logging.log_internal {'at_exit hook called - closing all appenders'}
   Logging::Appender.instance_variable_get(:@appenders).values.each do |ap|
     ap.close
   end

data/lib/logging/appenders/string_io.rb

@@ -19,26 +19,11 @@ module Logging::Appenders
     #
     def initialize( name, opts = {} )
       @sio = StringIO.new
+      @sio.extend IoToS
       super(name, @sio, opts)
       clear
     end
 
-    # Read a single line of text from the internal StringIO instance. +nil+
-    # is returned if the StringIO buffer is empty.
-    #
-    def readline
-      sync {
-        begin
-          @sio.seek @pos
-          line = @sio.readline
-          @pos = @sio.tell
-          line
-        rescue EOFError
-          nil
-        end
-      }
-    end
-
     # Clears the internal StringIO instance. All log messages are removed
     # from the buffer.
     #
@@ -51,6 +36,34 @@ module Logging::Appenders
     end
     alias :reset :clear
 
+    %w[read readline readlines].each do|m|
+      class_eval <<-CODE
+        def #{m}( *args )
+          sync {
+            begin
+              @sio.seek @pos
+              rv = @sio.#{m}(*args)
+              @pos = @sio.tell
+              rv
+            rescue EOFError
+              nil
+            end
+          }
+        end
+      CODE
+    end
+
+    # :stopdoc:
+    module IoToS
+      def to_s
+        seek 0
+        str = read
+        seek 0
+        return str
+      end
+    end
+    # :startdoc:
+
   end  # class StringIo
 end  # module Logging::Appenders
 

data/lib/logging/config/configurator.rb

@@ -82,7 +82,7 @@ module Logging::Config
         l.additive  = config[:additive] if l.respond_to? :additive= 
         l.trace     = config[:trace]
         l.appenders = Array(config[:appenders]).
-                            map {|name| ::Logging::Appender[name]}
+                            map {|nm| ::Logging::Appender[nm]}
       end
     end
 

data/lib/spec/logging_helper.rb

@@ -0,0 +1,34 @@
+
+module Spec
+  module LoggingHelper
+
+    # Capture log messages from the Logging framework and make them
+    # available via a @log_output instance variable. The @log_output
+    # supports a readline method to access the log messags.
+    #
+    def capture_log_messages( opts = {} )
+      from = opts.getopt(:from, 'root')
+      to = opts.getopt(:to, '__rspec__')
+      exclusive = opts.getopt(:exclusive, true)
+
+      appender = Logging::Appender[to] || Logging::Appenders::StringIo.new(to)
+      logger = Logging::Logger[from]
+      if exclusive
+        logger.appenders = appender
+      else
+        logger.add_appenders(appender)
+      end
+
+      before(:all) do
+        @log_output = Logging::Appender[to]
+      end
+
+      before(:each) do
+        @log_output.reset
+      end
+    end
+
+  end  # module LoggingHelper
+end  # module Spec
+
+# EOF

data/tasks/setup.rb

@@ -147,7 +147,7 @@ RCOV = "#{RUBY} -S rcov"
 RDOC = "#{RUBY} -S rdoc"
 GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/test/test_logger.rb

@@ -645,6 +645,7 @@ module TestLogging
       log_d = ::Logging::Logger['A-logger::D-logger']
 
       sio = StringIO.new
+      sio.extend ::Logging::Appenders::StringIo::IoToS
 
       log_a._dump_configuration( sio )
       assert_equal(
@@ -699,13 +700,4 @@ module TestLogging
   end  # class TestLogger
 end  # module TestLogging
 
-class StringIO
-  def to_s
-    seek 0
-    str = read
-    seek 0
-    return str
-  end
-end
-
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-17 00:00:00 -06:00
+date: 2009-04-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.2
+        version: 2.5.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
@@ -82,7 +82,7 @@ files:
 - lib/logging/root_logger.rb
 - lib/logging/stats.rb
 - lib/logging/utils.rb
-- logging.gemspec
+- lib/spec/logging_helper.rb
 - tasks/ann.rake
 - tasks/bones.rake
 - tasks/gem.rake
@@ -95,6 +95,7 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
+- tasks/zentest.rake
 - test/appenders/test_buffered_io.rb
 - test/appenders/test_console.rb
 - test/appenders/test_email.rb

data/logging.gemspec

@@ -1,41 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{logging}
-  s.version = "0.9.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Pease"]
-  s.date = %q{2009-03-17}
-  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/string_io.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"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{logging}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{A flexible and extendable logging library for Ruby}
-  s.test_files = ["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/config/test_configurator.rb", "test/config/test_yaml_configurator.rb", "test/layouts/test_basic.rb", "test/layouts/test_pattern.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"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    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<lockfile>, [">= 1.4.3"])
-      s.add_development_dependency(%q<bones>, [">= 2.4.2"])
-    else
-      s.add_dependency(%q<flexmock>, [">= 0.8.2"])
-      s.add_dependency(%q<lockfile>, [">= 1.4.3"])
-      s.add_dependency(%q<bones>, [">= 2.4.2"])
-    end
-  else
-    s.add_dependency(%q<flexmock>, [">= 0.8.2"])
-    s.add_dependency(%q<lockfile>, [">= 1.4.3"])
-    s.add_dependency(%q<bones>, [">= 2.4.2"])
-  end
-end