logging 2.0.0 → 2.3.0

data/lib/logging/proxy.rb

@@ -47,7 +47,7 @@ module Logging
 
     # All hail the magic of method missing. Here is where we are going to log
     # the method call and then forward to the proxied object. The return value
-    # from the proxied objet method call is passed back.
+    # from the proxied object method call is passed back.
     #
     def method_missing( name, *args, &block )
       @logger << "#@leader#{name}(#{args.inspect[1..-2]})\n"

data/lib/logging/rails_compat.rb

@@ -1,6 +1,3 @@
-
-if defined? ActiveSupport
-
 module Logging
 
   # Rails compatibility module.
@@ -9,10 +6,9 @@ module Logging
   # some Rails extensions expect these methods to exist. Those methods are
   # implemented in this module and included in the Logging::Logger class when
   # the ActiveSupport gem is present.
-  #
   module RailsCompat
 
-    # A no-op implementation of the +formatter+ method.
+    # A no-op implementation of the `formatter` method.
     def formatter; end
 
     # A no-op implementation of the +silence+ method. Setting of log levels
@@ -20,17 +16,12 @@ module Logging
     # opinion that overriding the log level programmatically is a logical
     # error.
     #
-    # Please see https://github.com/TwP/logging/issues/11 for a more detail
+    # Please see https://github.com/TwP/logging/issues/11 for a more detailed
     # discussion of the issue.
-    #
     def silence( *args )
       yield self
     end
-
-  end  # RailsCompat
+  end
 
   Logger.send :include, RailsCompat
-
-end  # Logging
-end  # if defined?
-
+end

data/lib/logging/version.rb

@@ -1,5 +1,5 @@
 module Logging
-  VERSION = "2.0.0".freeze
+  VERSION = "2.3.0".freeze
 
   # Returns the version string for the library.
   def self.version

data/logging.gemspec

@@ -1,46 +1,45 @@
 # -*- encoding: utf-8 -*-
-# stub: logging 2.0.0 ruby lib
+# stub: logging 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "logging"
-  s.version = "2.0.0"
+  s.name = "logging".freeze
+  s.version = "2.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Tim Pease"]
-  s.date = "2015-03-29"
-  s.description = "Logging is a flexible logging library for use in Ruby programs based on the\ndesign of Java's log4j library. It features a hierarchical logging system,\ncustom level names, multiple output destinations per log event, custom\nformatting, and more."
-  s.email = "tim.pease@gmail.com"
-  s.extra_rdoc_files = ["History.txt"]
-  s.files = [".gitignore", ".travis.yml", "History.txt", "README.md", "Rakefile", "examples/appenders.rb", "examples/classes.rb", "examples/colorization.rb", "examples/custom_log_levels.rb", "examples/fork.rb", "examples/formatting.rb", "examples/hierarchies.rb", "examples/layouts.rb", "examples/lazy.rb", "examples/loggers.rb", "examples/mdc.rb", "examples/names.rb", "examples/rspec_integration.rb", "examples/simple.rb", "lib/logging.rb", "lib/logging/appender.rb", "lib/logging/appenders.rb", "lib/logging/appenders/buffering.rb", "lib/logging/appenders/console.rb", "lib/logging/appenders/file.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/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", "lib/logging/layouts/parseable.rb", "lib/logging/layouts/pattern.rb", "lib/logging/log_event.rb", "lib/logging/logger.rb", "lib/logging/proxy.rb", "lib/logging/rails_compat.rb", "lib/logging/repository.rb", "lib/logging/root_logger.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_file.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/layouts/test_basic.rb", "test/layouts/test_color_pattern.rb", "test/layouts/test_json.rb", "test/layouts/test_pattern.rb", "test/layouts/test_yaml.rb", "test/setup.rb", "test/test_appender.rb", "test/test_color_scheme.rb", "test/test_filter.rb", "test/test_layout.rb", "test/test_log_event.rb", "test/test_logger.rb", "test/test_logging.rb", "test/test_mapped_diagnostic_context.rb", "test/test_nested_diagnostic_context.rb", "test/test_proxy.rb", "test/test_repository.rb", "test/test_root_logger.rb", "test/test_utils.rb"]
-  s.homepage = "http://rubygems.org/gems/logging"
-  s.rdoc_options = ["--main", "README.md"]
-  s.rubyforge_project = "logging"
-  s.rubygems_version = "2.2.2"
-  s.summary = "A flexible and extendable logging library for Ruby"
-  s.test_files = ["test/appenders/test_buffered_io.rb", "test/appenders/test_console.rb", "test/appenders/test_file.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/layouts/test_basic.rb", "test/layouts/test_color_pattern.rb", "test/layouts/test_json.rb", "test/layouts/test_pattern.rb", "test/layouts/test_yaml.rb", "test/test_appender.rb", "test/test_color_scheme.rb", "test/test_filter.rb", "test/test_layout.rb", "test/test_log_event.rb", "test/test_logger.rb", "test/test_logging.rb", "test/test_mapped_diagnostic_context.rb", "test/test_nested_diagnostic_context.rb", "test/test_proxy.rb", "test/test_repository.rb", "test/test_root_logger.rb", "test/test_utils.rb"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Tim Pease".freeze]
+  s.date = "2020-07-04"
+  s.description = "**Logging** is a flexible logging library for use in Ruby programs based on the\ndesign of Java's log4j library. It features a hierarchical logging system,\ncustom level names, multiple output destinations per log event, custom\nformatting, and more.".freeze
+  s.email = "tim.pease@gmail.com".freeze
+  s.extra_rdoc_files = ["History.txt".freeze]
+  s.files = [".gitignore".freeze, ".travis.yml".freeze, "History.txt".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "examples/appenders.rb".freeze, "examples/classes.rb".freeze, "examples/colorization.rb".freeze, "examples/custom_log_levels.rb".freeze, "examples/fork.rb".freeze, "examples/formatting.rb".freeze, "examples/hierarchies.rb".freeze, "examples/layouts.rb".freeze, "examples/lazy.rb".freeze, "examples/loggers.rb".freeze, "examples/mdc.rb".freeze, "examples/names.rb".freeze, "examples/rails4.rb".freeze, "examples/reusing_layouts.rb".freeze, "examples/rspec_integration.rb".freeze, "examples/simple.rb".freeze, "lib/logging.rb".freeze, "lib/logging/appender.rb".freeze, "lib/logging/appenders.rb".freeze, "lib/logging/appenders/buffering.rb".freeze, "lib/logging/appenders/console.rb".freeze, "lib/logging/appenders/file.rb".freeze, "lib/logging/appenders/io.rb".freeze, "lib/logging/appenders/rolling_file.rb".freeze, "lib/logging/appenders/string_io.rb".freeze, "lib/logging/appenders/syslog.rb".freeze, "lib/logging/color_scheme.rb".freeze, "lib/logging/diagnostic_context.rb".freeze, "lib/logging/filter.rb".freeze, "lib/logging/filters.rb".freeze, "lib/logging/filters/level.rb".freeze, "lib/logging/layout.rb".freeze, "lib/logging/layouts.rb".freeze, "lib/logging/layouts/basic.rb".freeze, "lib/logging/layouts/parseable.rb".freeze, "lib/logging/layouts/pattern.rb".freeze, "lib/logging/log_event.rb".freeze, "lib/logging/logger.rb".freeze, "lib/logging/proxy.rb".freeze, "lib/logging/rails_compat.rb".freeze, "lib/logging/repository.rb".freeze, "lib/logging/root_logger.rb".freeze, "lib/logging/utils.rb".freeze, "lib/logging/version.rb".freeze, "lib/rspec/logging_helper.rb".freeze, "lib/spec/logging_helper.rb".freeze, "logging.gemspec".freeze, "script/bootstrap".freeze, "script/console".freeze, "test/appenders/test_async_flushing.rb".freeze, "test/appenders/test_buffered_io.rb".freeze, "test/appenders/test_console.rb".freeze, "test/appenders/test_file.rb".freeze, "test/appenders/test_io.rb".freeze, "test/appenders/test_rolling_file.rb".freeze, "test/appenders/test_string_io.rb".freeze, "test/appenders/test_syslog.rb".freeze, "test/benchmark.rb".freeze, "test/layouts/test_basic.rb".freeze, "test/layouts/test_color_pattern.rb".freeze, "test/layouts/test_json.rb".freeze, "test/layouts/test_nested_exceptions.rb".freeze, "test/layouts/test_pattern.rb".freeze, "test/layouts/test_yaml.rb".freeze, "test/performance.rb".freeze, "test/setup.rb".freeze, "test/test_appender.rb".freeze, "test/test_color_scheme.rb".freeze, "test/test_filter.rb".freeze, "test/test_layout.rb".freeze, "test/test_log_event.rb".freeze, "test/test_logger.rb".freeze, "test/test_logging.rb".freeze, "test/test_mapped_diagnostic_context.rb".freeze, "test/test_nested_diagnostic_context.rb".freeze, "test/test_proxy.rb".freeze, "test/test_repository.rb".freeze, "test/test_root_logger.rb".freeze, "test/test_utils.rb".freeze]
+  s.homepage = "http://rubygems.org/gems/logging".freeze
+  s.rdoc_options = ["--main".freeze, "README.md".freeze]
+  s.rubygems_version = "3.0.1".freeze
+  s.summary = "A flexible and extendable logging library for Ruby".freeze
+  s.test_files = ["test/appenders/test_async_flushing.rb".freeze, "test/appenders/test_buffered_io.rb".freeze, "test/appenders/test_console.rb".freeze, "test/appenders/test_file.rb".freeze, "test/appenders/test_io.rb".freeze, "test/appenders/test_rolling_file.rb".freeze, "test/appenders/test_string_io.rb".freeze, "test/appenders/test_syslog.rb".freeze, "test/layouts/test_basic.rb".freeze, "test/layouts/test_color_pattern.rb".freeze, "test/layouts/test_json.rb".freeze, "test/layouts/test_nested_exceptions.rb".freeze, "test/layouts/test_pattern.rb".freeze, "test/layouts/test_yaml.rb".freeze, "test/test_appender.rb".freeze, "test/test_color_scheme.rb".freeze, "test/test_filter.rb".freeze, "test/test_layout.rb".freeze, "test/test_log_event.rb".freeze, "test/test_logger.rb".freeze, "test/test_logging.rb".freeze, "test/test_mapped_diagnostic_context.rb".freeze, "test/test_nested_diagnostic_context.rb".freeze, "test/test_proxy.rb".freeze, "test/test_repository.rb".freeze, "test/test_root_logger.rb".freeze, "test/test_utils.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<little-plugger>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.10"])
-      s.add_development_dependency(%q<flexmock>, ["~> 1.0"])
-      s.add_development_dependency(%q<bones-git>, ["~> 1.3"])
-      s.add_development_dependency(%q<bones>, [">= 3.8.3"])
+      s.add_runtime_dependency(%q<little-plugger>.freeze, ["~> 1.1"])
+      s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.14"])
+      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.3"])
+      s.add_development_dependency(%q<bones-git>.freeze, ["~> 1.3"])
+      s.add_development_dependency(%q<bones>.freeze, [">= 3.8.4"])
     else
-      s.add_dependency(%q<little-plugger>, ["~> 1.1"])
-      s.add_dependency(%q<multi_json>, ["~> 1.10"])
-      s.add_dependency(%q<flexmock>, ["~> 1.0"])
-      s.add_dependency(%q<bones-git>, ["~> 1.3"])
-      s.add_dependency(%q<bones>, [">= 3.8.3"])
+      s.add_dependency(%q<little-plugger>.freeze, ["~> 1.1"])
+      s.add_dependency(%q<multi_json>.freeze, ["~> 1.14"])
+      s.add_dependency(%q<test-unit>.freeze, ["~> 3.3"])
+      s.add_dependency(%q<bones-git>.freeze, ["~> 1.3"])
+      s.add_dependency(%q<bones>.freeze, [">= 3.8.4"])
     end
   else
-    s.add_dependency(%q<little-plugger>, ["~> 1.1"])
-    s.add_dependency(%q<multi_json>, ["~> 1.10"])
-    s.add_dependency(%q<flexmock>, ["~> 1.0"])
-    s.add_dependency(%q<bones-git>, ["~> 1.3"])
-    s.add_dependency(%q<bones>, [">= 3.8.3"])
+    s.add_dependency(%q<little-plugger>.freeze, ["~> 1.1"])
+    s.add_dependency(%q<multi_json>.freeze, ["~> 1.14"])
+    s.add_dependency(%q<test-unit>.freeze, ["~> 3.3"])
+    s.add_dependency(%q<bones-git>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<bones>.freeze, [">= 3.8.4"])
   end
 end

data/script/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "irb"
+require "rubygems"
+
+$LOAD_PATH.unshift "lib"
+require "logging"
+
+IRB.start

data/test/appenders/{test_periodic_flushing.rb → test_async_flushing.rb}

@@ -4,14 +4,15 @@ require File.expand_path('../setup', File.dirname(__FILE__))
 module TestLogging
 module TestAppenders
 
-  class TestPeriodicFlushing < Test::Unit::TestCase
+  class TestAsyncFlushing < Test::Unit::TestCase
     include LoggingTestCase
 
     def setup
       super
-      @appender = Logging.appenders.string_io(
-        'test_appender', :flush_period => 2
-      )
+      @appender = Logging.appenders.string_io \
+        'test_appender',
+        :flush_period => 2
+
       @appender.clear
       @sio = @appender.sio
       @levels = Logging::LEVELS
@@ -42,12 +43,12 @@ module TestAppenders
       assert_equal 200, @appender.auto_flushing
     end
 
-    def test_periodic_flusher_running
-      flusher = @appender.instance_variable_get(:@periodic_flusher)
-      assert_instance_of Logging::Appenders::Buffering::PeriodicFlusher, flusher
+    def test_async_flusher_running
+      flusher = @appender.instance_variable_get(:@async_flusher)
+      assert_instance_of Logging::Appenders::Buffering::AsyncFlusher, flusher
 
       sleep 0.250  # give the flusher thread another moment to start
-      assert flusher.waiting?, 'the periodic flusher should be waiting for a signal'
+      assert flusher.waiting?, 'the async flusher should be waiting for a signal'
     end
 
     def test_append
@@ -129,13 +130,65 @@ module TestAppenders
       assert_nil(readline)
     end
 
-  private
-    def readline
-      @appender.readline
+    def test_setting_flush_period_to_nil
+      flusher = @appender.instance_variable_get(:@async_flusher)
+      assert_instance_of Logging::Appenders::Buffering::AsyncFlusher, flusher
+
+      @appender.flush_period = nil
+
+      assert_nil @appender.instance_variable_get(:@async_flusher)
     end
 
-  end  # class TestPeriodicFlushing
+    def test_setting_negative_flush_period
+      assert_raise(ArgumentError) { @appender.flush_period = -1 }
+    end
+
+    def test_async_writes
+      @appender.auto_flushing = 3
+      @appender.flush_period = nil
+      @appender.async = true
+
+      event = Logging::LogEvent.new('TestLogger', @levels['warn'],
+                                    [1, 2, 3, 4], false)
+
+      flusher = @appender.instance_variable_get(:@async_flusher)
+      assert_instance_of Logging::Appenders::Buffering::AsyncFlusher, flusher
 
-end  # module TestAppenders
-end  # module TestLogging
+      @appender.append event
+      assert_nil(readline)
 
+      event.level = @levels['debug']
+      event.data = 'the big log message'
+      @appender.append event
+      sleep 0.250
+      assert_nil(readline)
+
+      event.level = @levels['info']
+      event.data = 'just FYI'
+      @appender.append event  # might write here, might not
+      sleep 0.250             # so sleep a little to let the write occur
+
+      assert_equal " WARN  TestLogger : <Array> #{[1, 2, 3, 4]}\n", readline
+      assert_equal "DEBUG  TestLogger : the big log message\n", readline
+      assert_equal " INFO  TestLogger : just FYI\n", readline
+
+      event.level = @levels['warn']
+      event.data = 'this is your last warning!'
+      @appender.append event
+      assert_nil(readline)
+
+      @appender.close_method = :close_write
+      @appender.close
+
+      assert_equal " WARN  TestLogger : this is your last warning!\n", readline
+
+      assert_nil @appender.instance_variable_get(:@async_flusher)
+    end
+
+  private
+    def readline
+      @appender.readline
+    end
+  end
+end
+end

data/test/appenders/test_buffered_io.rb

@@ -10,9 +10,12 @@ module TestAppenders
 
     def setup
       super
-      @appender = Logging.appenders.string_io(
-        'test_appender', :auto_flushing => 3, :immediate_at => :error
-      )
+      @appender = Logging.appenders.string_io \
+        'test_appender',
+        :auto_flushing => 3,
+        :immediate_at  => :error,
+        :encoding      => 'UTF-8'
+
       @appender.clear
       @sio = @appender.sio
       @levels = Logging::LEVELS
@@ -191,24 +194,22 @@ module TestAppenders
       assert_nil(readline)
     end
 
-    if Object.const_defined?(:Encoding)
-      def test_force_encoding
-        a = 'ümlaut'
-        b = 'hello ümlaut'.force_encoding('BINARY')
+    def test_force_encoding
+      a = 'ümlaut'
+      b = 'hello ümlaut'.force_encoding('BINARY')
 
-        event_a = Logging::LogEvent.new('TestLogger', @levels['info'], a, false)
-        event_b = Logging::LogEvent.new('TestLogger', @levels['info'], b, false)
+      event_a = Logging::LogEvent.new('TestLogger', @levels['info'], a, false)
+      event_b = Logging::LogEvent.new('TestLogger', @levels['info'], b, false)
 
-        @appender.append event_a
-        @appender.append event_b
-        assert_nil(readline)
+      @appender.append event_a
+      @appender.append event_b
+      assert_nil(readline)
 
-        @appender.append event_a
-        assert_equal " INFO  TestLogger : #{a}\n", readline
-        assert_equal " INFO  TestLogger : #{b.force_encoding('UTF-8')}\n", readline
-        assert_equal " INFO  TestLogger : #{a}\n", readline
-        assert_nil(readline)
-      end
+      @appender.append event_a
+      assert_equal " INFO  TestLogger : #{a}\n", readline
+      assert_equal " INFO  TestLogger : #{b.force_encoding('UTF-8')}\n", readline
+      assert_equal " INFO  TestLogger : #{a}\n", readline
+      assert_nil(readline)
     end
 
   private

data/test/appenders/test_console.rb

@@ -4,6 +4,14 @@ require File.expand_path('../setup', File.dirname(__FILE__))
 module TestLogging
 module TestAppenders
 
+  class TestConsole < Test::Unit::TestCase
+    include LoggingTestCase
+
+    def test_initialize
+      assert_raise(RuntimeError) { Logging::Appenders::Console.new("test") }
+    end
+  end
+
   class TestStdout < Test::Unit::TestCase
     include LoggingTestCase
 
@@ -12,11 +20,10 @@ module TestAppenders
 
       appender = Logging.appenders.stdout
       assert_equal 'stdout', appender.name
-      assert_same STDOUT, appender.instance_variable_get(:@io)
 
-      appender.close
-      assert_equal true, appender.closed?
-      assert_equal false, STDOUT.closed?
+      io = appender.instance_variable_get(:@io)
+      refute_same STDOUT, io
+      assert_equal STDOUT.fileno, io.fileno
 
       appender = Logging.appenders.stdout('foo')
       assert_equal 'foo', appender.name
@@ -30,7 +37,26 @@ module TestAppenders
       assert_equal 3, appender.level
     end
 
-  end  # class TestStdout
+    def test_reopen
+      Logging::Repository.instance
+
+      appender = Logging.appenders.stdout
+      io = appender.instance_variable_get(:@io)
+
+      appender.close
+      assert appender.closed?
+      assert io.closed?
+      refute STDOUT.closed?
+
+      appender.reopen
+      refute appender.closed?
+
+      new_io = appender.instance_variable_get(:@io)
+      refute_same io, new_io
+      refute new_io.closed?
+      assert io.closed?
+    end
+  end
 
   class TestStderr < Test::Unit::TestCase
     include LoggingTestCase
@@ -40,11 +66,10 @@ module TestAppenders
 
       appender = Logging.appenders.stderr
       assert_equal 'stderr', appender.name
-      assert_same STDERR, appender.instance_variable_get(:@io)
 
-      appender.close
-      assert_equal true, appender.closed?
-      assert_equal false, STDERR.closed?
+      io = appender.instance_variable_get(:@io)
+      refute_same STDERR, io
+      assert_same STDERR.fileno, io.fileno
 
       appender = Logging.appenders.stderr('foo')
       assert_equal 'foo', appender.name
@@ -58,8 +83,26 @@ module TestAppenders
       assert_equal 3, appender.level
     end
 
-  end  # class TestStderr
+    def test_reopen
+      Logging::Repository.instance
 
-end  # module TestAppenders
-end  # module TestLogging
+      appender = Logging.appenders.stderr
+      io = appender.instance_variable_get(:@io)
+
+      appender.close
+      assert appender.closed?
+      assert io.closed?
+      refute STDERR.closed?
+
+      appender.reopen
+      refute appender.closed?
+
+      new_io = appender.instance_variable_get(:@io)
+      refute_same io, new_io
+      refute new_io.closed?
+      assert io.closed?
+    end
+  end
+end
+end
 

data/test/appenders/test_file.rb

@@ -14,34 +14,40 @@ module TestAppenders
       super
       Logging.init
 
-      FileUtils.mkdir [File.join(TMP, 'dir'), File.join(TMP, 'uw_dir')]
-      FileUtils.chmod 0555, File.join(TMP, 'uw_dir')
-      FileUtils.touch File.join(TMP, 'uw_file')
-      FileUtils.chmod 0444, File.join(TMP, 'uw_file')
+      FileUtils.mkdir [File.join(@tmpdir, 'dir'), File.join(@tmpdir, 'uw_dir')]
+      FileUtils.chmod 0555, File.join(@tmpdir, 'uw_dir')
+      FileUtils.touch File.join(@tmpdir, 'uw_file')
+      FileUtils.chmod 0444, File.join(@tmpdir, 'uw_file')
+    end
+
+    def test_factory_method_validates_input
+      assert_raise(ArgumentError) do
+        Logging.appenders.file
+      end
     end
 
     def test_class_assert_valid_logfile
-      log = File.join(TMP, 'uw_dir', 'file.log')
+      log = File.join(@tmpdir, 'uw_dir', 'file.log')
       assert_raise(ArgumentError) do
-        Logging.appenders.file.assert_valid_logfile(log)
+        Logging.appenders.file(log).class.assert_valid_logfile(log)
       end
 
-      log = File.join(TMP, 'dir')
+      log = File.join(@tmpdir, 'dir')
       assert_raise(ArgumentError) do
-        Logging.appenders.file.assert_valid_logfile(log)
+        Logging.appenders.file(log).class.assert_valid_logfile(log)
       end
 
-      log = File.join(TMP, 'uw_file')
+      log = File.join(@tmpdir, 'uw_file')
       assert_raise(ArgumentError) do
-        Logging.appenders.file.assert_valid_logfile(log)
+        Logging.appenders.file(log).class.assert_valid_logfile(log)
       end
 
-      log = File.join(TMP, 'file.log')
-      assert Logging.appenders.file.assert_valid_logfile(log)
+      log = File.join(@tmpdir, 'file.log')
+      assert Logging.appenders.file(log).class.assert_valid_logfile(log)
     end
 
     def test_initialize
-      log = File.join(TMP, 'file.log')
+      log = File.join(@tmpdir, 'file.log')
       appender = Logging.appenders.file(NAME, :filename => log)
       assert_equal 'logfile', appender.name
       assert_equal ::File.expand_path(log), appender.filename
@@ -81,7 +87,7 @@ module TestAppenders
     end
 
     def test_changing_directories
-      log = File.join(TMP, 'file.log')
+      log = File.join(@tmpdir, 'file.log')
       appender = Logging.appenders.file(NAME, :filename => log)
 
       assert_equal 'logfile', appender.name
@@ -89,30 +95,45 @@ module TestAppenders
 
       begin
         pwd = Dir.pwd
-        Dir.chdir TMP
+        Dir.chdir @tmpdir
         assert_nothing_raised { appender.reopen }
       ensure
         Dir.chdir pwd
       end
     end
 
-    if Object.const_defined? :Encoding
+    def test_encoding
+      log = File.join(@tmpdir, 'file-encoding.log')
+      appender = Logging.appenders.file(NAME, :filename => log, :encoding => 'ASCII')
+
+      appender << "A normal line of text\n"
+      appender << "ümlaut\n"
+      appender.close
 
-      def test_encoding
-        log = File.join(TMP, 'file-encoding.log')
-        #appender = Logging.appenders.file(NAME, :filename => log, :encoding => 'ISO-8859-16')
-        appender = Logging.appenders.file(NAME, :filename => log, :encoding => 'ASCII')
+      lines = File.readlines(log, :encoding => 'UTF-8')
+      assert_equal "A normal line of text\n", lines[0]
+      assert_equal "ümlaut\n", lines[1]
 
-        appender << "A normal line of text\n"
-        appender << "ümlaut\n"
-        appender.close
+      cleanup
+    end
 
-        lines = File.readlines(log)
-        assert_equal "A normal line of text\n", lines[0]
-        assert_equal "ümlaut\n", lines[1]
+    def test_reopening_should_not_truncate_the_file
+      log = File.join(@tmpdir, 'truncate.log')
+      appender = Logging.appenders.file(NAME, filename: log, truncate: true)
 
-        cleanup
+      appender << "This will be the first line\n"
+      appender << "This will be the second line\n"
+      appender << "This will be the third line\n"
+      appender.reopen
+
+      File.open(log, 'r') do |file|
+        assert_equal "This will be the first line\n", file.readline
+        assert_equal "This will be the second line\n", file.readline
+        assert_equal "This will be the third line\n", file.readline
+        assert_raise(EOFError) {file.readline}
       end
+
+      cleanup
     end
 
   private
@@ -122,7 +143,6 @@ module TestAppenders
         Logging.appenders[NAME] = nil
       end
     end
-
   end  # TestFile
 
 end  # TestAppenders