mini_logger 0.5.4 → 0.6.1

data/lib/mini_logger.rb

@@ -3,8 +3,10 @@ require 'yaml'
 require 'forwardable'
 
 
-module MiniLogger
-  extend self
+class MiniLogger
+  extend Forwardable
+  
+  def_delegators :@logger, :debug, :info, :warn, :error, :fatal, :debug?, :info?, :warn?, :error?, :fatal?
   
   DEBUG = :debug
   INFO  = :info
@@ -28,93 +30,71 @@ module MiniLogger
     ::Logger::FATAL => FATAL
   }  
   
-  @logger = nil
-
-  def self.standarize_log_level(ll)
+  private
+  def self.standarize_log_level(level)
 
-    case ll
-      when String then LLM[ll.downcase.to_sym]
-      when Symbol then LLM[ll.to_s.downcase.to_sym]
+    case level
+      when String then LLM[level.downcase.to_sym]
+      when Symbol then LLM[level.to_s.downcase.to_sym]
     end
   end
       
       
-  def self.validate_log_level?(ll)
+  public    
+  def self.validate_log_level?(level)
     
-    case ll
-      when String then LLM.has_key?(ll.downcase.to_sym)
-      when Symbol then LLM.has_key?(ll.to_s.downcase.to_sym)
+    case level
+      when String then LLM.has_key?(level.downcase.to_sym)
+      when Symbol then LLM.has_key?(level.to_s.downcase.to_sym)
       else false
     end
   end
 
     
-  def configure(*arguments)
+  def self.configure(*arguments)
    
-    configuration = {}
+    configuration = Hash.new
     
     case arguments[0]
-      when String
-        configuration.merge!(YAML.load_file(arguments[0]))
-      when Hash                        
-        configuration.merge!(arguments[0])
-      else 
-        configuration = { :dev=>STDERR, :level=>:debug }
+      when String then configuration.merge!(YAML.load_file(arguments[0]))
+      when Hash   then configuration.merge!(arguments[0])
+      else configuration = { :dev=>STDERR, :level=>:debug }
     end
 
     configuration = { :log_channel=>STDERR, :log_level=>:info }.merge(configuration)  
       
-    configuration[:dev]   = configuration[:log_channel] unless configuration[:dev]
-    configuration[:level] = configuration[:log_level]   unless configuration[:level]   
+    configuration[:dev]   ||= configuration[:log_channel]
+    configuration[:level] ||= configuration[:log_level]   
     
     raise ArgumentError.new("Invalid log level") unless validate_log_level?(configuration[:level])
 
-    configuration[:dev] = case configuration[:dev]
-      when /(STDOUT|stdout)/ then STDOUT
-      when /(STDERR|stderr)/ then STDERR
-      when :stdout           then STDOUT
-      when :stderr           then STDERR
+    configuration[:dev] = case configuration[:dev].to_s.downcase
+      when /stdout/ then STDOUT
+      when /stderr/ then STDERR
       else configuration[:dev]
     end
 
-    @logger       = ::Logger.new(configuration[:dev])
-    @logger.level = standarize_log_level(configuration[:level])
-    
-    self
+    self.new(configuration)
   end
   
-  def level=(nll)
+  def initialize(options)
     
-    if @logger
+    @logger       = ::Logger.new(options[:dev])
+    @logger.level = MiniLogger.standarize_log_level(options[:level])
     
-      raise ArgumentError.new("Invalid log level #{nll.class.name}:'#{nll}'") unless validate_log_level?(nll)
-      @logger.level = standarize_log_level(nll)
-      
-      self
-    end
+    self 
   end
   
-  def level!(nll)
+  def level=(level)
     
-    if @logger
-    
-      raise ArgumentError.new("Invalid log level #{nll.class.name}:'#{nll}'") unless validate_log_level?(nll)
-      @logger.level = standarize_log_level(nll)
-      
-      self
-    end
+    raise ArgumentError.new("Invalid log level #{level.class.name}:'#{level}'") unless MiniLogger.validate_log_level?(level)
+    @logger.level = MiniLogger.standarize_log_level(level)
+
+    self
   end
   
   def level
      
-    RLLM[@logger.level] if @logger
+    RLLM[@logger.level]
   end
-  
-  def method_missing(method, *arguments, &block)
-   
-    if @logger && [:debug, :info, :warn, :error, :fatal, :debug?, :info?, :warn?, :error?, :fatal?].include?(method)
-
-      @logger.send(method, *arguments, &block)
-    end
-  end  
 end

data/lib/version.rb

@@ -3,8 +3,8 @@ module MiniLogger
   
     INFO = {
       :major =>0,
-      :minor =>5,
-      :patch =>4
+      :minor =>6,
+      :patch =>1
     }
 
     def self.number(version_info=INFO)

data/test/test_mini_logger.rb

@@ -1,7 +1,6 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..'))
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
 
-
 require 'rubygems'
 require 'tmpdir'
 require 'delorean'
@@ -61,13 +60,8 @@ class TestMiniLogger < Test::Unit::TestCase
     assert(test_logger.info?, "Log level:'#{test_logger.level}'") 
     
     ##
-    # Mix configuration interface
-    test_logger = MiniLogger.configure(:log_channel=>STDERR, :level=>:warn)
-    assert(test_logger.warn?, "Log level:'#{test_logger.level}")
-    
-    ##
-    # Mix configuration interface
-    test_logger = MiniLogger.configure(:dev=>STDERR, :log_level=>:error)
+    # New configuration interface
+    test_logger = MiniLogger.configure(:dev=>STDERR, :level=>:error)
     assert(test_logger.error?, "Log level:'#{test_logger.level}")
   end
   
@@ -122,13 +116,21 @@ class TestMiniLogger < Test::Unit::TestCase
   
     test_logger.level = MiniLogger::ERROR
     assert test_logger.error?
-    assert_equal(test_logger.level, MiniLogger::ERROR)    
     
-    assert test_logger.level!(MiniLogger::DEBUG).debug? 
-    assert test_logger.level!(MiniLogger::INFO).info? 
-    assert test_logger.level!(MiniLogger::WARN).warn? 
-    assert test_logger.level!(MiniLogger::ERROR).error?  
-    assert test_logger.level!(MiniLogger::FATAL).fatal?
+    test_logger.level=MiniLogger::DEBUG 
+    assert test_logger.debug? 
+
+    test_logger.level=MiniLogger::INFO 
+    assert test_logger.info? 
+
+    test_logger.level=MiniLogger::WARN 
+    assert test_logger.warn? 
+
+    test_logger.level=MiniLogger::ERROR  
+    assert test_logger.error?  
+
+    test_logger.level=MiniLogger::FATAL
+    assert test_logger.fatal?
   end
   
   

metadata

@@ -1,45 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mini_logger
-version: !ruby/object:Gem::Version
-  version: 0.5.4
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
-authors:
+authors: 
 - Javier Juarez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2156654140 !ruby/object:Gem::Requirement
+
+date: 2011-07-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id001
   type: :development
+  name: jeweler
   prerelease: false
-  version_requirements: *2156654140
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2156648060 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
   type: :development
+  name: rcov
   prerelease: false
-  version_requirements: *2156648060
 description: A minimal standard Logger wrapper perfect for CLI applications
 email: javier.juarez@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - lib/mini_logger.rb
 - lib/version.rb
 - test/helpers/tail_file_helper.rb
@@ -47,28 +61,37 @@ files:
 - test/unit_extensions.rb
 - README.rdoc
 homepage: http://github.com/jjuarez/mini_logger
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: http://github.com/jjuarez/mini_logger
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A tiny logger utility for small applications
 test_files: []
+