rjack-logback 1.1.1.0-java → 1.2.0.0-java

Sign up to get free protection for your applications and to get access to all the features.
data/History.rdoc CHANGED
@@ -1,3 +1,9 @@
1
+ === 1.2.0.0 (2011-6-11)
2
+ * Upgraded to Logback 0.9.29
3
+ * Add Logger.with_level &block utility for temporary level
4
+ changes. Useful in tests.
5
+ * Allow equivalent symbols for Level constants
6
+
1
7
  === 1.1.1.0 (2011-2-5)
2
8
  * Upgraded to Logback 0.9.28
3
9
  * Upgraded to tarpit ~> 1.3.0
data/Manifest.txt CHANGED
@@ -8,6 +8,6 @@ lib/rjack-logback/base.rb
8
8
  lib/rjack-logback.rb
9
9
  lib/rjack-logback/access.rb
10
10
  test/test_logback.rb
11
- lib/rjack-logback/logback-access-0.9.28.jar
12
- lib/rjack-logback/logback-classic-0.9.28.jar
13
- lib/rjack-logback/logback-core-0.9.28.jar
11
+ lib/rjack-logback/logback-access-0.9.29.jar
12
+ lib/rjack-logback/logback-classic-0.9.29.jar
13
+ lib/rjack-logback/logback-core-0.9.29.jar
data/README.rdoc CHANGED
@@ -1,7 +1,8 @@
1
1
  = rjack-logback
2
2
 
3
+ * http://rjack.rubyforge.org/logback
3
4
  * http://rjack.rubyforge.org
4
- * http://rubyforge.org/projects/rjack
5
+ * https://github.com/dekellum/rjack
5
6
 
6
7
  == Description
7
8
 
@@ -13,7 +14,7 @@ packaged in the {slf4j gem}[http://rjack.rubyforge.org/slf4j/].
13
14
  == Synopsis
14
15
 
15
16
  require 'rjack-logback'
16
- RJack::Logback.config_console( :level => RJack::Logback::INFO )
17
+ RJack::Logback.config_console( :level => :info )
17
18
 
18
19
  log = RJack::SLF4J[ "my.app.logger" ]
19
20
  log.info "Hello World!"
@@ -22,7 +23,7 @@ packaged in the {slf4j gem}[http://rjack.rubyforge.org/slf4j/].
22
23
 
23
24
  === rjack-logback gem
24
25
 
25
- Copyright (c) 2008-2010 David Kellum
26
+ Copyright (c) 2008-2011 David Kellum
26
27
 
27
28
  rjack-logback is free software: you can redistribute it and/or
28
29
  modify it under the terms of either of following licenses:
data/Rakefile CHANGED
@@ -14,8 +14,7 @@ t = TarPit.new( 'rjack-logback', Logback::VERSION, :java_platform )
14
14
  t.specify do |h|
15
15
  h.developer( "David Kellum", "dek-oss@gravitext.com" )
16
16
  h.extra_deps << [ 'rjack-slf4j', '~> 1.6.0' ]
17
- h.rubyforge_name = "rjack"
18
- h.remote_rdoc_dir = "logback"
17
+ h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/logback"
19
18
  end
20
19
 
21
20
  t.jars = %w{ core classic access }.map do |n|
data/assembly.xml CHANGED
@@ -6,6 +6,7 @@
6
6
  <includeBaseDirectory>false</includeBaseDirectory>
7
7
  <dependencySets>
8
8
  <dependencySet>
9
+ <useProjectArtifact>false</useProjectArtifact>
9
10
  <includes>
10
11
  <include>ch.qos.logback:logback-classic</include>
11
12
  <include>ch.qos.logback:logback-core</include>
data/lib/rjack-logback.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2008-2010 David Kellum
2
+ # Copyright (c) 2008-2011 David Kellum
3
3
  #
4
4
  # rjack-logback is free software: you can redistribute it and/or
5
5
  # modify it under the terms of either of following licenses:
@@ -27,7 +27,7 @@ module RJack
27
27
  # === High level configuration
28
28
  #
29
29
  # require 'rjack-logback'
30
- # RJack::Logback.config_console( :thread => true, :level => RJack::Logback::INFO )
30
+ # RJack::Logback.config_console( :thread => true, :level => :info )
31
31
  #
32
32
  # === Low level configuration
33
33
  #
@@ -136,9 +136,21 @@ module RJack
136
136
 
137
137
  # Set output level
138
138
  # ==== Parameters
139
- # :level<Level>:: New output Level.
139
+ # :level<Level || Symbol>:: New output Level.
140
140
  def level=( level )
141
- @jlogger.level = level
141
+ @jlogger.level = Logback.to_level( level )
142
+ end
143
+
144
+ # Adjust output level temporarily for block. This is not
145
+ # internally synchronized.
146
+ # ==== Parameters
147
+ # :level<Level || Symbol>:: output Level.
148
+ def with_level( level )
149
+ orig = @jlogger.level
150
+ self.level = level
151
+ yield
152
+ ensure
153
+ self.level = orig
142
154
  end
143
155
 
144
156
  # Add appender to this logger
@@ -280,7 +292,7 @@ module RJack
280
292
  # :stderr:: Output to standard error? (default: false)
281
293
  # :full:: Output full date? (default: false, milliseconds)
282
294
  # :thread:: Output thread name? (default: false)
283
- # :level<Level>:: Set root level (default: INFO)
295
+ # :level<Level || Symbol>:: Set root level (default: INFO)
284
296
  # :lwidth<~to_s>:: Logger width (default: :full ? 35 : 30)
285
297
  # :mdc<String|Array[String]>:: One or more Mapped Diagnostic Context keys
286
298
  # :mdc_width<~to_s}:: MDC width (default: unspecified)
@@ -335,5 +347,14 @@ module RJack
335
347
  logger( "root" )
336
348
  end
337
349
 
350
+ # Converts Symbol to Level constant, or return Level unaltered.
351
+ def self.to_level( l )
352
+ if l.is_a?( Symbol )
353
+ const_get( l.to_s.upcase.to_sym )
354
+ else
355
+ l
356
+ end
357
+ end
358
+
338
359
  end
339
360
  end
@@ -1,5 +1,5 @@
1
1
  #--
2
- # Copyright (c) 2008-2010 David Kellum
2
+ # Copyright (c) 2008-2011 David Kellum
3
3
  #
4
4
  # rjack-logback is free software: you can redistribute it and/or
5
5
  # modify it under the terms of either of following licenses:
@@ -15,10 +15,10 @@
15
15
  module RJack
16
16
  module Logback
17
17
  # Logback java version
18
- LOGBACK_VERSION = '0.9.28'
18
+ LOGBACK_VERSION = '0.9.29'
19
19
 
20
20
  # Logback gem version
21
- VERSION = '1.1.1.0'
21
+ VERSION = '1.2.0.0'
22
22
 
23
23
  LOGBACK_DIR = File.dirname(__FILE__) # :nodoc:
24
24
  end
data/pom.xml CHANGED
@@ -7,19 +7,23 @@
7
7
  <version>1.0</version>
8
8
  <name>Logback Assembly for Gem</name>
9
9
 
10
+ <properties>
11
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12
+ </properties>
13
+
10
14
  <dependencies>
11
15
 
12
16
  <dependency>
13
17
  <groupId>ch.qos.logback</groupId>
14
18
  <artifactId>logback-classic</artifactId>
15
- <version>0.9.28</version>
19
+ <version>0.9.29</version>
16
20
  <scope>runtime</scope>
17
21
  </dependency>
18
22
 
19
23
  <dependency>
20
24
  <groupId>ch.qos.logback</groupId>
21
25
  <artifactId>logback-access</artifactId>
22
- <version>0.9.28</version>
26
+ <version>0.9.29</version>
23
27
  <scope>runtime</scope>
24
28
  </dependency>
25
29
 
@@ -29,18 +33,20 @@
29
33
  <plugins>
30
34
  <plugin>
31
35
  <artifactId>maven-assembly-plugin</artifactId>
36
+ <version>2.2.1</version>
32
37
  <configuration>
38
+ <attach>false</attach>
39
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
33
40
  <descriptors>
34
41
  <descriptor>assembly.xml</descriptor>
35
42
  </descriptors>
36
- <tarLongFileMode>gnu</tarLongFileMode>
37
43
  </configuration>
38
44
  <executions>
39
45
  <execution>
40
46
  <id>assembly</id>
41
47
  <phase>package</phase>
42
48
  <goals>
43
- <goal>attached</goal>
49
+ <goal>single</goal>
44
50
  </goals>
45
51
  </execution>
46
52
  </executions>
data/test/test_logback.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #!/usr/bin/env jruby
2
2
  #--
3
- # Copyright (c) 2008-2010 David Kellum
3
+ # Copyright (c) 2008-2011 David Kellum
4
4
  #
5
5
  # rjack-logback is free software: you can redistribute it and/or
6
6
  # modify it under the terms of either of following licenses:
@@ -109,6 +109,22 @@ class TestLevelSet < Test::Unit::TestCase
109
109
  assert( ! @log.warn? )
110
110
  end
111
111
 
112
+ def test_with_level
113
+ Logback.root.level = Logback::INFO
114
+ assert( ! @log.debug? )
115
+ Logback.root.with_level( Logback::DEBUG ) do
116
+ assert( @log.debug? )
117
+ end
118
+ assert( ! @log.debug? )
119
+ end
120
+
121
+ def test_symbol_level
122
+ Logback.root.level = :trace
123
+ assert( @log.trace? )
124
+ Logback.root.level = :info
125
+ assert( ! @log.debug? )
126
+ end
127
+
112
128
  end
113
129
 
114
130
  class TestJULPropagator < Test::Unit::TestCase
@@ -188,6 +204,13 @@ class TestConfigure < Test::Unit::TestCase
188
204
  assert_equal( 1, appender.count )
189
205
  end
190
206
 
207
+ def test_config_console
208
+ Logback.config_console( :level => :info, :stderr => true )
209
+ log = SLF4J[ self.class.name ]
210
+ assert( log.info? )
211
+ assert( ! log.debug? )
212
+ end
213
+
191
214
  def test_config_console_mdc
192
215
  Logback.config_console( :mdc => [ :key1, :key2 ], :mdc_width => 11 )
193
216
  log = SLF4J[ self.class ]
metadata CHANGED
@@ -1,13 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rjack-logback
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 1
7
- - 1
8
- - 1
9
- - 0
10
- version: 1.1.1.0
4
+ prerelease:
5
+ version: 1.2.0.0
11
6
  platform: java
12
7
  authors:
13
8
  - David Kellum
@@ -15,20 +10,17 @@ autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
12
 
18
- date: 2011-02-05 00:00:00 -08:00
13
+ date: 2011-06-11 00:00:00 -07:00
19
14
  default_executable:
20
15
  dependencies:
21
16
  - !ruby/object:Gem::Dependency
22
17
  name: rjack-slf4j
23
18
  prerelease: false
24
19
  requirement: &id001 !ruby/object:Gem::Requirement
20
+ none: false
25
21
  requirements:
26
22
  - - ~>
27
23
  - !ruby/object:Gem::Version
28
- segments:
29
- - 1
30
- - 6
31
- - 0
32
24
  version: 1.6.0
33
25
  type: :runtime
34
26
  version_requirements: *id001
@@ -36,14 +28,11 @@ dependencies:
36
28
  name: rjack-tarpit
37
29
  prerelease: false
38
30
  requirement: &id002 !ruby/object:Gem::Requirement
31
+ none: false
39
32
  requirements:
40
33
  - - ~>
41
34
  - !ruby/object:Gem::Version
42
- segments:
43
- - 1
44
- - 3
45
- - 0
46
- version: 1.3.0
35
+ version: 1.3.2
47
36
  type: :development
48
37
  version_requirements: *id002
49
38
  description: |-
@@ -72,11 +61,11 @@ files:
72
61
  - lib/rjack-logback.rb
73
62
  - lib/rjack-logback/access.rb
74
63
  - test/test_logback.rb
75
- - lib/rjack-logback/logback-access-0.9.28.jar
76
- - lib/rjack-logback/logback-classic-0.9.28.jar
77
- - lib/rjack-logback/logback-core-0.9.28.jar
64
+ - lib/rjack-logback/logback-access-0.9.29.jar
65
+ - lib/rjack-logback/logback-classic-0.9.29.jar
66
+ - lib/rjack-logback/logback-core-0.9.29.jar
78
67
  has_rdoc: true
79
- homepage: http://rjack.rubyforge.org
68
+ homepage: http://rjack.rubyforge.org/logback
80
69
  licenses: []
81
70
 
82
71
  post_install_message:
@@ -86,23 +75,21 @@ rdoc_options:
86
75
  require_paths:
87
76
  - lib
88
77
  required_ruby_version: !ruby/object:Gem::Requirement
78
+ none: false
89
79
  requirements:
90
80
  - - ">="
91
81
  - !ruby/object:Gem::Version
92
- segments:
93
- - 0
94
82
  version: "0"
95
83
  required_rubygems_version: !ruby/object:Gem::Requirement
84
+ none: false
96
85
  requirements:
97
86
  - - ">="
98
87
  - !ruby/object:Gem::Version
99
- segments:
100
- - 0
101
88
  version: "0"
102
89
  requirements: []
103
90
 
104
- rubyforge_project: rjack
105
- rubygems_version: 1.3.6
91
+ rubyforge_project: rjack-logback
92
+ rubygems_version: 1.5.1
106
93
  signing_key:
107
94
  specification_version: 3
108
95
  summary: The Logback ruby gem packages the Logback[http://logback.qos.ch/] java log writer, and provides a JRuby facade for programmatic Logback setup