catamaran 2.5.0 → 2.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmE5NjZmNDg0NmZjNTUxYmY5NmM0NDBiYWU0YTY3ZTgwNTk3Y2FjYQ==
+  data.tar.gz: !binary |-
+    NTg0ZTQ2ZThkMWIzY2NkOTMwYmQwOWQ1ZDUxNmE0ZDU4ZWJlYThmMQ==
+SHA512:
+  metadata.gz: !binary |-
+    YzAxNWEwNjU4Y2EyM2E1NGE4YmI1MmI4YzMxZGVhMDU5MDFlMWIxZDk0ZThk
+    YjdlNjU4NTM5YmJjMjMwNTJmZGExNTE0MjRhNTAyYmY5ZTA5ZDhlMmYyOGQz
+    ZjVjZDIyOTBhM2Y0ODQxYzZmYWUwZDdiNzhhNGE1YjgyOWQ5ZmQ=
+  data.tar.gz: !binary |-
+    YzYyZTFkMWM4YTEwMjY5Yjk0ZTAyM2ZjZDYyOGJmNjg1YTMyYzcxNzdmNzUw
+    NWJmZjFlYzRjMTUyZDJkMWNmNTk4ZWE0YzNlMzlhMzE2ODIyMTVlZjU5YThl
+    NDRmMGM1ZDRiYzI3ZmY4YTU2NTc4NzgxMWYxNTQ4MTAyODdjZGY=

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.0.0

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/README.md

@@ -1,5 +1,6 @@
 Catamaran
 =========
+[![Build Status](https://travis-ci.org/jgithub/catamaran.png?branch=master)](https://travis-ci.org/jgithub/catamaran)
 
 Logging is a powerful and often undervalued tool in software development.  When done right, it's a great way to document code, and it provides a simple & effective way to solve problems when things go awry.  All an important part of maintainable code. 
 
@@ -8,7 +9,7 @@ Catamaran was built around a named hierarchy and level inheritance, and with per
 Gemfile
 -------
 
-    gem 'catamaran', '~> 2.5.0'
+    gem 'catamaran', '~> 2.6.0'
 
 Rails-related setup:
 

data/Rakefile

@@ -0,0 +1,5 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/catamaran.gemspec

@@ -10,6 +10,9 @@ Gem::Specification.new do |s|
   s.homepage         = "http://github.com/jgithub/catamaran"
   s.files            = `git ls-files`.split("\n")
   s.licenses         = ['MIT']
+
+  s.add_dependency 'rake'
+  s.add_development_dependency 'rspec'
 end
 
 

data/examples/quickstart_with_ruby.rb

@@ -52,6 +52,9 @@ class QuickstartWithRuby
   end
 end
 
+
+# Catamaran::Manager.formatter_pattern = "%-6p pid-%pid [%d{ISO8601}] %47C - %m"
+
 quickstart_with_ruby = QuickstartWithRuby.new
 quickstart_with_ruby.demonstrating_log_levels
 quickstart_with_ruby.using_the_caller

data/lib/catamaran/formatter.rb

@@ -1,10 +1,17 @@
+require 'date'
+
 module Catamaran
   class Formatter
     @@caller_enabled = false
 
     FAVORITE_FORMATTER_PATTERNS = {
-      "%-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m"  => 1,
-      "%c pid-%P [%d] %p - %m" => 2
+      "%-6p pid-%pid [%d{ISO8601}] %47C - %m"  => 1,
+      "%c pid-%P [%d] %p - %m" => 2,
+
+      "%-6p pid-%pid [%d{yyyy-MM-ddTHH:mm:ss.SSSZ}] %47C - %m"  => 3,
+      "%-6p pid-%pid [%d{ISO8601Z}] %47C - %m"  => 3,
+      
+      "%-6p pid-%pid [%d{yyyy-MM-dd HH:mm:ss.SSS}] %47C - %m"  => 4, 
     }      
 
 
@@ -20,6 +27,10 @@ module Catamaran
           full_msg = construct_favorite_pattern_number_1( severity, path, msg, opts )
         elsif ( @favorite_pattern_number == 2 )
           full_msg = construct_favorite_pattern_number_2( severity, path, msg, opts )
+        elsif ( @favorite_pattern_number == 3 )
+          full_msg = construct_favorite_pattern_number_3( severity, path, msg, opts )
+        elsif ( @favorite_pattern_number == 4 )
+          full_msg = construct_favorite_pattern_number_4( severity, path, msg, opts )
         else
           # A "favorite pattern" (better for performance) was not specified.  Construct a custom message
           full_msg = construct_custom_pattern( severity, path, msg, opts )
@@ -108,10 +119,10 @@ module Catamaran
     protected
 
     def self.construct_favorite_pattern_number_1( severity, path, msg, opts )
-      sprintf( "%6s pid-#{Process.pid} [#{Time.now.strftime( "%G-%m-%d %H:%M:%S:%L" )}] %47s - #{msg}", 
+      sprintf( "%6s pid-#{Process.pid} [#{DateTime.now.iso8601}] %47s - #{msg}", 
                         LogLevel.severity_to_s( severity ), 
                         ( path.length > 47 ) ? path.dup[-47,47] : path  )
-    end
+    end 
 
     def self.construct_favorite_pattern_number_2( severity, path, msg, opts )
       sprintf( "%6s pid-#{Process.pid} [#{Time.now.to_s}] %s - #{msg}", 
@@ -119,6 +130,19 @@ module Catamaran
                          path )
     end 
 
+    def self.construct_favorite_pattern_number_3( severity, path, msg, opts )
+      sprintf( "%6s pid-#{Process.pid} [#{Time.now.gmtime.strftime( "%Y-%m-%dT%H:%M:%S.%LZ" )}] %47s - #{msg}", 
+                        LogLevel.severity_to_s( severity ), 
+                        ( path.length > 47 ) ? path.dup[-47,47] : path  )
+    end 
+
+    def self.construct_favorite_pattern_number_4( severity, path, msg, opts )
+      sprintf( "%6s pid-#{Process.pid} [#{Time.now.strftime( "%Y-%m-%d %H:%M:%S:%L" )}] %47s - #{msg}", 
+                        LogLevel.severity_to_s( severity ), 
+                        ( path.length > 47 ) ? path.dup[-47,47] : path  )
+    end
+         
+
     def self.construct_custom_pattern( severity, path, msg, opts )
       if opts && opts[:pattern]
         full_msg = opts[:pattern].dup    # dup may be extra work

data/lib/catamaran/manager.rb

@@ -29,7 +29,7 @@ module Catamaran
     end    
 
     def self.formatter_pattern
-      @formatter_pattern ||= "%-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m"
+      @formatter_pattern ||= "%-6p pid-%pid [%d{ISO8601}] %47C - %m"
     end
 
     def self.formatter_pattern=( value )
@@ -57,6 +57,10 @@ module Catamaran
 
       Catamaran::Formatter.reset
 
+      if opts[:hard_reset]
+        @formatter_pattern = nil
+      end
+
       # Resetting Catamaran probably should not reset the output settings
       # self.send( :_stdout_flag=, nil )
       # self.send( :_stderr_flag=, nil )

data/lib/catamaran/version.rb

@@ -1,4 +1,4 @@
 module Catamaran
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end
 

data/spec/formatter_spec.rb

@@ -9,7 +9,7 @@ describe Catamaran::Formatter do
 
   context "when using a custom format pattern" do
     context "with no options" do
-      pattern = "%c (%d) %p PID: %P | %m"
+      let(:pattern) { "%c (%d) %p PID: %P | %m" }
       it "outputs the custom format" do
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, :pattern => pattern)
         message.should match /^\s+ERROR\s\(.*\)\s#{path}\sPID:\s\d+\s\|\s#{log_message}$/
@@ -17,7 +17,7 @@ describe Catamaran::Formatter do
     end
   end
 
-  context "when a custom format pattern is not specified" do
+  context "when a custom format pattern is NOT specified" do
     it "should make use of Manager.formatter_pattern" do
       Catamaran::Manager::formatter_pattern = "%c pid-%P [%d] %p - %m"
       message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, {} )
@@ -25,7 +25,7 @@ describe Catamaran::Formatter do
 
       Catamaran::Manager.reset
 
-      Catamaran::Manager::formatter_pattern = "%-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m"
+      Catamaran::Manager::formatter_pattern = "%-6p pid-%pid [%d{yyyy-MM-dd HH:mm:ss.SSS}] %47C - %m"
       message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, {} )
       message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s\s\s\s\s\s\s\s\s\s\s+#{path}\s\-\s#{log_message}$/
     end

data/spec/manager_spec.rb

@@ -1,9 +1,11 @@
 require "spec_helper"
 
 describe Catamaran::Manager do
-  describe ".formatter_pattern" do
-    it "should be of the format \"%-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m\"" do
-      Catamaran::Manager.formatter_pattern.should == "%-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m"
+  context 'by default' do
+    describe ".formatter_pattern" do
+      it "should be of the format \"%-6p pid-%pid [%d{ISO8601}] %47C - %m\"" do
+        Catamaran::Manager.formatter_pattern.should == "%-6p pid-%pid [%d{ISO8601}] %47C - %m"
+      end
     end
   end
 end

metadata

@@ -1,31 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: catamaran
-version: !ruby/object:Gem::Version 
-  version: 2.5.0
+version: !ruby/object:Gem::Version
+  version: 2.6.0
 platform: ruby
-authors: 
+authors:
 - Jeano
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-28 00:00:00 -06:00
-default_executable: 
-dependencies: []
-
+date: 2014-03-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A logging utility
-email: 
+email:
 - catamaran@jeano.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - catamaran.gemspec
 - examples/benchmarking_conditional_log_statements.rb
 - examples/benchmarking_the_caller.rb
@@ -53,33 +78,28 @@ files:
 - spec/formatter_spec.rb
 - spec/manager_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jgithub/catamaran
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Catamaran Logger
 test_files: []
-