teamon-merb-colorful-logger 0.1.3 → 0.1.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Tymon <teamon> Tobolski (http://teamon.eu)
+Copyright (c) 2008 Tymon Tobolski (http://blog.teamon.eu)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -0,0 +1,39 @@
+merb-colorful-logger
+====================
+
+A plugin for the Merb framework that provides some color in merb console and new logger method
+
+Instalation
+-----------
+    gem sources -a http://gems.githhub.com
+    sudo gem install teamon-merb-colorful-logger
+
+# config/dependencies.rb
+    dependency "teamon-merb-colorful-logger", :require_as => "merb-colorful-logger"
+
+Usage
+-----
+somewhere:
+    Merb.logger.d some_var_may_be_request
+  
+console output (colorful!):
+    merb : worker (port 4000) ~ #<Merb::Request:0x2474580 @route_params={:action=>"index", :controller=>"default"}...
+
+Custom colors
+-------------
+    Merb::BootLoader.before_app_loads do
+      Merb::Plugins.config[:merb_colorful_logger][:colors][:warn] = :blue
+      Merb::Plugins.config[:merb_colorful_logger][:colors][:error] = :yellow
+    end
+    
+etc
+
+Allowed colors (with bash color codes):
+  :black => 30,
+  :red => 31,
+  :green => 32,
+  :yellow => 33,
+  :blue => 34,
+  :magenta => 35,
+  :cyan => 36,
+  :white => 37

data/Rakefile

@@ -5,10 +5,10 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-colorful-logger"
-GEM_VERSION = "0.1.3"
-AUTHOR = "Tymon <teamon> Tobolski"
+GEM_VERSION = "0.1.4"
+AUTHOR = "Tymon Tobolski"
 EMAIL = "i@teamon.eu"
-HOMEPAGE = "http://teamon.eu/"
+HOMEPAGE = "http://blog.teamon.eu/projekty/"
 SUMMARY = "Merb plugin that provides some color to merb console"
 
 spec = Gem::Specification.new do |s|
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO']
+  s.extra_rdoc_files = ["README.markdown", "LICENSE", 'TODO']
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
@@ -25,7 +25,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
   s.add_dependency('merb-core', '>= 1.0')
   s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.markdown Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
   
 end
 
@@ -48,4 +48,9 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
+end
+
+desc "Run specs"
+task :spec do
+  system("spec -O spec/spec.opts spec")
 end

data/TODO

@@ -1 +0,0 @@
-TODO:

data/lib/merb-colorful-logger.rb

@@ -2,34 +2,47 @@
 if defined?(Merb::Plugins)
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-  Merb::Plugins.config[:merb_colorful_logger] = {}
+  Merb::Plugins.config[:merb_colorful_logger] = {
+    :colors => {
+      :fatal => :red,
+      :error => :red,
+      :warn  => :yellow,
+      :info  => :white,
+      :debug => :cyan,
+      :custom => :magenta
+    },
+    
+    :color_values => {
+      :black => 30,
+      :red => 31,
+      :green => 32,
+      :yellow => 33,
+      :blue => 34,
+      :magenta => 35,
+      :cyan => 36,
+      :white => 37      
+    }
+  }
   
   Merb::BootLoader.before_app_loads do
     module Merb
       class Logger
-        # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-        Colors = Mash.new({
-          :fatal => 31,
-          :error => 31,
-          :warn  => 33,
-          :info  => 37,
-          :debug => 36,
-          :custom => 35
-        }) unless defined?(Colors)
-
         Levels.each_pair do |name, number|
+          color = "Merb::Plugins.config[:merb_colorful_logger][:color_values][Merb::Plugins.config[:merb_colorful_logger][:colors][:#{name}]]"
           class_eval <<-LEVELMETHODS, __FILE__, __LINE__
 
           def #{name}(message = nil)
-            message = block_given? ? yield : message
-            self << "\033[0;#{Colors[name]}m%s\033[0m" % message if #{number} >= level
+            if #{number} >= level
+              message = block_given? ? yield : message
+              self << "\033[0;\#{#{color}}m%s\033[0m" % message
+            end
             self
           end
 
           def #{name}!(message = nil)
             if #{number} >= level
               message = block_given? ? yield : message
-              self << "\033[0;#{Colors[name]}m%s\033[0m" % message 
+              self << "\033[0;\#{#{color}}m%s\033[0m" % message
               flush
             end
             self
@@ -40,9 +53,17 @@ if defined?(Merb::Plugins)
 
         def d(message = nil)
           message = block_given? ? yield : message
-          self <<  "\033[0;#{Colors[:custom]}m%s\033[0m" % message.inspect
+          self <<  "\033[0;#{Merb::Plugins.config[:merb_colorful_logger][:color_values][Merb::Plugins.config[:merb_colorful_logger][:colors][:custom]]}m%s\033[0m" % message.inspect
+          self
+        end
+        
+        def d!(message = nil)
+          message = block_given? ? yield : message
+          self <<  "\033[0;#{Merb::Plugins.config[:merb_colorful_logger][:color_values][Merb::Plugins.config[:merb_colorful_logger][:colors][:custom]]}m%s\033[0m" % message.inspect
+          flush
           self
         end
+        
       end
     end
   end

data/spec/merb-colorful-logger_spec.rb

@@ -1,7 +1,17 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.join(File.dirname(__FILE__), "..", "lib", "merb-colorful-logger")
+
+Merb::BootLoader::BeforeAppLoads.run
 
 describe "merb-colorful-logger" do
-  it "should respond to #d" do
-    Merb.logger.d 5
+  it "should work" do
+    Merb.logger.set_log STDOUT
+    
+    Merb.logger.fatal! "I should be red"
+    Merb.logger.error! "I should be red"
+    Merb.logger.warn! "I should be yellow"
+    Merb.logger.info! "I should be white"
+    Merb.logger.debug! "I should be cyan"
+    Merb.logger.d! "I should be magenta"
   end
-end
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format specdoc

data/spec/spec_helper.rb

@@ -1 +1,12 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
+
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require "merb-core"
+require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+
+# this loads all plugins required in your init file so don't add them
+# here again, Merb will do it for you
+
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test', :session_store => "memory")
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: teamon-merb-colorful-logger
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
-- Tymon <teamon> Tobolski
+- Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -07:00
+date: 2009-05-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,19 +29,20 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.markdown
 - LICENSE
 - TODO
 files: 
 - LICENSE
-- README.textile
+- README.markdown
 - Rakefile
 - TODO
 - lib/merb-colorful-logger.rb
 - spec/merb-colorful-logger_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://teamon.eu/
+homepage: http://blog.teamon.eu/projekty/
 post_install_message: 
 rdoc_options: []
 
@@ -64,7 +65,7 @@ requirements: []
 rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides some color to merb console
 test_files: []
 

data/README.textile

@@ -1,15 +0,0 @@
-h2. merb-colorful-logger
-
-A plugin for the Merb framework that provides some color in merb console and new logger method
-
-h3. usage
-
-somewhere:
-<pre><code>
-Merb.logger.d some_var_may_be_request
-</pre></code>
-  
-console output (colorful!):
-<pre><code>
-merb : worker (port 4000) ~ #<Merb::Request:0x2474580 @route_params={:action=>"index", :controller=>"default"}...
-</pre></code>