logging 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.2 / 2009-05-05
+
+1 minor enhancement
+  - Added two new require methods to Kernel
+
 == 1.1.1 / 2009-04-30
 
 1 minor enhancement

data/lib/logging.rb

@@ -3,25 +3,17 @@
 # Used to prevent the class/module from being loaded more than once
 unless defined? Logging
 
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[logging utils]))
+
 require 'yaml'
 require 'stringio'
 require 'thread'
 
-begin
-  require 'lockfile'
-rescue LoadError
-  retry if require 'rubygems'
-  raise
-end
-
-begin
-  require 'syslog'
-  HAVE_SYSLOG = true
-rescue LoadError
-  HAVE_SYSLOG = false
-end
+HAVE_LOCKFILE = require? 'lockfile'
+HAVE_SYSLOG   = require? 'syslog'
+require? 'fastthread'
 
-begin require 'fastthread'; rescue LoadError; end
 
 # TODO: Windows Log Service appender
 
@@ -30,10 +22,9 @@ begin require 'fastthread'; rescue LoadError; end
 module Logging
 
   # :stopdoc:
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   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
   LEVELS = {}
   LNAMES = []
   # :startdoc:
@@ -466,7 +457,6 @@ module Logging
 end  # module Logging
 
 
-require Logging.libpath(%w[logging utils])
 require Logging.libpath(%w[logging appender])
 require Logging.libpath(%w[logging layout])
 require Logging.libpath(%w[logging log_event])

data/lib/logging/appenders/rolling_file.rb

@@ -71,7 +71,7 @@ module Logging::Appenders
       @keep = opts.getopt(:keep, :as => Integer)
       @size = opts.getopt(:size, :as => Integer)
 
-      @lockfile = if opts.getopt(:safe, false) and !::Logging::WIN32
+      @lockfile = if HAVE_LOCKFILE and opts.getopt(:safe, false)
         ::Lockfile.new(
             @fn + '.lck',
             :retries => 1,

data/lib/logging/utils.rb

@@ -1,4 +1,5 @@
 
+# --------------------------------------------------------------------------
 class Hash
 
   # call-seq:
@@ -40,6 +41,7 @@ class Hash
   end
 end
 
+# --------------------------------------------------------------------------
 class String
 
   # call-seq:
@@ -69,6 +71,7 @@ class String
   end
 end
 
+# --------------------------------------------------------------------------
 class Module
 
   # call-seq:
@@ -102,6 +105,80 @@ class Module
   end
 end
 
+# --------------------------------------------------------------------------
+module Kernel
+
+  # Settiing this global variable to +false+ will disable rubygems from
+  # being loaded at all.
+  $use_rubygems = true unless defined? $use_rubygems
+
+  # Setting this global variable to +true+ will cause an error message to be
+  # displayed when a library cannot be required.
+  $whiny_require = false unless defined? $whiny_require
+
+  # call-seq:
+  #    require!( string )
+  #    require!( string, gem_version )
+  #    require!( string, gem_name, gem_version )
+  #
+  # Attempt to the load the library named _string_ using the standard
+  # Kernel#require method. If the library cannot be loaded then require
+  # rubygems and retry the original require of the library.
+  #
+  # Raises a LoadError if the library cannot be loaded.
+  #
+  # If a _gem_version_ is given, then the rubygems +gem+ command is used to
+  # load the specific version of the gem. The library _string_ is used for
+  # the _gem_name_ if one is omitted.
+  #
+  def require!( string, *args )
+    return require(string) if args.empty?
+
+    name, version = *args
+    version, name = name, string if name =~ %r/^[0-9<>=~]/
+    version ||= '> 0'
+
+    gem name, version
+    require(string)
+  rescue LoadError, NoMethodError
+    retry if $use_rubygems and require('rubygems')
+    if $whiny_require
+      name ||= string
+      $stderr.puts "Required library #{string.inspect} could not be loaded."
+      $stderr.puts "Try:\tgem install #{name}"
+    end
+    raise
+  end
+
+  # call-seq:
+  #    require?( string )
+  #    require?( string, gem_version )
+  #    require?( string, gem_name, gem_version )
+  #
+  # Attempt to the load the library named _string_ using the standard
+  # Kernel#require method. If the library cannot be loaded then require
+  # rubygems and retry the original require of the library.
+  #
+  # Returns +true+ if the library was successfully loaded. Returns +false+
+  # if the library could not be loaded. This method will never raise an
+  # exception.
+  #
+  # If a _gem_version_ is given, then the rubygems +gem+ command is used to
+  # load the specific version of the gem. The library _string_ is used for
+  # the _gem_name_ if one is omitted.
+  #
+  def require?( string, *args )
+    wr, $whiny_require = $whiny_require, false
+    require!(string, *args)
+    return true
+  rescue LoadError
+    return false
+  ensure
+    $whiny_require = wr
+  end
+end  # module Kernel
+
+# --------------------------------------------------------------------------
 class ReentrantMutex < Mutex
 
   def initialize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -06:00
+date: 2009-05-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency