logging 1.4.0 → 1.4.1

data/History.txt

@@ -1,3 +1,8 @@
+== 1.4.1 / 2010-03-23
+
+Bug Fixes
+- flock(LOCK_UN) was causing errors on windows [issue 4]
+
 == 1.4.0 / 2010-03-16
 
 Minor Enhancements

data/lib/logging.rb

@@ -353,16 +353,34 @@ module Logging
     # they will be joined to the end of the libray path using
     # <tt>File.join</tt>.
     #
-    def libpath( *args )
-      args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    def libpath( *args, &block )
+      rv = args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+      if block
+        begin
+          $LOAD_PATH.unshift LIBPATH
+          rv = block.call
+        ensure
+          $LOAD_PATH.shift
+        end
+      end
+      return rv
     end
 
     # Returns the lpath for the module. If any arguments are given,
     # they will be joined to the end of the path using
     # <tt>File.join</tt>.
     #
-    def path( *args )
-      args.empty? ? PATH : ::File.join(PATH, args.flatten)
+    def path( *args, &block )
+      rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
+      if block
+        begin
+          $LOAD_PATH.unshift PATH
+          rv = block.call
+        ensure
+          $LOAD_PATH.shift
+        end
+      end
+      return rv
     end
 
     # call-seq:
@@ -482,18 +500,20 @@ module Logging
 end  # module Logging
 
 
-require Logging.libpath(%w[logging appender])
-require Logging.libpath(%w[logging layout])
-require Logging.libpath(%w[logging log_event])
-require Logging.libpath(%w[logging logger])
-require Logging.libpath(%w[logging repository])
-require Logging.libpath(%w[logging root_logger])
-require Logging.libpath(%w[logging stats])
-require Logging.libpath(%w[logging appenders])
-require Logging.libpath(%w[logging layouts])
-
-require Logging.libpath(%w[logging config configurator])
-require Logging.libpath(%w[logging config yaml_configurator])
+Logging.libpath {
+  require 'logging/appender'
+  require 'logging/layout'
+  require 'logging/log_event'
+  require 'logging/logger'
+  require 'logging/repository'
+  require 'logging/root_logger'
+  require 'logging/stats'
+  require 'logging/appenders'
+  require 'logging/layouts'
+
+  require 'logging/config/configurator'
+  require 'logging/config/yaml_configurator'
+}
 
 
 # This exit handler will close all the appenders that exist in the system.

data/lib/logging/appenders.rb

@@ -122,10 +122,16 @@ module Logging
   end  # module Appenders
 end  # module Logging
 
-
-%w[buffering io console email file growl rolling_file string_io syslog].
-each do |fn|
-  require ::Logging.libpath('logging', 'appenders', fn)
-end
+Logging.libpath {
+  require 'logging/appenders/buffering'
+  require 'logging/appenders/io'
+  require 'logging/appenders/console'
+  require 'logging/appenders/email'
+  require 'logging/appenders/file'
+  require 'logging/appenders/growl'
+  require 'logging/appenders/rolling_file'
+  require 'logging/appenders/string_io'
+  require 'logging/appenders/syslog'
+}
 
 # EOF

data/lib/logging/layouts.rb

@@ -38,10 +38,10 @@ module Logging
   end  # module Layouts
 end  # module Logging
 
-
-%w[basic parseable pattern].
-each do |fn|
-  require ::Logging.libpath('logging', 'layouts', fn)
-end
+Logging.libpath {
+  require 'logging/layouts/basic'
+  require 'logging/layouts/parseable'
+  require 'logging/layouts/pattern'
+}
 
 # EOF

data/lib/logging/utils.rb

@@ -162,6 +162,14 @@ class File
     flock LOCK_UN
   end
 
+  # :stopdoc:
+  if %r/mswin|mingw/ =~ RUBY_PLATFORM
+    undef :flock?, :flock_sh
+    def flock?() yield; end
+    def flock_sh() yield; end
+  end
+  # :startdoc:
+
 end
 
 # --------------------------------------------------------------------------

data/version.txt

@@ -1 +1 @@
-1.4.0
+1.4.1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -06:00
+date: 2010-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency