mini_logger 0.4.2 → 0.4.3

data/lib/mini_logger.rb

@@ -5,32 +5,39 @@ require 'logger'
 module MiniLogger
   extend self
     
-  LLM = {
-    :debug  =>::Logger::DEBUG,
-    :info   =>::Logger::INFO,
-    :warn   =>::Logger::WARN,
-    :error  =>::Logger::ERROR,
-    :faltal =>::Logger::FATAL
-  }
-  
   DEBUG = :debug
   INFO  = :info
   WARN  = :warn
   ERROR = :error
   FATAL = :fatal
+
+  LLM = {
+    :debug =>::Logger::DEBUG,
+    :info  =>::Logger::INFO,
+    :warn  =>::Logger::WARN,
+    :error =>::Logger::ERROR,
+    :fatal =>::Logger::FATAL
+  }  
+
+  RLLM = {
+    ::Logger::DEBUG => DEBUG,
+    ::Logger::INFO  => INFO,
+    ::Logger::WARN  => WARN,
+    ::Logger::ERROR => ERROR,
+    ::Logger::FATAL => FATAL
+  }  
   
   DEFAULT_LOG_CHANNEL = STDERR
   DEFAULT_LOG_LEVEL   = DEBUG
-  VALID_METHODS       = [ :debug, :info, :warn, :error, :fatal, :debug?, :info?, :warn?, :error? ]
+  VALID_METHODS       = [ :debug, :info, :warn, :error, :fatal, :debug?, :info?, :warn?, :error?, :fatal? ]
+  
   
-  private
   def validate_log_level?( log_level )
     
     LLM.has_key?( log_level )
   end
   
-
-  public
+  
   def configure( attributes = { } )
     
     log_channel = attributes[:log_channel] ? attributes[:log_channel] : DEFAULT_LOG_CHANNEL
@@ -40,16 +47,18 @@ module MiniLogger
 
     @logger       = Logger.new( log_channel )
     @logger.level = LLM[log_level]
-    
+
     self
   end
 
+
   def level( )
     
     @logger || configure
     
-    @logger.level
+    RLLM[@logger.level]
   end  
+
   
   def level=( new_log_level )
     

data/lib/version.rb

@@ -2,7 +2,7 @@ module Version
   INFO = {
     :major =>0,
     :minor =>4,
-    :patch =>2
+    :patch =>3
   }
 
   NAME   = 'mini_logger'

data/test/helpers/tail_file_helper.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'file/tail'
+
+
+class TailFileHelper
+  
+  DEFAULT_BACKWARD = 1
+  
+  def initialize( log_file_name, backward=DEFAULT_BACKWARD )
+
+    @log_file = File.new( log_file_name )
+    
+    @log_file.extend( File::Tail )
+    @log_file.backward( backward )
+    
+    # Skilp Logger file header
+    @log_file.tail( 1 )
+  end
+  
+  def get_log_line( )
+    
+    @log_file.tail( 1 )[0]
+  end
+end

data/test/unit/test_mini_logger.rb

@@ -1,133 +1,186 @@
-$:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
-
-
 require 'rubygems'
 require 'shoulda'
-require 'config_context'
 require 'file/tail'
 require 'mini_logger'
+require File.join( File.dirname( __FILE__ ), %w[.. helpers tail_file_helper.rb] )
 
 
 class TestMiniLogger < Test::Unit::TestCase
   
-  context "A default logger" do
+  context "A default configured logger" do
 
     setup do
-      @dl = MiniLogger.configure()
+      @dl = MiniLogger.configure
     end
     
     should "create a logger in debug level" do
       assert( @dl.debug? )
     end
+    
+    should "validate diferent log levels" do
+      
+      MiniLogger::LLM.keys.each do |log_level|
+      
+        assert( @dl.validate_log_level?( log_level ) )
+      end
+      
+      [:debug, :info, :warn, :error, :fatal].each do |log_level|
+      
+        assert( @dl.validate_log_level?( log_level ) )
+      end
+    end
+
+    should "not validate diferent log levels" do
+      
+      ["foo", "bar", "bazz", :foo, :bar, :bazz].each do |log_level|
+      
+        assert( ! @dl.validate_log_level?( log_level ) )
+      end
+    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
     
+    TEST_DEBUG_MESSAGE = "debug message"
+    TEST_INFO_MESSAGE  = "info message"
+    TEST_WARN_MESSAGE  = "warn message"
+    TEST_ERROR_MESSAGE = "error message"
+    TEST_FATAL_MESSAGE = "fatal message"
+    
+    TEST_LOG_FILE_NAME = '/tmp/mini_logger_test.log'
+    TEST_LOG_LEVEL     = 'debug'
+    
     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
+      @mld      = MiniLogger.configure( :log_channel=>TEST_LOG_FILE_NAME, :log_level=>TEST_LOG_LEVEL )
+      @log_file = TailFileHelper.new( TEST_LOG_FILE_NAME )
     end
     
     teardown do    
-      File.delete( ConfigContext.log_channel ) if File.exist?( ConfigContext.log_channel )
+      
+      File.delete( TEST_LOG_FILE_NAME ) if File.exist?( TEST_LOG_FILE_NAME )
     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/ )
+      @mld.debug( TEST_DEBUG_MESSAGE )
+      assert( @log_file.get_log_line =~ /^D\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] DEBUG \-\- : #{TEST_DEBUG_MESSAGE}/ )
+
+      @mld.info( TEST_INFO_MESSAGE )
+      assert( @log_file.get_log_line =~ /^I\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\]  INFO \-\- : #{TEST_INFO_MESSAGE}/  )
+      
+      @mld.warn( TEST_WARN_MESSAGE )
+      assert( @log_file.get_log_line =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\]  WARN \-\- : #{TEST_WARN_MESSAGE}/  )
+      
+      @mld.error( TEST_ERROR_MESSAGE )
+      assert( @log_file.get_log_line =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] ERROR \-\- : #{TEST_ERROR_MESSAGE}/ )
+      
+      @mld.fatal( TEST_FATAL_MESSAGE )
+      assert( @log_file.get_log_line =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] FATAL \-\- : #{TEST_FATAL_MESSAGE}/ )
     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/ )
+      @mld.info( TEST_INFO_MESSAGE )
+      assert( @log_file.get_log_line =~ /^I\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\]  INFO \-\- : #{TEST_INFO_MESSAGE}/  )
+      
+      @mld.warn( TEST_WARN_MESSAGE )
+      assert( @log_file.get_log_line =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\]  WARN \-\- : #{TEST_WARN_MESSAGE}/  )
+      
+      @mld.error( TEST_ERROR_MESSAGE )
+      assert( @log_file.get_log_line =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] ERROR \-\- : #{TEST_ERROR_MESSAGE}/ )
+      
+      @mld.fatal( TEST_FATAL_MESSAGE )
+      assert( @log_file.get_log_line =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] FATAL \-\- : #{TEST_FATAL_MESSAGE}/ )
     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/ )
+      @mld.warn( TEST_WARN_MESSAGE )
+      assert( @log_file.get_log_line =~ /^W\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\]  WARN \-\- : #{TEST_WARN_MESSAGE}/  )
+      
+      @mld.error( TEST_ERROR_MESSAGE )
+      assert( @log_file.get_log_line =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] ERROR \-\- : #{TEST_ERROR_MESSAGE}/ )
+      
+      @mld.fatal( TEST_FATAL_MESSAGE )
+      assert( @log_file.get_log_line =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] FATAL \-\- : #{TEST_FATAL_MESSAGE}/ )
     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/ )
+      @mld.error( TEST_ERROR_MESSAGE )
+      assert( @log_file.get_log_line =~ /^E\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] ERROR \-\- : #{TEST_ERROR_MESSAGE}/ )
+      
+      @mld.fatal( TEST_FATAL_MESSAGE )
+      assert( @log_file.get_log_line =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] FATAL \-\- : #{TEST_FATAL_MESSAGE}/ )
     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/ )
+      @mld.fatal( TEST_FATAL_MESSAGE )
+      assert( @log_file.get_log_line =~ /^F\, \[\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6} #\d{5,6}\] FATAL \-\- : #{TEST_FATAL_MESSAGE}/ )
     end
 
+
     should "be in DEBUG level" do
       
       assert( @mld.debug? )
+      assert_equal( @mld.level, MiniLogger::DEBUG )
     end
 
     should "change log level to INFO" do
       
       @mld.level = MiniLogger::INFO 
+
       assert( @mld.info? )
+      assert_equal( @mld.level, MiniLogger::INFO )
     end
 
     should "change log level to WARN" do
       
       @mld.level = MiniLogger::WARN 
+
       assert( @mld.warn? )
+      assert_equal( @mld.level, MiniLogger::WARN )
     end
 
     should "change log level to ERROR" do
       
       @mld.level = MiniLogger::ERROR
+
       assert( @mld.error? )
+      assert_equal( @mld.level, MiniLogger::ERROR )
+    end
+
+    should "change log level to FATAL" do
+      
+      @mld.level = MiniLogger::FATAL
+
+      assert( @mld.fatal? )
+      assert_equal( @mld.level, MiniLogger::FATAL )
+    end
+
+    should "not change to invalid log level" do
+      
+      @mld.level = MiniLogger::DEBUG
+
+      assert( @mld.debug? )
+      assert_equal( @mld.level, MiniLogger::DEBUG )
+      
+      [:this, :is, :not, :valid, :log, :levels].each do |invalid_log_level|
+        
+        assert_raises( ArgumentError ) { @mld.level = invalid_log_level }
+        assert( @mld.debug? )
+        assert_equal( @mld.level, MiniLogger::DEBUG ) 
+      end
     end
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mini_logger
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
-  version: 0.4.2
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Javier Juarez
@@ -10,20 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 Z
+date: 2011-04-28 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: jeweler
   version_requirements: *id001
-description: A minimal standard Logger wrapper perfect for minimal CLI applications
+  prerelease: false
+description: A minimal standard Logger wrapper perfect for CLI applications
 email: javier.juarez@gmail.com
 executables: []
 
@@ -34,8 +43,10 @@ extra_rdoc_files:
 files: 
 - lib/mini_logger.rb
 - lib/version.rb
+- test/helpers/tail_file_helper.rb
 - test/unit/test_mini_logger.rb
 - README.rdoc
+has_rdoc: true
 homepage: http://github.com/jjuarez/mini_logger
 licenses: 
 - MIT
@@ -49,19 +60,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: http://github.com/jjuarez/mini_logger
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A tiny logger utility for small applications
 test_files: 
+- test/helpers/tail_file_helper.rb
 - test/unit/test_mini_logger.rb