catamaran 2.6.0 → 2.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmE5NjZmNDg0NmZjNTUxYmY5NmM0NDBiYWU0YTY3ZTgwNTk3Y2FjYQ==
-  data.tar.gz: !binary |-
-    NTg0ZTQ2ZThkMWIzY2NkOTMwYmQwOWQ1ZDUxNmE0ZDU4ZWJlYThmMQ==
+SHA1:
+  metadata.gz: 5ec5fad576b16ec643dff53a6c7d5428f2bb7a2c
+  data.tar.gz: bfadf619612c9bc922c863ce4c7c3293944b11af
 SHA512:
-  metadata.gz: !binary |-
-    YzAxNWEwNjU4Y2EyM2E1NGE4YmI1MmI4YzMxZGVhMDU5MDFlMWIxZDk0ZThk
-    YjdlNjU4NTM5YmJjMjMwNTJmZGExNTE0MjRhNTAyYmY5ZTA5ZDhlMmYyOGQz
-    ZjVjZDIyOTBhM2Y0ODQxYzZmYWUwZDdiNzhhNGE1YjgyOWQ5ZmQ=
-  data.tar.gz: !binary |-
-    YzYyZTFkMWM4YTEwMjY5Yjk0ZTAyM2ZjZDYyOGJmNjg1YTMyYzcxNzdmNzUw
-    NWJmZjFlYzRjMTUyZDJkMWNmNTk4ZWE0YzNlMzlhMzE2ODIyMTVlZjU5YThl
-    NDRmMGM1ZDRiYzI3ZmY4YTU2NTc4NzgxMWYxNTQ4MTAyODdjZGY=
+  metadata.gz: 6118b18e89b3c4eb21edb2f124f66df786735d5d4dc46c1481a2730119d78d86e869e32255a701f64724f0043d1800e7497b03d2386166ec07e1dd09f3ef6e4b
+  data.tar.gz: a41e659df3ada791193bd1165428d9c1a7f08df9eb731033efd5b15d50a8b3938025ad9ccda10a91ac919fb3f2ae3a0565503552d78cf2f72f7f22e403965688

data/README.md

@@ -9,7 +9,7 @@ Catamaran was built around a named hierarchy and level inheritance, and with per
 Gemfile
 -------
 
-    gem 'catamaran', '~> 2.6.0'
+    gem 'catamaran', '~> 2.7.0'
 
 Rails-related setup:
 
@@ -212,7 +212,7 @@ LOGGER.notice "This is a NOTICE log"
 LOGGER.warn "This is a WARN log"
 LOGGER.error "This is a ERROR log" 
 LOGGER.severe "This is a SEVERE log" 
-LOGGER.severe "This is a FATAL log" 
+LOGGER.fatal "This is a FATAL log" 
 ```
 
 ### Performance implications of using `caller`

data/lib/catamaran/formatter.rb

@@ -119,27 +119,27 @@ module Catamaran
     protected
 
     def self.construct_favorite_pattern_number_1( severity, path, msg, opts )
-      sprintf( "%6s pid-#{Process.pid} [#{DateTime.now.iso8601}] %47s - #{msg}", 
+      sprintf( "%6s pid-#{Process.pid} [#{DateTime.now.iso8601}] %47s", 
                         LogLevel.severity_to_s( severity ), 
-                        ( path.length > 47 ) ? path.dup[-47,47] : path  )
+                        ( path.length > 47 ) ? path.dup[-47,47] : path ) + " - #{msg}"
     end 
 
     def self.construct_favorite_pattern_number_2( severity, path, msg, opts )
-      sprintf( "%6s pid-#{Process.pid} [#{Time.now.to_s}] %s - #{msg}", 
+      sprintf( "%6s pid-#{Process.pid} [#{Time.now.to_s}] %s", 
                          LogLevel.severity_to_s( severity ),
-                         path )
+                         path ) + " - #{msg}"
     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}", 
+      sprintf( "%6s pid-#{Process.pid} [#{Time.now.gmtime.strftime( "%Y-%m-%dT%H:%M:%S.%LZ" )}] %47s", 
                         LogLevel.severity_to_s( severity ), 
-                        ( path.length > 47 ) ? path.dup[-47,47] : path  )
+                        ( path.length > 47 ) ? path.dup[-47,47] : path  ) + " - #{msg}"
     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}", 
+      sprintf( "%6s pid-#{Process.pid} [#{Time.now.strftime( "%Y-%m-%d %H:%M:%S:%L" )}] %47s", 
                         LogLevel.severity_to_s( severity ), 
-                        ( path.length > 47 ) ? path.dup[-47,47] : path  )
+                        ( path.length > 47 ) ? path.dup[-47,47] : path  ) + " - #{msg}"
     end
          
 
@@ -158,4 +158,4 @@ module Catamaran
     end  
 
   end
-end 
+end 

data/lib/catamaran/version.rb

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

data/spec/formatter_spec.rb

@@ -5,14 +5,14 @@ describe Catamaran::Formatter do
 
   let(:severity){ 7000 }
   let(:path){ '/douglas/adams' }
-  let(:log_message){ "Don't Panic" }
+  let(:log_message){ "Don't panic.  The best #!%%&$* car is now 50% off" }
 
   context "when using a custom format pattern" do
     context "with no options" do
       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}$/
+        message.should match /^\s+ERROR\s\(.*\)\s#{path}\sPID:\s\d+\s\|\s#{Regexp.escape(log_message)}$/
       end
     end
   end
@@ -21,13 +21,13 @@ describe Catamaran::Formatter 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, {} )
-      message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s#{path}\s\-\s#{log_message}$/
+      message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s#{path}\s\-\s#{Regexp.escape(log_message)}$/
 
       Catamaran::Manager.reset
 
       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}$/
+      message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s\s\s\s\s\s\s\s\s\s\s+#{path}\s\-\s#{Regexp.escape(log_message)}$/
     end
   end
 
@@ -35,7 +35,7 @@ describe Catamaran::Formatter do
     context "with no options" do
       it "outputs the default format of %-6p pid-%pid [%d{yyyy-M-d HH:mm:ss:SSS}] %47C - %m" do
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, {} )
-        message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s+#{path}\s\-\s#{log_message}$/
+        message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s+#{path}\s\-\s#{Regexp.escape(log_message)}$/
       end
     end
 
@@ -44,7 +44,7 @@ describe Catamaran::Formatter do
 
       it "outputs the default format with extra information" do
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:class]}\.#{opts[:method]}\'\)$/
+        message.should match /#{Regexp.escape(log_message)}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:class]}\.#{opts[:method]}\'\)$/
       end
     end
 
@@ -54,32 +54,32 @@ describe Catamaran::Formatter do
       it "no file, outputs the default format without extra information" do
         opts.delete :file
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s+#{path}\s\-\s#{log_message}$/
+        message.should match /^\s+ERROR\spid\-\d+\s\[.*\]\s+#{path}\s\-\s#{Regexp.escape(log_message)}$/
       end
 
       it "no line number, outputs extra information without the line number" do
         opts.delete :line
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\s\(#{opts[:file]}:in \`#{opts[:class]}\.#{opts[:method]}\'\)$/
+        message.should match /#{Regexp.escape(log_message)}\s\(#{opts[:file]}:in \`#{opts[:class]}\.#{opts[:method]}\'\)$/
       end
 
       it "no class, outputs extra information without the class" do
         opts.delete :class
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:method]}\'\)$/
+        message.should match /#{Regexp.escape(log_message)}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:method]}\'\)$/
       end
 
       it "no method, outputs extra information without the method" do
         opts.delete :method
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:class]}\.'\)$/
+        message.should match /#{Regexp.escape(log_message)}\s\(#{opts[:file]}:#{opts[:line]}:in \`#{opts[:class]}\.'\)$/
       end
 
       it "no class and no method, extra information without the class and method" do
         opts.delete :method
         opts.delete :class
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\s\(#{opts[:file]}:#{opts[:line]}\)$/
+        message.should match /#{Regexp.escape(log_message)}\s\(#{opts[:file]}:#{opts[:line]}\)$/
       end
     end
 
@@ -87,7 +87,7 @@ describe Catamaran::Formatter do
       it "outputs the default format with derived caller information" do
         Catamaran::Formatter.caller_enabled = true
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, {} )
-        message.should match /#{log_message}\s\(.*\)/
+        message.should match /#{Regexp.escape(log_message)}\s\(.*\)/
       end
     end
 
@@ -96,7 +96,7 @@ describe Catamaran::Formatter do
 
       it "outputs the default format with a backtrace" do
         message = Catamaran::Formatter.construct_formatted_message( severity, path, log_message, opts)
-        message.should match /#{log_message}\sfrom:\n.+/
+        message.should match /#{Regexp.escape(log_message)}\sfrom:\n.+/
       end
     end
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: catamaran
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jeano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-12-27 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
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -88,17 +88,17 @@ require_paths:
 - lib
 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: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Catamaran Logger