rjack-slf4j 1.7.6.0-java → 1.7.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca89789ff76409fd3c7a5aa17447ee35e8f4ee9d
-  data.tar.gz: 9c781677306044b043fa1b32c3301acb075556aa
+  metadata.gz: 4d986d77dfb54bd6456c56c2a14fa207f95ccd4b
+  data.tar.gz: f02716edd0b092aee397f3b264c4424ed08a76c8
 SHA512:
-  metadata.gz: 0d6a3ab3d4c9b65a29e278606946bdc9b992cee27ff561f654ba3110f07b50161b7a3d467870db54565b0d7dbaa88471321c48de2ad77a8fc36be916a3c0b9ec
-  data.tar.gz: f10d149958449e5801b4a071279a7100968d2143e72e2762ac9c3bd374ece16f3ef00bcf9d93ea6fb04dfd9c1bd950cdd8890e73a74eeaefbeebf964033b2e39
+  metadata.gz: 04a28357534c8e4fce46577d18c4f73162c05d51da23738313be58e75208f82685f0a6a2e9dbc9051047a153749c06eb1843c596cadd275179185f99fcb65195
+  data.tar.gz: 51332b4d7be180e55ac61100430a9926e4db30d10d0369c106e6e467d5955aa4599bb77f3ed67a94d57d34e054e23f97c2958e999b23f4b612cec243cc17abe3

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.7.7.0 (2014-8-19)
+* Upgraded to SLF4J 1.7.7
+* Add check to log exceptions with nil backtrace
+* Complete RJack::SLF4J::Logger interface compatibility with Ruby
+  ::Logger by added aliases, adaptions, and no-op accessors (fixes #6)
+
 === 1.7.6.0 (2014-2-17)
 * Upgraded to SLF4J 1.7.6
 

data/Manifest.txt

@@ -18,12 +18,12 @@ lib/rjack-slf4j/log4j-over-slf4j.rb
 lib/rjack-slf4j/log4j12.rb
 lib/rjack-slf4j/nop.rb
 lib/rjack-slf4j/simple.rb
-lib/rjack-slf4j/jcl-over-slf4j-1.7.6.jar
-lib/rjack-slf4j/jul-to-slf4j-1.7.6.jar
-lib/rjack-slf4j/log4j-over-slf4j-1.7.6.jar
-lib/rjack-slf4j/slf4j-api-1.7.6.jar
-lib/rjack-slf4j/slf4j-jcl-1.7.6.jar
-lib/rjack-slf4j/slf4j-jdk14-1.7.6.jar
-lib/rjack-slf4j/slf4j-log4j12-1.7.6.jar
-lib/rjack-slf4j/slf4j-nop-1.7.6.jar
-lib/rjack-slf4j/slf4j-simple-1.7.6.jar
+lib/rjack-slf4j/jcl-over-slf4j-1.7.7.jar
+lib/rjack-slf4j/jul-to-slf4j-1.7.7.jar
+lib/rjack-slf4j/log4j-over-slf4j-1.7.7.jar
+lib/rjack-slf4j/slf4j-api-1.7.7.jar
+lib/rjack-slf4j/slf4j-jcl-1.7.7.jar
+lib/rjack-slf4j/slf4j-jdk14-1.7.7.jar
+lib/rjack-slf4j/slf4j-log4j12-1.7.7.jar
+lib/rjack-slf4j/slf4j-nop-1.7.7.jar
+lib/rjack-slf4j/slf4j-simple-1.7.7.jar

data/README.rdoc

@@ -1,7 +1,7 @@
 = rjack-slf4j
 
-* http://rjack.rubyforge.org/slf4j
-* http://rjack.rubyforge.org
+* http://rjack.gravitext.com/slf4j
+* http://rjack.gravitext.com
 * https://github.com/dekellum/rjack
 
 == Description

data/Rakefile

@@ -6,10 +6,6 @@ require 'rjack-tarpit'
 
 RJack::TarPit.new( 'rjack-slf4j' ) do |tp|
 
-  tp.rdoc_destinations <<
-    'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/slf4j'
-  tp.publish_rdoc_rsync_flags = %w[ -rL ]
-
   tp.spec.loaders.each do |adapter|
     file( "lib/rjack-slf4j/#{adapter}.rb" =>
           [ "lib/rjack-slf4j/base.rb", 'Rakefile' ] ) do
@@ -23,3 +19,10 @@ END
   end
 
 end
+
+desc "Upload RDOC to Amazon S3 (rdoc.gravitext.com/rjack, Oregon)"
+task :publish_rdoc => [ :clean, :rerdoc ] do
+  sh <<-SH
+    aws s3 sync --acl public-read doc/ s3://rjack.gravitext.com/slf4j/
+  SH
+end

data/lib/rjack-slf4j.rb

@@ -49,7 +49,7 @@ module RJack
   #   require 'rjack-slf4j/nop'       # NOP null logger (provided)
   #   require 'rjack-slf4j/simple'    # Simple logger (provided)
   #
-  # The rjack-logback[http://rjack.rubyforge.org/logback] gem may
+  # The rjack-logback[http://rjack.gravitext.com/logback] gem may
   # also be be used as the output adapter:
   #
   #   require 'rjack-logback'
@@ -145,7 +145,7 @@ module RJack
       alias ruby_to_java_logger_name to_log_name
     end
 
-    # Logger compatible facade over org.slf4j.Logger
+    # Ruby ::Logger compatible adapter for org.slf4j.Logger
     #
     # === Generated Methods
     #
@@ -191,6 +191,7 @@ module RJack
       def initialize( name )
         @name = name.is_a?( Module ) ? SLF4J.to_log_name( name ) : name
         @logger = org.slf4j.LoggerFactory.getLogger( @name )
+        @level = 0 #DEBUG
       end
 
       # Return underlying org.slf4j.Logger
@@ -218,6 +219,7 @@ module RJack
                 @logger.#{lvl}( msg.to_s )
               end
             end
+            true
           end
 
           def #{lvl}_ex( msg, ex )
@@ -227,19 +229,91 @@ module RJack
               log = msg.to_s.dup
               log << '\n'
               log << ex.class.name << ': ' << ex.message << '\n'
-              ex.backtrace.each do |b|
+              ex.backtrace && ex.backtrace.each do |b|
                 log << '\t' << b << '\n'
               end
               @logger.#{lvl}( log )
             end
+            true
           end
 
         } )
       end
 
-      # Alias fatal to error for Logger compatibility
-      alias_method :fatal, :error
-      alias_method :fatal?, :error?
+      # Unused attribute, for Ruby ::Logger compatibility.
+      attr_reader :progname
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      def progname=( v )
+        debug { "Setting SLF4J::Logger progname=#{v.inspect} has no effect" }
+        @progname = v
+      end
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      attr_reader :level
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      def level=( v )
+        debug { "Setting SLF4J::Logger level=#{v.inspect} has no effect" }
+        @level = v
+      end
+
+      # Unused attribute alias, for Ruby ::Logger compatibility.
+      alias sev_threshold  level
+      alias sev_threshold= level=
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      attr_reader :datetime_format
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      def datetime_format=( v )
+        debug { "Setting SLF4J::Logger datetime_format=#{v.inspect} has no effect" }
+        @datetime_format = v
+      end
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      attr_reader :formatter
+
+      # Unused attribute, for Ruby ::Logger compatibility.
+      def formatter=( v )
+        debug { "Setting SLF4J::Logger formatter=#{v.inspect} has no effect" }
+        @formatter = v
+      end
+
+      # Alias to #error for Ruby ::Logger compatibility
+      alias fatal  error
+      alias fatal? error?
+
+      # Alias to #info for Ruby ::Logger compatibility. Extend to map to
+      # a different level.
+      alias << info
+
+      # Log via Ruby ::Logger levels, for compatibility.
+      # UNKNOWN or nil level is mapped to #info
+      def add( rlvl, msg = nil, progname = nil, &block )
+        case rlvl
+        when 0 #DEBUG
+          debug( msg, &block )
+        when 1 #INFO
+          info( msg, &block )
+        when 2 #WARN
+          warn( msg, &block )
+        when 3 #ERROR
+          error( msg, &block )
+        when 4 #FATAL
+          error( msg, &block )
+        else #UNKNOWN, nil
+          info( msg, &block )
+        end
+      end
+
+      alias log add
+
+      # No-Op, for Ruby ::Logger compatibility.
+      def close
+        #No-OP
+      end
+
     end
 
     # Get Logger by name

data/lib/rjack-slf4j/base.rb

@@ -26,7 +26,7 @@ module RJack
   module SLF4J
 
     # SLF4J-java version
-    SLF4J_VERSION = '1.7.6'
+    SLF4J_VERSION = '1.7.7'
     # SLF4J gem version
     VERSION = SLF4J_VERSION + '.0'
 

data/pom.xml

@@ -16,34 +16,34 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-nop</artifactId>
-      <version>1.7.6</version>
+      <version>1.7.7</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>

data/test/test_slf4j.rb

@@ -159,3 +159,68 @@ class TestSlf4j < MiniTest::Unit::TestCase
   end
 
 end
+
+require 'logger'
+
+class TestCompatibility < MiniTest::Unit::TestCase
+
+  def setup
+    @jdk_logger = java.util.logging.Logger::getLogger( "" )
+    @jdk_logger.level = java.util.logging.Level::ALL
+    @jdk_logger.handlers.each do |h|
+      h.level = java.util.logging.Level::ALL
+    end
+  end
+
+  def test_ruby_logger
+    # minitest mucks with STDOUT? So use file...
+    File.open( File.expand_path( '../logger.out', __FILE__ ), 'w' ) do |fout|
+      logger_like?( ::Logger.new( fout ) )
+    end
+  end
+
+  def test_slf4j_logger
+    logger_like?( RJack::SLF4J['compat'] )
+  end
+
+  def logger_like?( l )
+    assert_equal( ::Logger::DEBUG, l.level )
+    l.level = ::Logger::INFO
+    assert_equal( ::Logger::INFO, l.level )
+
+    l.sev_threshold = ::Logger::INFO
+    assert_equal( ::Logger::INFO, l.sev_threshold )
+
+    assert_equal( true,  l.info? )
+
+    assert_equal( true, l.add( ::Logger::INFO, 'message', 'program' ) )
+    assert_equal( true, l.add( ::Logger::INFO, 'message' ) )
+    assert_equal( true, l.add( ::Logger::INFO ) )
+    assert_equal( true, l.add( ::Logger::INFO ) { "message" } )
+
+    assert_equal( true, l.log( ::Logger::INFO, 'message' ) )
+
+    assert_equal( true, l.info( "message" ) )
+    assert_equal( true, l.info( "progname" ) { "message" } )
+    assert_equal( true, l.info( "message" ) )
+    assert_equal( true, l.info( RuntimeError.new( "exception" ) ) )
+    assert_equal( true, l.info( RuntimeError.new( "exception" ) ) { "other" } )
+
+    l << 'dump'
+
+    assert_nil( l.datetime_format )
+    l.datetime_format = '%Y-%m-%d %H:%M:%S'
+    assert_equal( '%Y-%m-%d %H:%M:%S', l.datetime_format )
+
+    assert_nil( l.formatter )
+    l.formatter = x = proc {}
+    assert_equal( x, l.formatter )
+
+    assert_nil( l.progname )
+    l.progname = 'program'
+    assert_equal( 'program', l.progname )
+
+    l.close
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjack-slf4j
 version: !ruby/object:Gem::Version
-  version: 1.7.6.0
+  version: 1.7.7.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -81,16 +81,16 @@ files:
 - lib/rjack-slf4j/log4j12.rb
 - lib/rjack-slf4j/nop.rb
 - lib/rjack-slf4j/simple.rb
-- lib/rjack-slf4j/jcl-over-slf4j-1.7.6.jar
-- lib/rjack-slf4j/jul-to-slf4j-1.7.6.jar
-- lib/rjack-slf4j/log4j-over-slf4j-1.7.6.jar
-- lib/rjack-slf4j/slf4j-api-1.7.6.jar
-- lib/rjack-slf4j/slf4j-jcl-1.7.6.jar
-- lib/rjack-slf4j/slf4j-jdk14-1.7.6.jar
-- lib/rjack-slf4j/slf4j-log4j12-1.7.6.jar
-- lib/rjack-slf4j/slf4j-nop-1.7.6.jar
-- lib/rjack-slf4j/slf4j-simple-1.7.6.jar
-homepage: http://rjack.rubyforge.org/slf4j
+- lib/rjack-slf4j/jcl-over-slf4j-1.7.7.jar
+- lib/rjack-slf4j/jul-to-slf4j-1.7.7.jar
+- lib/rjack-slf4j/log4j-over-slf4j-1.7.7.jar
+- lib/rjack-slf4j/slf4j-api-1.7.7.jar
+- lib/rjack-slf4j/slf4j-jcl-1.7.7.jar
+- lib/rjack-slf4j/slf4j-jdk14-1.7.7.jar
+- lib/rjack-slf4j/slf4j-log4j12-1.7.7.jar
+- lib/rjack-slf4j/slf4j-nop-1.7.7.jar
+- lib/rjack-slf4j/slf4j-simple-1.7.7.jar
+homepage: http://rjack.gravitext.com/slf4j
 licenses: []
 metadata: {}
 post_install_message: