TwP-logging 1.2.0 → 1.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.2 / 2009-08-18
+
+1 minor enhancement
+  - Created a reset method for the logging framework
+
 == 1.2.1 / 2009-08-14
 
 1 bug fix

data/lib/logging.rb

@@ -22,7 +22,7 @@ module Logging
   extend LittlePlugger
 
   # :stopdoc:
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   LEVELS = {}
@@ -461,6 +461,17 @@ module Logging
       log_internal {'shutdown called - closing all appenders'}
       ::Logging::Appenders.each {|appender| appender.close}
     end
+
+    # Reset the logging framework to it's uninitialized state
+    def reset
+      ::Logging::Repository.reset
+      ::Logging::Appenders.reset
+      LEVELS.clear
+      LNAMES.clear
+      remove_instance_variable :@backtrace if defined? @backtrace
+      remove_const :MAX_LEVEL_LENGTH if const_defined? :MAX_LEVEL_LENGTH
+      remove_const :OBJ_FORMAT if const_defined? :OBJ_FORMAT
+    end
     # :startdoc:
   end
 end  # module Logging

data/lib/logging/appenders.rb

@@ -102,9 +102,20 @@ module Logging
     #
     def each( &block )
       @appenders.values.each(&block)
-      nil
+      return nil
     end
 
+    # :stopdoc:
+    def reset
+      @appenders.values.each {|appender|
+        next if appender.nil?
+        appender.close
+      }
+      @appenders.clear
+      return nil
+    end
+    # :startdoc:
+
     extend self
     @appenders = Hash.new
 

data/lib/logging/repository.rb

@@ -204,6 +204,28 @@ module Logging
       end
     end
 
+    # :stopdoc:
+    def self.reset
+      if defined?(@singleton__instance__)
+        @singleton__mutex__.synchronize {
+          @singleton__instance__ = nil
+        }
+      else
+        @__instance__ = nil
+        class << self
+          nonce = class << Singleton; self; end
+          if defined?(nonce::FirstInstanceCall)
+            define_method(:instance, nonce::FirstInstanceCall)
+          else
+            remove_method(:instance)
+            Singleton.__init__(::Logging::Repository)
+          end
+        end
+      end
+      return nil
+    end
+    # :startdoc:
+
   end  # class Repository
 end  # module Logging
 

data/test/setup.rb

@@ -26,42 +26,13 @@ module LoggingTestCase
 
   def setup
     super
-
+    Logging.reset
     FileUtils.rm_rf TMP
     FileUtils.mkdir TMP
-
-    ::Logging.module_eval do
-      ::Logging::LEVELS.clear
-      ::Logging::LNAMES.clear
-      remove_const :MAX_LEVEL_LENGTH if const_defined? :MAX_LEVEL_LENGTH
-      remove_const :OBJ_FORMAT if const_defined? :OBJ_FORMAT
-    end
-
-    ::Logging::Repository.class_eval do
-      if defined?(@singleton__instance__)
-        @singleton__instance__ = nil
-      else
-        @__instance__ = nil
-        class << self
-          nonce = class << Singleton; self; end
-          if defined?(nonce::FirstInstanceCall)
-            define_method(:instance, nonce::FirstInstanceCall)
-          else
-            remove_method(:instance)
-            Singleton.__init__(::Logging::Repository)
-          end
-        end
-      end
-    end
   end
     
   def teardown
     super
-    ::Logging.backtrace
-    ::Logging.__send__(:remove_instance_variable, :@backtrace)
-    h = ::Logging::Appenders.instance_variable_get(:@appenders)
-    h.each_value {|a| a.close(false) unless a.nil? || a.closed?}
-    h.clear
     FileUtils.rm_rf TMP
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: TwP-logging
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency