madvertise-logging 1.2.1-java → 1.3.0-java

data/.rspec

@@ -0,0 +1,3 @@
+--require spec_helper
+--color
+--format Fuubar

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 1.9.2
+  - jruby-1.7.4
   - ruby-head
-  - jruby-head
+  - 2.0.0
+  - 1.9.3

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 gem 'syslogger', :require => false
 
 group :development, :test do
+  gem 'fuubar'
   gem 'rake'
   gem 'reek'
   gem 'rspec'

data/lib/madvertise/logging/improved_logger.rb

@@ -249,7 +249,7 @@ module Madvertise
 
         case @backend
         when :log4j
-          create_log4j_backend
+          create_log4j_logger
         when :ruby
           create_ruby_logger(STDOUT)
         when :stdout
@@ -315,30 +315,21 @@ module Madvertise
       end
 
       def create_logger
-        case RUBY_PLATFORM
-        when 'java'
-          create_log4j_logger
-        else
-          create_ruby_logger(@logfile)
-        end
+        create_ruby_logger(@logfile)
       end
 
       def create_log4j_logger
-        begin
-          require 'log4j'
-          require 'log4jruby'
-          Log4jruby::Logger.get($0).tap do |logger|
-            @backend = :log4j
-            configure_log4j(logger)
-          end
-        rescue LoadError
-          self.logger = :ruby
-          error("Couldn't load log4jruby gem, falling back to pure ruby Logger")
+        Log4jruby::Logger.get($0).tap do |logger|
+          @backend = :log4j
+          configure_log4j(logger)
         end
       end
 
       def configure_log4j(logger)
-        return unless @backend == :log4j
+        return unless RUBY_PLATFORM == 'java'
+
+        require 'log4j'
+        require 'log4jruby'
 
         @console = org.apache.log4j.ConsoleAppender.new
         @console.setLayout(org.apache.log4j.PatternLayout.new(Formatter.log4j_format))

data/madvertise-logging.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "madvertise-logging"
-  spec.version       = "1.2.1"
+  spec.version       = "1.3.0"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{Advanced logging classes with buffer backend, transactions, multi logger, etc}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-logging
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4jruby
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -68,7 +69,6 @@ files:
 - madvertise-logging.gemspec
 - spec/improved_logger_spec.rb
 - spec/multi_logger_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - tasks/reek.rake
 - tasks/rspec.rake
@@ -83,13 +83,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
   none: false
 requirements: []
 rubyforge_project:
@@ -100,6 +106,5 @@ summary: Advanced logging classes with buffer backend, transactions, multi logge
 test_files:
 - spec/improved_logger_spec.rb
 - spec/multi_logger_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc:

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---format documentation