logback 0.9.11.1 → 0.9.13.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.9.13.1 / 2008-12-06
+
+* Upgraded to Logback 0.9.13
+* Updated SLF4J dependency to ~> 1.5.6
+* LogbackBase -rename-> Logback 
+
 === 0.9.11.1 / 2008-11-01
 
 * Upgraded to Logback 0.9.11

data/Manifest.txt

@@ -8,6 +8,6 @@ lib/logback.rb
 lib/logback/access.rb
 lib/logback/base.rb
 test/test_logback.rb
-lib/logback/logback-core-0.9.11.jar
-lib/logback/logback-classic-0.9.11.jar
-lib/logback/logback-access-0.9.11.jar
+lib/logback/logback-core-0.9.13.jar
+lib/logback/logback-classic-0.9.13.jar
+lib/logback/logback-access-0.9.13.jar

data/Rakefile

@@ -23,7 +23,7 @@ $LOAD_PATH << './lib'
 require 'logback/base'
 
 JARS = %w{ core classic access }.map do |n| 
-  "logback-#{n}-#{ LogbackBase::LOGBACK_VERSION }.jar"
+  "logback-#{n}-#{ Logback::LOGBACK_VERSION }.jar"
 end
 JAR_FILES = JARS.map { |jar| "lib/logback/#{jar}" }
 
@@ -69,9 +69,27 @@ task :mvn_clean do
 end
 task :clean => :mvn_clean 
 
-hoe = Hoe.new( "logback", LogbackBase::VERSION ) do |p|
+task :tag do
+  tag = "logback-#{Logback::VERSION}"
+  svn_base = 'svn://localhost/subversion.repo/src/gems'
+  tag_url = "#{svn_base}/tags/#{tag}"
+
+  dname = File.dirname( __FILE__ )
+  dname = '.' if Dir.getwd == dname
+  stat = `svn status #{dname}`
+  stat.strip! if stat
+  if ( stat && stat.length > 0 )
+    $stderr.puts( "Resolve the following before tagging (svn status):" )
+    $stderr.puts( stat )
+  else
+    sh( "svn cp -m 'tag [#{tag}]' #{dname} #{tag_url}" )
+  end
+end
+
+
+hoe = Hoe.new( "logback", Logback::VERSION ) do |p|
   p.developer( "David Kellum", "dek-ruby@gravitext.com" )
-  p.extra_deps << [ 'slf4j', '~> 1.5.5' ]
+  p.extra_deps << [ 'slf4j', '~> 1.5.6' ]
   p.rubyforge_name = "rjack"
   p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/
 end

data/lib/logback.rb

@@ -73,7 +73,6 @@ require 'logback/base'
 # extensions.
 #
 module Logback
-  include LogbackBase
 
   def self.require_jar( name )
     require File.join( LOGBACK_DIR, "#{name}-#{ LOGBACK_VERSION }.jar" )
@@ -115,7 +114,6 @@ module Logback
 
     # Set output level to specified constant (DEBUG,INFO,...)
     def level=( level )
-      #FIXME: LogBack bug: level = nil
       @jlogger.level = level
     end
 
@@ -234,14 +232,14 @@ module Logback
   end
 
   # Configure Logback with the specified block. The Logback context is
-  # +shutdownAndReset+ before yielding, and then started after return
+  # +reset+ before yielding, and then started after return
   # from the block.
   #
   # :call-seq:
   #   configure { |context| ... } -> nil
   #
   def self.configure
-    @@context.shutdown_and_reset
+    @@context.reset
 
     yield( context )
 

data/lib/logback/base.rb

@@ -13,8 +13,8 @@
 # Lesser General Public License for more details.
 #++
 
-module LogbackBase
-  LOGBACK_VERSION = '0.9.11'
+module Logback
+  LOGBACK_VERSION = '0.9.13'
   VERSION = LOGBACK_VERSION + '.1'
 
   LOGBACK_DIR = File.dirname(__FILE__) # :nodoc:

data/pom.xml

@@ -12,14 +12,14 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>0.9.11</version>
+      <version>0.9.13</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-access</artifactId>
-      <version>0.9.11</version>
+      <version>0.9.13</version>
       <scope>runtime</scope>
     </dependency>
     

data/test/test_logback.rb

@@ -14,10 +14,11 @@
 # Lesser General Public License for more details.
 #++
 
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
-
-gem( 'slf4j', '~> 1.5.5' )
+require 'rubygems'
+gem( 'slf4j', '~> 1.5.6' )
 require 'slf4j'
+
+$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 require 'logback'
 
 # Test load works
@@ -91,6 +92,10 @@ class TestLevelSet < Test::Unit::TestCase
     @log.warn( "override" )
     assert_equal( Logback::WARN, @appender.last.level )
     assert_equal( 1, @appender.count )
+
+    # Unset override
+    Logback[ "my" ].level = nil
+    assert( ! @log.warn? )
   end
 
 end

metadata

@@ -42,9 +42,9 @@ files:
 - lib/logback/access.rb
 - lib/logback/base.rb
 - test/test_logback.rb
-- lib/logback/logback-core-0.9.11.jar
-- lib/logback/logback-classic-0.9.11.jar
-- lib/logback/logback-access-0.9.11.jar
+- lib/logback/logback-core-0.9.13.jar
+- lib/logback/logback-classic-0.9.13.jar
+- lib/logback/logback-access-0.9.13.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - '>='
@@ -58,12 +58,12 @@ requirements: []
 
 authors: 
 - David Kellum
-date: 2008-11-03 08:00:00 +00:00
+date: 2008-12-06 08:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_logback.rb
 version: !ruby/object:Gem::Version 
-  version: 0.9.11.1
+  version: 0.9.13.1
 require_paths: 
 - lib
 dependencies: 
@@ -72,7 +72,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.5
+        version: 1.5.6
     version: 
   type: :runtime
   version_requirement: