madvertise-logging 0.4.1 → 0.4.2

data/lib/madvertise/logging/improved_logger.rb

@@ -38,9 +38,9 @@ module Madvertise
         attr_accessor :silencer
       end
 
-      def initialize(logfile = nil, progname = nil)
-        @progname = progname || File.basename($0)
-        self.logger = logfile
+      def initialize(backend = STDERR, progname = nil)
+        self.progname = progname || File.basename($0)
+        self.logger = backend
       end
 
       # Get the backend logger.
@@ -52,21 +52,19 @@ module Madvertise
 
       # Set a different backend.
       #
-      # @param [Symbol, String, Logger] value  The new logger backend. Either a
-      #   Logger object, a String containing the logfile path or a Symbol to
+      # @param [Symbol, String, IO, Logger] value  The new logger backend. Either a
+      #   Logger object, an IO object, a String containing the logfile path or a Symbol to
       #   create a default backend for :syslog or :buffer
       # @return [Logger] The newly created backend logger object.
       def logger=(value)
-        @logger.close rescue nil
-        @logfile = value.is_a?(String) ? value : nil
-        @backend = value.is_a?(Symbol) ? value : :logger
-        @logger = value.is_a?(Logger) ? value : create_backend
+        @backend = value
+        create_backend
       end
 
       # Close any connections/descriptors that may have been opened by the
       # current backend.
       def close
-        logger.close rescue nil
+        @logger.close rescue nil
         @logger = nil
       end
 
@@ -200,30 +198,55 @@ module Madvertise
       end
 
       def create_backend
+        self.close
+
         case @backend
-        when :buffer
-          create_buffering_backend
         when :syslog
           create_syslog_backend
+        when :buffer
+          create_buffer_backend
+        when String
+          create_file_backend
+        when IO
+          create_io_backend
+        when Logger
+          @backend
         else
-          create_standard_backend
+          raise "unknown backend: #{@backend.inspect}"
+        end
+      end
+
+      def create_syslog_backend
+        begin
+          require 'syslogger'
+          Syslogger.new(progname, Syslog::LOG_PID, Syslog::LOG_LOCAL1)
+        rescue LoadError
+          self.logger = $stderr
+          error("Couldn't load syslogger gem, reverting to STDERR for logging")
         end
       end
 
-      def create_buffering_backend
+      def create_buffer_backend
         @logfile = StringIO.new
         create_logger
       end
 
-      def create_standard_backend
+      def create_io_backend
+        @logfile = @backend
+        create_logger
+      end
+
+      def create_file_backend
+        @logfile = @backend
+
         begin
           FileUtils.mkdir_p(File.dirname(@logfile))
         rescue
-          $stderr.puts "#{@logfile} not writable, using stderr for logging" if @logfile
-          @logfile = $stderr
+          self.logger = $stderr
+          error("#{@logfile} not writable, using STDERR for logging")
+        else
+          create_logger
         end
-
-        create_logger
       end
 
       def create_logger
@@ -233,16 +256,6 @@ module Madvertise
         end
       end
 
-      def create_syslog_backend
-        begin
-          require 'syslogger'
-          Syslogger.new(progname, Syslog::LOG_PID, Syslog::LOG_LOCAL1)
-        rescue LoadError
-          self.logger = :logger
-          self.error("Couldn't load syslogger gem, reverting to standard logger")
-        end
-      end
-
       ##
       # The Formatter class is responsible for formatting log messages. The
       # default format is:

data/lib/madvertise/logging/version.rb

@@ -1,6 +1,6 @@
 module Madvertise
   module Logging
     # @private
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/spec/improved_logger_spec.rb

@@ -178,7 +178,7 @@ describe ImprovedLogger do
   end
 
   it "should fall back to stderr if logfile is not writable" do
-    $stderr.should_receive(:puts).with(/not writable.*stderr/)
+    $stderr.should_receive(:write).with(/not writable.*STDERR/)
 
     @logfile = "/not/writable/spec.log"
     @logger = ImprovedLogger.new(@logfile)
@@ -192,8 +192,7 @@ describe ImprovedLogger do
     syslogger_paths = $:.select { |p| p.match(/gems\/.*syslogger-/) }
     $:.replace($: - syslogger_paths)
 
-    $stderr.should_receive(:puts).with(/using stderr for logging/)
-    $stderr.should_receive(:write).with(/reverting to standard logger/)
+    $stderr.should_receive(:write).with(/reverting to STDERR/)
     @logger = ImprovedLogger.new(:syslog)
     @logger.logger.should be_instance_of(Logger)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-logging
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Advanced logging classes with buffer backend, transactions, multi logger,
   etc
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3468536438551765291
+      hash: -2521361738658986619
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3468536438551765291
+      hash: -2521361738658986619
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17