logging 1.8.2 → 2.0.0

data/test/test_logging.rb

@@ -39,65 +39,6 @@ module TestLogging
       assert_raise(ArgumentError) {::Logging.backtrace 'foo'}
     end
 
-    def test_configure
-      assert_raise(ArgumentError) {::Logging.configure 'blah.txt'}
-
-      ::Logging.configure 'data/logging.yaml'
-
-      names = %w[DEB INF PRT WRN ERR FAT]
-      assert_equal names, ::Logging::LNAMES
-      assert_equal :inspect, ::Logging::OBJ_FORMAT
-      assert_equal 3, ::Logging::Logger.root.level
-
-      # verify the appenders
-      h = ::Logging::Appenders.instance_variable_get :@appenders
-      assert_equal ['logfile', 'stderr'], h.keys.sort
-
-      # start with the File appender
-      logfile = ::Logging::Appenders['logfile']
-      assert_instance_of ::Logging::Appenders::File, logfile
-      assert_equal 0, logfile.level
-      assert_equal ::File.expand_path('tmp/temp.log'), logfile.instance_variable_get(:@fn)
-
-      layout = logfile.layout
-      assert_instance_of ::Logging::Layouts::Pattern, layout
-      assert_equal '[%d] %l  %c : %m\\n', layout.pattern
-      assert_equal 'to_s', layout.date_method
-      assert_nil layout.date_pattern
-
-      # and now the Stderr appender
-      stderr = ::Logging::Appenders['stderr']
-      assert_instance_of ::Logging::Appenders::Stderr, stderr
-      assert_equal 0, stderr.level
-
-      layout = stderr.layout
-      assert_instance_of ::Logging::Layouts::Basic, layout
-
-      # verify the loggers
-      h = ::Logging::Repository.instance.instance_variable_get :@h
-      assert_equal 4, h.length
-
-      # mylogger
-      mylogger = ::Logging::Logger['mylogger']
-      assert_equal 0, mylogger.level
-      assert_equal false, mylogger.additive
-      assert_equal false, mylogger.trace
-
-      appenders = mylogger.instance_variable_get :@appenders
-      assert_equal 2, appenders.length
-      assert_equal ['logfile', 'stderr'], appenders.map {|a| a.name}.sort
-
-      # yourlogger
-      yourlogger = ::Logging::Logger['yourlogger']
-      assert_equal 1, yourlogger.level
-      assert_equal true, yourlogger.additive
-      assert_equal false, yourlogger.trace
-
-      appenders = yourlogger.instance_variable_get :@appenders
-      assert_equal 2, appenders.length
-      assert_equal ['logfile', 'stderr'], appenders.map {|a| a.name}.sort
-    end
-
     def test_logger
       assert_raise(TypeError) {::Logging.logger []}
 

data/test/test_mapped_diagnostic_context.rb

@@ -30,6 +30,48 @@ module TestLogging
       assert_nil Logging.mdc['baz']
     end
 
+    def test_context_update
+      Logging.mdc.update(:foo => 'bar', :baz => 'buz')
+      assert_equal 'bar', Logging.mdc[:foo]
+      assert_equal 'buz', Logging.mdc[:baz]
+
+      Logging.mdc.update('foo' => 1, 'baz' => 2)
+      assert_equal 1, Logging.mdc[:foo]
+      assert_equal 2, Logging.mdc[:baz]
+
+      assert_equal 1, Logging.mdc.stack.length
+    end
+
+    def test_context_pushing
+      assert Logging.mdc.context.empty?
+      assert_equal 1, Logging.mdc.stack.length
+
+      Logging.mdc.push(:foo => 'bar', :baz => 'buz')
+      assert_equal 'bar', Logging.mdc[:foo]
+      assert_equal 'buz', Logging.mdc[:baz]
+      assert_equal 2, Logging.mdc.stack.length
+
+      Logging.mdc.push(:foo => 1, :baz => 2, :foobar => 3)
+      assert_equal 1, Logging.mdc[:foo]
+      assert_equal 2, Logging.mdc[:baz]
+      assert_equal 3, Logging.mdc[:foobar]
+      assert_equal 3, Logging.mdc.stack.length
+
+      Logging.mdc.pop
+      assert_equal 'bar', Logging.mdc[:foo]
+      assert_equal 'buz', Logging.mdc[:baz]
+      assert_nil Logging.mdc[:foobar]
+      assert_equal 2, Logging.mdc.stack.length
+
+      Logging.mdc.pop
+      assert Logging.mdc.context.empty?
+      assert_equal 1, Logging.mdc.stack.length
+
+      Logging.mdc.pop
+      assert Logging.mdc.context.empty?
+      assert_equal 1, Logging.mdc.stack.length
+    end
+
     def test_thread_uniqueness
       Logging.mdc['foo'] = 'bar'
       Logging.mdc['baz'] = 'buz'
@@ -56,18 +98,24 @@ module TestLogging
     def test_thread_inheritance
       Logging.mdc['foo'] = 'bar'
       Logging.mdc['baz'] = 'buz'
+      Logging.mdc.push(:foo => 1, 'foobar' => 'something else')
 
       t = Thread.new(Logging.mdc.context) { |context|
         sleep
 
         assert_not_equal context.object_id, Logging.mdc.context.object_id
 
-        assert_equal 'bar', Logging.mdc['foo']
+        assert_equal 1, Logging.mdc['foo']
         assert_equal 'buz', Logging.mdc['baz']
+        assert_equal 'something else', Logging.mdc['foobar']
         assert_nil Logging.mdc['unique']
+
+        assert_equal 1, Logging.mdc.stack.length
       }
 
       Thread.pass until t.status == 'sleep'
+
+      Logging.mdc.pop
       Logging.mdc['unique'] = 'value'
 
       t.run

data/test/test_nested_diagnostic_context.rb

@@ -30,6 +30,22 @@ module TestLogging
       assert ary.empty?
     end
 
+    def test_push_block
+      ary = Logging.ndc.context
+
+      Logging.ndc.push('first context') do
+        assert_equal 'first context', Logging.ndc.peek
+      end
+      assert ary.empty?
+
+      Logging.ndc.push('first context') do
+        assert_raise(ZeroDivisionError) do
+          Logging.ndc.push('first context') { 1/0 }
+        end
+      end
+      assert ary.empty?
+    end
+
     def test_clear
       ary = Logging.ndc.context
       assert ary.empty?
@@ -40,7 +56,6 @@ module TestLogging
 
       Logging.ndc.clear
       assert_nil Logging.ndc.peek
-      assert ary.empty?
     end
 
     def test_thread_uniqueness

data/test/test_repository.rb

@@ -56,6 +56,30 @@ module TestLogging
       assert @repo.has_logger?('A::B')
     end
 
+    def test_delete
+      %w(A A::B A::C A::B::D).each do |name|
+        ::Logging::Logger.new(name)
+      end
+
+      assert @repo.has_logger?('A')
+      assert @repo.has_logger?('A::B')
+      assert @repo.has_logger?('A::C')
+      assert @repo.has_logger?('A::B::D')
+
+      assert_raise(RuntimeError) {@repo.delete :root}
+      assert_raise(KeyError) {@repo.delete 'Does::Not::Exist'}
+
+      @repo.delete 'A'
+      assert !@repo.has_logger?('A')
+      assert_equal @repo[:root], @repo['A::B'].parent
+      assert_equal @repo[:root], @repo['A::C'].parent
+      assert_equal @repo['A::B'], @repo['A::B::D'].parent
+
+      @repo.delete 'A::B'
+      assert !@repo.has_logger?('A::B')
+      assert_equal @repo[:root], @repo['A::B::D'].parent
+    end
+
     def test_parent
       %w(A A::B A::B::C::D A::B::C::E A::B::C::F).each do |name|
         ::Logging::Logger.new(name)
@@ -120,38 +144,6 @@ module TestLogging
       assert_equal 'blah', @repo.to_key(:blah)
     end
 
-    def test_add_master
-      ary = @repo.instance_variable_get(:@masters)
-      assert ary.empty?
-
-      @repo.add_master 'root'
-      assert_equal [:root], ary
-
-      @repo.add_master Object, 'Foo'
-      assert_equal [:root, 'Object', 'Foo'], ary
-    end
-
-    def test_master_for
-      assert_nil @repo.master_for('root')
-      assert_nil @repo.master_for('Foo::Bar::Baz')
-
-      @repo.add_master('Foo')
-      assert_equal 'Foo', @repo.master_for('Foo')
-      assert_equal 'Foo', @repo.master_for('Foo::Bar::Baz')
-
-      @repo.add_master('Foo::Bar::Baz')
-      assert_equal 'Foo', @repo.master_for('Foo')
-      assert_equal 'Foo', @repo.master_for('Foo::Bar')
-      assert_equal 'Foo::Bar::Baz', @repo.master_for('Foo::Bar::Baz')
-      assert_equal 'Foo::Bar::Baz', @repo.master_for('Foo::Bar::Baz::Buz')
-
-      assert_nil @repo.master_for('Bar::Baz::Buz')
-      @repo.add_master 'root'
-      assert_equal :root, @repo.master_for('Bar::Baz::Buz')
-      assert_equal 'Foo', @repo.master_for('Foo::Bar')
-      assert_equal 'Foo::Bar::Baz', @repo.master_for('Foo::Bar::Baz::Buz')
-    end
-
   end  # class TestRepository
 end  # module TestLogging
 

data/test/test_utils.rb

@@ -5,82 +5,46 @@ module TestLogging
 
   class TestUtils < Test::Unit::TestCase
 
-    def test_hash_getopt
-      opts = {
-        :foo => 'foo_value',
-        'bar' => 'bar_value',
-        'one' => '1',
-        :two => '2',
-        :three => 3.0
-      }
-
-      assert_equal('foo_value', opts.getopt(:foo))
-      assert_equal('foo_value', opts.getopt('foo'))
-      assert_equal(:foo_value, opts.getopt(:foo, :as => Symbol))
-
-      assert_equal('bar_value', opts.getopt(:bar))
-      assert_equal('bar_value', opts.getopt('bar'))
-
-      assert_equal('1', opts.getopt(:one))
-      assert_equal(1, opts.getopt('one', :as => Integer))
-      assert_instance_of(Float, opts.getopt('one', :as => Float))
-
-      assert_equal('2', opts.getopt(:two))
-      assert_equal(['2'], opts.getopt(:two, :as => Array))
-
-      assert_equal(3.0, opts.getopt(:three))
-      assert_equal('3.0', opts.getopt('three', :as => String))
-
-      assert_equal(nil, opts.getopt(:baz))
-      assert_equal('default', opts.getopt('baz', 'default'))
-      assert_equal(:default, opts.getopt(:key, 'default', :as => Symbol))
-      assert_equal(['default'], opts.getopt('key', 'default', :as => Array))
-
-      assert_equal(3.0, opts.getopt(:three, :as => Object))
-
-      assert_nil opts.getopt(:key, :as => Symbol)
-    end
-
-    def test_string_reduce
+    def test_string_shrink
       str = 'this is the foobar string'
       len = str.length
 
-      r = str.reduce(len + 1)
+      r = str.shrink(len + 1)
       assert_same str, r
 
-      r = str.reduce(len)
+      r = str.shrink(len)
       assert_same str, r
 
-      r = str.reduce(len - 1)
+      r = str.shrink(len - 1)
       assert_equal 'this is the...bar string', r
 
-      r = str.reduce(len - 10)
+      r = str.shrink(len - 10)
       assert_equal 'this i...string', r
 
-      r = str.reduce(4)
+      r = str.shrink(4)
       assert_equal 't...', r
 
-      r = str.reduce(3)
+      r = str.shrink(3)
       assert_equal '...', r
 
-      r = str.reduce(0)
+      r = str.shrink(0)
       assert_equal '...', r
 
-      assert_raises(ArgumentError) { str.reduce(-1) }
+      assert_raises(ArgumentError) { str.shrink(-1) }
 
-      r = str.reduce(len - 1, '##')
+      r = str.shrink(len - 1, '##')
       assert_equal 'this is the##obar string', r
 
-      r = str.reduce(len - 10, '##')
+      r = str.shrink(len - 10, '##')
       assert_equal 'this is##string', r
 
-      r = str.reduce(4, '##')
+      r = str.shrink(4, '##')
       assert_equal 't##g', r
 
-      r = str.reduce(3, '##')
+      r = str.shrink(3, '##')
       assert_equal 't##', r
 
-      r = str.reduce(0, '##')
+      r = str.shrink(0, '##')
       assert_equal '##', r
     end
 

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: logging
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Pease
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bones-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bones
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.8.3
 description: |-
   Logging is a flexible logging library for use in Ruby programs based on the
   design of Java's log4j library. It features a hierarchical logging system,
@@ -90,22 +90,15 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - History.txt
-- README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - History.txt
-- README.rdoc
+- README.md
 - Rakefile
-- data/bad_logging_1.rb
-- data/bad_logging_2.rb
-- data/logging.rb
-- data/logging.yaml
-- data/simple_logging.rb
 - examples/appenders.rb
 - examples/classes.rb
 - examples/colorization.rb
-- examples/consolidation.rb
 - examples/custom_log_levels.rb
 - examples/fork.rb
 - examples/formatting.rb
@@ -122,17 +115,16 @@ files:
 - lib/logging/appenders.rb
 - lib/logging/appenders/buffering.rb
 - lib/logging/appenders/console.rb
-- lib/logging/appenders/email.rb
 - lib/logging/appenders/file.rb
-- lib/logging/appenders/growl.rb
 - lib/logging/appenders/io.rb
 - lib/logging/appenders/rolling_file.rb
 - lib/logging/appenders/string_io.rb
 - lib/logging/appenders/syslog.rb
 - lib/logging/color_scheme.rb
-- lib/logging/config/configurator.rb
-- lib/logging/config/yaml_configurator.rb
 - lib/logging/diagnostic_context.rb
+- lib/logging/filter.rb
+- lib/logging/filters.rb
+- lib/logging/filters/level.rb
 - lib/logging/layout.rb
 - lib/logging/layouts.rb
 - lib/logging/layouts/basic.rb
@@ -144,24 +136,21 @@ files:
 - lib/logging/rails_compat.rb
 - lib/logging/repository.rb
 - lib/logging/root_logger.rb
-- lib/logging/stats.rb
 - lib/logging/utils.rb
+- lib/logging/version.rb
 - lib/rspec/logging_helper.rb
 - lib/spec/logging_helper.rb
+- logging.gemspec
 - script/bootstrap
 - test/appenders/test_buffered_io.rb
 - test/appenders/test_console.rb
-- test/appenders/test_email.rb
 - test/appenders/test_file.rb
-- test/appenders/test_growl.rb
 - test/appenders/test_io.rb
 - test/appenders/test_periodic_flushing.rb
 - test/appenders/test_rolling_file.rb
 - test/appenders/test_string_io.rb
 - test/appenders/test_syslog.rb
 - test/benchmark.rb
-- test/config/test_configurator.rb
-- test/config/test_yaml_configurator.rb
 - test/layouts/test_basic.rb
 - test/layouts/test_color_pattern.rb
 - test/layouts/test_json.rb
@@ -170,7 +159,7 @@ files:
 - test/setup.rb
 - test/test_appender.rb
 - test/test_color_scheme.rb
-- test/test_consolidate.rb
+- test/test_filter.rb
 - test/test_layout.rb
 - test/test_log_event.rb
 - test/test_logger.rb
@@ -180,47 +169,41 @@ files:
 - test/test_proxy.rb
 - test/test_repository.rb
 - test/test_root_logger.rb
-- test/test_stats.rb
 - test/test_utils.rb
-- version.txt
 homepage: http://rubygems.org/gems/logging
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
-- README.rdoc
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: logging
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A flexible and extendable logging library for Ruby
 test_files:
 - test/appenders/test_buffered_io.rb
 - test/appenders/test_console.rb
-- test/appenders/test_email.rb
 - test/appenders/test_file.rb
-- test/appenders/test_growl.rb
 - test/appenders/test_io.rb
 - test/appenders/test_periodic_flushing.rb
 - test/appenders/test_rolling_file.rb
 - test/appenders/test_string_io.rb
 - test/appenders/test_syslog.rb
-- test/config/test_configurator.rb
-- test/config/test_yaml_configurator.rb
 - test/layouts/test_basic.rb
 - test/layouts/test_color_pattern.rb
 - test/layouts/test_json.rb
@@ -228,7 +211,7 @@ test_files:
 - test/layouts/test_yaml.rb
 - test/test_appender.rb
 - test/test_color_scheme.rb
-- test/test_consolidate.rb
+- test/test_filter.rb
 - test/test_layout.rb
 - test/test_log_event.rb
 - test/test_logger.rb
@@ -238,5 +221,4 @@ test_files:
 - test/test_proxy.rb
 - test/test_repository.rb
 - test/test_root_logger.rb
-- test/test_stats.rb
 - test/test_utils.rb