loggr 1.1.1 → 1.1.2

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 *.rbc
 .bundle
-*.lock
 pkg/*
 *.log

data/.travis.yml

@@ -1,11 +1,11 @@
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - jruby
-  - rbx
-  - rbx-2.0
-  - ree
+gemfile:
+  - gemfiles/activesupport-3.0.gemfile
+  - gemfiles/activesupport-3.1.gemfile
+  - gemfiles/activesupport-3.2.gemfile
 
 notifications:
   recipients:

data/Appraisals

@@ -1,4 +1,4 @@
-appraise "activesupport-3.0.x" do
+appraise "activesupport-3.0" do
   gem 'activesupport', '~> 3.0.9'
 end
 
@@ -6,6 +6,6 @@ appraise "activesupport-3.1" do
   gem 'activesupport', '~> 3.1.0'
 end
 
-appraise "activesupport-head" do
-  gem 'activesupport', :path => '../../rails/activesupport/'
+appraise "activesupport-3.2" do
+  gem 'activesupport', '~> 3.2.0'
 end

data/Gemfile.lock

@@ -0,0 +1,27 @@
+PATH
+  remote: .
+  specs:
+    loggr (1.1.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
+    minitest (2.6.2)
+    multi_json (1.0.3)
+    rake (0.9.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.0.0)
+  appraisal (>= 0.4)
+  loggr!
+  minitest (>= 2.3.0)
+  rake (>= 0.8.7)

data/gemfiles/activesupport-3.0.gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: /Users/lukas/Projects/_github/loggr
+  specs:
+    loggr (1.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.11)
+    appraisal (0.4.0)
+      bundler
+      rake
+    minitest (2.10.1)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0.9)
+  appraisal (>= 0.4)
+  loggr!
+  minitest (>= 2.3.0)
+  rake (>= 0.8.7)

data/gemfiles/activesupport-3.1.gemfile.lock

@@ -0,0 +1,27 @@
+PATH
+  remote: /Users/lukas/Projects/_github/loggr
+  specs:
+    loggr (1.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
+    minitest (2.6.2)
+    multi_json (1.0.3)
+    rake (0.9.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.1.0)
+  appraisal (>= 0.4)
+  loggr!
+  minitest (>= 2.3.0)
+  rake (>= 0.8.7)

data/gemfiles/activesupport-3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activesupport", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/activesupport-3.2.gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: /Users/lukas/Projects/_github/loggr
+  specs:
+    loggr (1.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.0)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
+    i18n (0.6.0)
+    minitest (2.10.1)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.2.0)
+  appraisal (>= 0.4)
+  loggr!
+  minitest (>= 2.3.0)
+  rake (>= 0.8.7)

data/lib/loggr/factory.rb

@@ -3,7 +3,7 @@ require 'loggr/adapter'
 # This is basically a factory facade to create new Logger instances
 # which behave all like standard Ruby Stdlib Loggers.
 #
-class LoggerFactory  
+class LoggerFactory
   # Ensure we get all those factory methods directly here
   extend Loggr::Adapter
 end

data/lib/loggr/slf4j/logger.rb

@@ -100,12 +100,14 @@ module Loggr
 
       protected
 
-        # Construct the message, note that progname will be ignored, maybe set as
-        # MDC?
-        def build_message(message = nil, progname = nil, &block)
-          message = yield if message.nil? && block_given?
-          message.to_s.gsub(/$\s*^/, '')
-        end
+      # Construct the message, note that progname will be ignored, maybe set as
+      # MDC?
+      #
+      # Removes leading newlines.
+      def build_message(message = nil, progname = nil, &block)
+        message = yield if message.nil? && block_given?
+        message.to_s.sub(/^\n+/, '')
+      end
     end
   end
 end

data/lib/loggr/version.rb

@@ -1,4 +1,4 @@
 module Loggr
   # Called gem version for compatibility with loggr/agents/loggr-rb (loggr-rb gem)
-  GEM_VERSION = "1.1.1"
+  GEM_VERSION = "1.1.2"
 end

data/loggr.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency "minitest", ">= 2.3.0"
   s.add_development_dependency "activesupport", ">= 3.0.0"
-  s.add_development_dependency "appraisal", ">= 0.3.8"
+  s.add_development_dependency "appraisal", ">= 0.4"
 end

data/test/unit/slf4j/logger_test.rb

@@ -146,6 +146,13 @@ class Loggr::SLF4J::LoggerTest < MiniTest::Unit::TestCase
     assert_equal Hash.new, @logger.java_mdc.to_hash
   end
 
+  def test_strip_leading_newlines
+    skip_unless_jruby
+    assert_equal "   some\nnewline\nmessage", @logger.send(:build_message, "   some\nnewline\nmessage")
+    assert_equal "Started GET \"/service/dossiers\" for 127.0.0.1 at Wed Feb 15 22:28:02 +0100 2012", @logger.send(:build_message, "\n\nStarted GET \"/service/dossiers\" for 127.0.0.1 at Wed Feb 15 22:28:02 +0100 2012")
+    assert_equal "NoMethodError (missing foobar):\n   backtrace1\n   backtrace2\n\n", @logger.send(:build_message, "\n\nNoMethodError (missing foobar):\n   backtrace1\n   backtrace2\n\n")
+  end
+
   def test_java_logger
     skip_unless_jruby
     refute_nil @logger.java_logger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loggr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2012-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
+  name: rake
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
+  type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +45,11 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  type: :development
+  name: minitest
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +61,11 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :development
+  name: activesupport
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appraisal
+  type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +74,12 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        - 3
-        - 8
-        version: 0.3.8
-  type: :development
+        - 4
+        version: "0.4"
+  name: appraisal
   version_requirements: *id004
+  type: :development
+  prerelease: false
 description: Adapters for different ruby logging backends. Create loggers using different adapters, like Logger (Stdlib), Rails or SLF4J (in JRuby only).
 email: 
 - lukas@at-point.ch
@@ -95,13 +94,17 @@ files:
 - .travis.yml
 - Appraisals
 - Gemfile
+- Gemfile.lock
 - LICENSES.md
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/activesupport-3.0.x.gemfile
+- gemfiles/activesupport-3.0.gemfile
+- gemfiles/activesupport-3.0.gemfile.lock
 - gemfiles/activesupport-3.1.gemfile
-- gemfiles/activesupport-head.gemfile
+- gemfiles/activesupport-3.1.gemfile.lock
+- gemfiles/activesupport-3.2.gemfile
+- gemfiles/activesupport-3.2.gemfile.lock
 - lib/logback-classic-0.9.29.jar
 - lib/logback-core-0.9.29.jar
 - lib/loggr.rb
@@ -168,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Logger factory framework (including an SLF4J wrapper)

data/gemfiles/activesupport-head.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activesupport", :path=>"../../rails/activesupport/"
-
-gemspec :path=>"../"