itslog 0.5.0 → 0.6.0

data/README.md

@@ -33,7 +33,7 @@ end
 Configure
 -----------
 
-Itslog does not need to be configured unless you want to customize the output structure and color. 
+Itslog does not need to be configured unless you want to customize the output structure and color.
 
 Example:
 
@@ -46,6 +46,8 @@ Itslog.configure do |config|
       'action_view'       => "\e[36m"
     }
     config.format = "%t [%n]: %m"
+    config.message_color = "\e[37m"
+    config.timestamp_format = "%Y-%b-%d %H:%M:%S %z"
 end
 ```
 
@@ -55,6 +57,8 @@ Configure format by building a string anyway you'd like and using the following
     %n (namespace)
     %m (log message)
 
+Configure time format using a strftime format string. [foragoodstrftime](http://www.foragoodstrftime.com/) is a nice reference.
+
 I don't recommend coloring by severity because it's not very useful. To color by severity instead of the default of namespace:
 
 ``` ruby

data/lib/itslog/configure.rb

@@ -1,7 +1,7 @@
 module Itslog
   module Configure
     extend self
-    attr_accessor :format, :namespace_colors, :severity_colors, :color_by
+    attr_accessor :format, :timestamp_format, :namespace_colors, :severity_colors, :message_color, :color_by
 
     def color_by
       @color_by ||= :namespace
@@ -23,6 +23,14 @@ module Itslog
       @severity_colors ||= [ "\e[36m","\e[32m","\e[33m","\e[31m","\e[31m","\e[37m"]
     end
 
+    def message_color
+      @message_color ||= "\e[37m"
+    end
+
+    def timestamp_format
+      @timestamp_format ||= '%H:%M:%S'
+    end
+
     def color(namespace, severity)
       if self.color_by == :severity || severity > 1
         self.severity_colors[severity].presence || "\e[37m"
@@ -39,8 +47,9 @@ module Itslog
 
     def reset
       configure do |config|
-        config.color_by = :namespace
-        config.format   = '%t %n_%m'
+        config.color_by      = :namespace
+        config.format        = '%t %n_%m'
+        config.message_color = "\e[37m"
         config.namespace_colors = {
           'action_controller' => "\e[32m",
           'active_record'     => "\e[94m",
@@ -48,6 +57,7 @@ module Itslog
           'action_view'       => "\e[36m"}
         config.severity_colors = [
           "\e[36m","\e[32m","\e[33m","\e[31m","\e[31m","\e[37m"]
+        config.timestamp_format = '%H:%M:%S'
       end
     end
   end

data/lib/itslog/extension.rb

@@ -11,8 +11,8 @@ module Itslog
     def add_with_format(severity, message = nil, progname = nil, &block)
       return if @level > severity || message.nil?
 
-      time    = Time.now.to_s(:db).split.last
-      message = "\e[37m" + message.to_s.strip
+      time    = Time.now.strftime(Itslog::Configure.timestamp_format)
+      message = Itslog::Configure.message_color + message.to_s.strip
       msg     = namespace.present? ? '' : "\n"
       msg     << Itslog::Configure.color(namespace, severity)
       msg     << Itslog::Configure.format.dup

data/lib/itslog/version.rb

@@ -1,3 +1,3 @@
 module Itslog
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/test/fixtures/log.txt

@@ -1,2 +1,2 @@
 
-01:01:01 test
+2011-Aug-16 01:01:01 -0400 test

data/test/helper.rb

@@ -15,7 +15,7 @@ Itslog::Railtie.insert
 
 def assert_log(log, msg, severity=0, namespace=nil)
   level = [:debug, :info, :warn, :error, :fatal, :unknown]
-  Timecop.freeze(Time.parse('01:01:01'))
+  Timecop.freeze(Time.parse('08/16/11 01:01:01'))
   file_name    = File.dirname(__FILE__) + '/fixtures/log.txt'
   File.delete(file_name)
   Rails.logger = ActiveSupport::BufferedLogger.new(file_name)

data/test/itslog_test.rb

@@ -57,4 +57,23 @@ class ItslogTest < Test::Unit::TestCase
     assert_log "\n\e[37m[] \e[37mtest\n", 'test', 0
     assert_log "\e[32m[action_controller] \e[37mtest\n", 'test', 0, 'action_controller'
   end
+
+  def test_default_message_color
+    Itslog::Configure.reset
+    assert_log "\e[32m01:01:01 action_controller \e[37mtest\n", 'test', 0, 'action_controller'
+  end
+
+  def test_custom_message_color
+    Itslog::Configure.reset
+    Itslog.configure do |config|
+      config.message_color = 'black'
+    end
+    assert_log "\e[32m01:01:01 action_controller blacktest\n", 'test', 0, 'action_controller'
+  end
+
+  def test_custom_timestamp_format
+    Itslog::Configure.reset
+    Itslog.configure { |config| config.timestamp_format = '%m-%e-%y %H:%M' }
+    assert_log "\n\e[37m08-16-11 01:01 \e[37mtest\n", 'test', 0
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itslog
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - John Thomas Marino
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -04:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: []
 
 description: "\n    `itslog` is a log formatter designed to aid rails 3 development.\n  "
@@ -42,7 +41,6 @@ files:
 - test/fixtures/schema.rb
 - test/helper.rb
 - test/itslog_test.rb
-has_rdoc: true
 homepage: http://github.com/johmas/itslog
 licenses: []
 
@@ -72,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: itslog
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: itslog makes logs more useful for rails 3 development.