mini_logger 0.4.1 → 0.4.2

data/lib/mini_logger.rb

@@ -6,11 +6,11 @@ module MiniLogger
   extend self
     
   LLM = {
-    :debug  =>Logger::DEBUG,
-    :info   =>Logger::INFO,
-    :warn   =>Logger::WARN,
-    :error  =>Logger::ERROR,
-    :faltal =>Logger::FATAL
+    :debug  =>::Logger::DEBUG,
+    :info   =>::Logger::INFO,
+    :warn   =>::Logger::WARN,
+    :error  =>::Logger::ERROR,
+    :faltal =>::Logger::FATAL
   }
   
   DEBUG = :debug
@@ -19,26 +19,35 @@ module MiniLogger
   ERROR = :error
   FATAL = :fatal
   
+  DEFAULT_LOG_CHANNEL = STDERR
+  DEFAULT_LOG_LEVEL   = DEBUG
+  VALID_METHODS       = [ :debug, :info, :warn, :error, :fatal, :debug?, :info?, :warn?, :error? ]
+  
   private
   def validate_log_level?( log_level )
+    
     LLM.has_key?( log_level )
   end
   
-  def get_log_level( log_level )
-    LLM[log_level]
-  end
-  
-  
+
   public
-  def configure( atts = { } )
+  def configure( attributes = { } )
+    
+    log_channel = attributes[:log_channel] ? attributes[:log_channel] : DEFAULT_LOG_CHANNEL
+    log_level   = attributes[:log_level] ? attributes[:log_level].to_sym : DEFAULT_LOG_LEVEL
+    
+    raise ArgumentError.new( "Invalid log level: #{log_level}" ) unless( validate_log_level?( log_level ) )  
+
+    @logger       = Logger.new( log_channel )
+    @logger.level = LLM[log_level]
     
-    @logger       = Logger.new( atts[:log_channel] ? atts[:log_channel] : STDERR )
-    @logger.level = validate_log_level?( atts[:log_level] ) ? get_log_level( atts[:log_level] ) : Logger::INFO
     self
   end
 
-  def level( ) 
+  def level( )
+    
     @logger || configure
+    
     @logger.level
   end  
   
@@ -47,18 +56,19 @@ module MiniLogger
     @logger || configure
     
     if( validate_log_level?( new_log_level ) )
-      @logger.level = get_log_level( new_log_level )
-    else  
+      
+      @logger.level = LLM[new_log_level]
+    else
+      
       raise ArgumentError.new( "Bad log level: #{new_log_level}" )
     end
   end
   
+  
   def method_missing( method, *arguments, &block )
 
     @logger || configure
-
-    if( [ :debug, :debug?, :info, :info?, :warn, :warn?, :error, :error?, :fatal ].include?( method ) )
-      @logger.send( method, *arguments, &block )
-    end
+    
+    @logger.send( method, *arguments, &block ) if( VALID_METHODS.include?( method ) )
   end  
 end

data/lib/version.rb

@@ -1,12 +1,10 @@
-module MiniLogger
-  module Version
-    INFO = {
-      :major =>0,
-      :minor =>4,
-      :patch =>1
-    }
+module Version
+  INFO = {
+    :major =>0,
+    :minor =>4,
+    :patch =>2
+  }
 
-    NAME   = 'mini_logger'
-    NUMBER = INFO.values.join( '.' )
-  end
-end
+  NAME   = 'mini_logger'
+  NUMBER = [INFO[:major], INFO[:minor], INFO[:patch]].join( '.' )
+end

data/test/unit/test_mini_logger.rb

@@ -0,0 +1,133 @@
+$:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
+
+
+require 'rubygems'
+require 'shoulda'
+require 'config_context'
+require 'file/tail'
+require 'mini_logger'
+
+
+class TestMiniLogger < Test::Unit::TestCase
+  
+  context "A default logger" do
+
+    setup do
+      @dl = MiniLogger.configure()
+    end
+    
+    should "create a logger in debug level" do
+      assert( @dl.debug? )
+    end
+  end
+
+  
+  context "A bad configured logger" do
+
+    should "raise and ArgumentError" do
+      
+      bad_config_file = File.join( File.dirname( __FILE__ ), %w[.. fixtures bad_test_settings.yml] )
+      
+      assert_raises( ArgumentError ) { MiniLogger.configure( ConfigContext.load( bad_config_file ) ) }
+      assert_raises( ArgumentError ) { MiniLogger.configure( :log_level=>"bad_log_level" ) }
+    end
+  end
+  
+  
+  context "A well configured logger" do
+    
+    setup do
+      
+      config_file  = File.join( File.dirname( __FILE__ ), %w[.. fixtures test_settings.yml] )
+      @mld         = MiniLogger.configure( ConfigContext.load( config_file ) )
+
+      class MyLogFile < File
+        
+        include File::Tail
+      end
+      
+      @log_file          = MyLogFile.new( ConfigContext.log_channel )
+      @log_file.interval = 10
+      
+      @log_file.backward( 1 )
+      @log_file.tail(1) #Skip file header
+    end
+    
+    teardown do    
+      File.delete( ConfigContext.log_channel ) if File.exist?( ConfigContext.log_channel )
+    end
+    
+    should "write >= debug message" do
+      
+      assert( @mld.debug( "debug" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^D\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)DEBUG \-\- : debug/ )
+      assert( @mld.info( "info" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^I\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)INFO \-\- : info/ )
+      assert( @mld.warn( "warn" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)WARN \-\- : warn/ )
+      assert( @mld.error( "error" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)ERROR \-\- : error/ )
+      assert( @mld.fatal( "fatal" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)FATAL \-\- : fatal/ )
+    end
+
+    should "write >= info message" do
+      
+      assert( @mld.info( "info" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^I\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)INFO \-\- : info/ )
+      assert( @mld.warn( "warn" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)WARN \-\- : warn/ )
+      assert( @mld.error( "error" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)ERROR \-\- : error/ )
+      assert( @mld.fatal( "fatal" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)FATAL \-\- : fatal/ )
+    end
+      
+    should "write >= warn message" do
+      
+      assert( @mld.warn( "warn" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)WARN \-\- : warn/ )
+      assert( @mld.error( "error" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)ERROR \-\- : error/ )
+      assert( @mld.fatal( "fatal" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)FATAL \-\- : fatal/ )
+    end
+      
+    should "write >= error message" do
+      
+      assert( @mld.error( "error" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)ERROR \-\- : error/ )
+      assert( @mld.fatal( "fatal" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)FATAL \-\- : fatal/ )
+    end
+      
+    should "write a fatal message" do
+      
+      assert( @mld.fatal( "fatal" ) )
+      assert( @log_file.tail( 1 )[0] =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #(.+)\](\s*)FATAL \-\- : fatal/ )
+    end
+
+    should "be in DEBUG level" do
+      
+      assert( @mld.debug? )
+    end
+
+    should "change log level to INFO" do
+      
+      @mld.level = MiniLogger::INFO 
+      assert( @mld.info? )
+    end
+
+    should "change log level to WARN" do
+      
+      @mld.level = MiniLogger::WARN 
+      assert( @mld.warn? )
+    end
+
+    should "change log level to ERROR" do
+      
+      @mld.level = MiniLogger::ERROR
+      assert( @mld.error? )
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: mini_logger
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Javier Juarez
@@ -10,11 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
-default_executable: 
-dependencies: []
-
-description: My tiny logger
+date: 2011-04-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+description: A minimal standard Logger wrapper perfect for minimal CLI applications
 email: javier.juarez@gmail.com
 executables: []
 
@@ -25,9 +34,8 @@ extra_rdoc_files:
 files: 
 - lib/mini_logger.rb
 - lib/version.rb
-- test/test_mini_logger.rb
+- test/unit/test_mini_logger.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jjuarez/mini_logger
 licenses: 
 - MIT
@@ -51,9 +59,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://github.com/jjuarez/mini_logger
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: A real simple logger utility
+summary: A tiny logger utility for small applications
 test_files: 
-- test/test_mini_logger.rb
+- test/unit/test_mini_logger.rb

data/test/test_mini_logger.rb

@@ -1,70 +0,0 @@
-$:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
-
-
-require 'rubygems'
-require 'shoulda'
-require 'mini_logger'
-
-
-class TestMiniLogger < Test::Unit::TestCase
-  
-  context "A Default Logger" do
-    
-    setup do
-      @mini_logger_debug = MiniLogger.configure( :log_channel=>"/dev/null", :log_level=>MiniLogger::DEBUG )
-    end
-    
-    should "a info log level" do
-      assert( MiniLogger.configure.info? )
-    end
-    
-    should "write a debug line" do
-      assert( @mini_logger_debug.debug( "debug" ) )
-    end  
-
-    should "write a info line" do
-      assert( @mini_logger_debug.info( "info" ) )
-    end  
-  
-    should "write a warn line" do
-      assert( @mini_logger_debug.warn( "warn" ) )
-    end  
-  
-    should "write a error line" do
-      assert( @mini_logger_debug.error( "error" ) )
-    end  
-  
-    should "write a fatal line" do
-      assert( @mini_logger_debug.fatal( "fatal" ) )
-    end
-
-    should "change log level to ERROR" do
-      
-      @mini_logger_debug.level = MiniLogger::ERROR
-      assert( @mini_logger_debug.error? )
-    end
-
-    should "change log level to WARN" do
-      
-      @mini_logger_debug.level = MiniLogger::WARN 
-      assert( @mini_logger_debug.warn? )
-    end
-
-    should "change log level to INFO" do
-      
-      @mini_logger_debug.level = MiniLogger::INFO 
-      assert( @mini_logger_debug.info? )
-    end
-
-    should "change log level to DEBUG" do
-      
-      @mini_logger_debug.level = MiniLogger::DEBUG 
-      assert( @mini_logger_debug.debug? )
-    end
-
-    should "raise an ArgumentError" do
-      
-      assert_raise( ArgumentError ) { @mini_logger_debug.level = "bad value" }
-    end
-  end
-end