logging 2.1.0 → 2.2.0

data/lib/logging/layout.rb

@@ -41,7 +41,8 @@ class Layout
                   when :inspect, :yaml, :json; f
                   else :string end
 
-    self.backtrace = opts.fetch(:backtrace, ::Logging.backtrace)
+    self.backtrace  = opts.fetch(:backtrace,  ::Logging.backtrace)
+    self.utc_offset = opts.fetch(:utc_offset, ::Logging.utc_offset)
   end
 
   # call-seq:
@@ -63,6 +64,50 @@ class Layout
   attr_reader :backtrace
   alias :backtrace? :backtrace
 
+  # Set the UTC offset used when formatting time values. If left unset, the
+  # default local time zone will be used for time values. This method accepts
+  # the `utc_offset` format supported by the `Time#localtime` method in Ruby.
+  #
+  # Passing "UTC" or `0` as the UTC offset will cause all times to be reported
+  # in the UTC timezone.
+  #
+  #   layout.utc_offset = "-07:00"  # Mountain Standard Time in North America
+  #   layout.utc_offset = "+01:00"  # Central European Time
+  #   layout.utc_offset = "UTC"     # UTC
+  #   layout.utc_offset = 0         # UTC
+  #
+  def utc_offset=( value )
+    @utc_offset = case value
+      when nil;             nil
+      when "UTC", "GMT", 0; 0
+      else
+        Time.now.localtime(value)
+        value
+      end
+  end
+
+  # Returns the UTC offset.
+  attr_reader :utc_offset
+
+  # Internal: Helper method that applies the UTC offset to the given `time`
+  # instance. A new Time is returned that is equivalent to the original `time`
+  # but pinned to the timezone given by the UTC offset.
+  #
+  # If a UTC offset has not been set, then the original `time` instance is
+  # returned unchanged.
+  #
+  def apply_utc_offset( time )
+    return time if utc_offset.nil?
+
+    time = time.dup
+    if utc_offset == 0
+      time.utc
+    else
+      time.localtime(utc_offset)
+    end
+    time
+  end
+
   # call-seq:
   #    format( event )
   #

data/lib/logging/layouts/parseable.rb

@@ -177,8 +177,9 @@ module Logging::Layouts
     #
     # Creates a new Parseable layout using the following options:
     #
-    #    :style  => :json or :yaml
-    #    :items  => %w[timestamp level logger message]
+    #    :style      => :json or :yaml
+    #    :items      => %w[timestamp level logger message]
+    #    :utc_offset =>  "-06:00" or -21600 or "UTC"
     #
     def initialize( opts = {} )
       super
@@ -241,9 +242,11 @@ module Logging::Layouts
       else raise ArgumentError, "unknown format style '#@style'" end
     end
 
-    # Convert the given time _value_ into an ISO8601 formatted time string.
+    # Convert the given `time` into an ISO8601 formatted time string.
     #
-    def iso8601_format( value )
+    def iso8601_format( time )
+      value = apply_utc_offset(time)
+
       str = value.strftime('%Y-%m-%dT%H:%M:%S')
       str << ('.%06d' % value.usec)
 

data/lib/logging/layouts/pattern.rb

@@ -164,6 +164,7 @@ module Logging::Layouts
     def self.create_date_format_methods( pl )
       code = "undef :format_date if method_defined? :format_date\n"
       code << "def format_date( time )\n"
+      code << "time = apply_utc_offset(time)\n"
       if pl.date_method.nil?
         if pl.date_pattern =~ %r/%s/
           code << "time.strftime('#{pl.date_pattern.gsub('%s','%6N')}')\n"
@@ -203,7 +204,8 @@ module Logging::Layouts
     #
     #    :pattern       =>  "[%d] %-5l -- %c : %m\n"
     #    :date_pattern  =>  "%Y-%m-%d %H:%M:%S"
-    #    :date_method   =>  'usec' or 'to_s'
+    #    :date_method   =>  "usec" or "to_s"
+    #    :utc_offset    =>  "-06:00" or -21600 or "UTC"
     #    :color_scheme  =>  :default
     #
     # If used, :date_method will supersede :date_pattern.
@@ -216,7 +218,7 @@ module Logging::Layouts
     #
     def initialize( opts = {} )
       super
-      @created_at = Time.now
+      @created_at = Time.now.freeze
 
       @date_pattern = opts.fetch(:date_pattern, nil)
       @date_method = opts.fetch(:date_method, nil)

data/lib/logging/log_event.rb

@@ -2,8 +2,7 @@
 module Logging
 
   # This class defines a logging event.
-  #
-  LogEvent = Struct.new( :logger, :level, :data, :time, :file, :line, :method ) {
+  class LogEvent
     # :stopdoc:
 
     # Regular expression used to parse out caller information
@@ -16,6 +15,8 @@ module Logging
     CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION > '1.6') or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
     # :startdoc:
 
+    attr_accessor :logger, :level, :data, :time, :file, :line, :method
+
     # call-seq:
     #    LogEvent.new( logger, level, [data], caller_tracing )
     #
@@ -25,20 +26,26 @@ module Logging
     # invoked to get the execution trace of the logging method.
     #
     def initialize( logger, level, data, caller_tracing )
-      f = l = m = ''
+      self.logger = logger
+      self.level  = level
+      self.data   = data
+      self.time   = Time.now.freeze
 
       if caller_tracing
         stack = Kernel.caller[CALLER_INDEX]
         return if stack.nil?
 
         match = CALLER_RGXP.match(stack)
-        f = match[1]
-        l = Integer(match[2])
-        m = match[3] unless match[3].nil?
+        self.file   = match[1]
+        self.line   = Integer(match[2])
+        self.method = match[3] unless match[3].nil?
+
+        if (bp = ::Logging.basepath) && !bp.empty? && file.index(bp) == 0
+          self.file = file.slice(bp.length + 1, file.length - bp.length)
+        end
+      else
+        self.file = self.line = self.method = ''
       end
-
-      super(logger, level, data, Time.now, f, l, m)
     end
-  }
-end  # module Logging
-
+  end
+end

data/lib/logging/logger.rb

@@ -264,7 +264,7 @@ module Logging
     #    level = :all
     #
     # Set the level for this logger. The level can be either a +String+, a
-    # +Symbol+, or a +Fixnum+. An +ArgumentError+ is raised if this is not
+    # +Symbol+, or an +Integer+. An +ArgumentError+ is raised if this is not
     # the case.
     #
     # There are two special levels -- "all" and "off". The former will
@@ -294,7 +294,7 @@ module Logging
         else
           lvl = case level
                 when String, Symbol; ::Logging::level_num(level)
-                when Fixnum; level
+                when Integer; level
                 else
                   raise ArgumentError,
                         "level must be a String, Symbol, or Integer"

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.1.0".freeze
+  VERSION = "2.2.0".freeze
 
   # Returns the version string for the library.
   def self.version

data/logging.gemspec

@@ -1,47 +1,46 @@
 # -*- encoding: utf-8 -*-
-# stub: logging 2.0.0 ruby lib
+# stub: logging 2.1.0.48 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "logging"
-  s.version = "2.0.0"
+  s.name = "logging".freeze
+  s.version = "2.1.0.48"
 
-  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.license = "MIT"
-  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 = "2017-01-08"
+  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_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.rubyforge_project = "logging".freeze
+  s.rubygems_version = "2.5.2".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_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.10"])
+      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+      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.10"])
+      s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+      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.10"])
+    s.add_dependency(%q<test-unit>.freeze, ["~> 3.1"])
+    s.add_dependency(%q<bones-git>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<bones>.freeze, [">= 3.8.4"])
   end
 end

data/test/layouts/test_json.rb

@@ -166,6 +166,19 @@ module TestLayouts
       assert_match %r/"ndc":\[\]/, format
     end
 
+    def test_utc_offset
+      layout = Logging.layouts.json(:items => %w[timestamp])
+      event = Logging::LogEvent.new('TimestampLogger', @levels['info'], 'log message', false)
+      event.time = Time.utc(2016, 12, 1, 12, 0, 0).freeze
+
+      assert_equal %Q/{"timestamp":"2016-12-01T12:00:00.000000Z"}\n/, layout.format(event)
+
+      layout.utc_offset = "-06:00"
+      assert_equal %Q/{"timestamp":"2016-12-01T06:00:00.000000-06:00"}\n/, layout.format(event)
+
+      layout.utc_offset = "+01:00"
+      assert_equal %Q/{"timestamp":"2016-12-01T13:00:00.000000+01:00"}\n/, layout.format(event)
+    end
   end  # class TestJson
 end  # module TestLayouts
 end  # module TestLogging

data/test/layouts/test_pattern.rb

@@ -26,7 +26,7 @@ module TestLayouts
 
       @layout.date_method = 'usec'
       assert_equal 'usec', @layout.date_method
-      assert_instance_of Fixnum, @layout.format_date(Time.now)
+      assert_kind_of Integer, @layout.format_date(Time.now)
 
       @layout.date_method = :to_s
       assert_equal :to_s, @layout.date_method
@@ -38,7 +38,7 @@ module TestLayouts
 
       @layout.date_method = 'usec'
       assert_equal 'usec', @layout.date_method
-      assert_instance_of Fixnum, @layout.format_date(Time.now)
+      assert_kind_of Integer, @layout.format_date(Time.now)
     end
 
     def test_date_pattern
@@ -230,6 +230,19 @@ module TestLayouts
       assert_equal 'context a', @layout.format(event)
     end
 
+    def test_utc_offset
+      layout = Logging.layouts.pattern(:pattern => "%d", :utc_offset => "UTC")
+      event = Logging::LogEvent.new('DateLogger', @levels['info'], 'log message', false)
+      event.time = Time.utc(2016, 12, 1, 12, 0, 0).freeze
+
+      assert_equal "2016-12-01T12:00:00", layout.format(event)
+
+      layout.utc_offset = "-06:00"
+      assert_equal "2016-12-01T06:00:00", layout.format(event)
+
+      layout.utc_offset = "+01:00"
+      assert_equal "2016-12-01T13:00:00", layout.format(event)
+    end
   end  # TestBasic
 end  # TestLayouts
 end  # TestLogging

data/test/layouts/test_yaml.rb

@@ -148,6 +148,20 @@ module TestLayouts
       assert_match %r/\nndc: \[\]\n/, format
     end
 
+    def test_utc_offset
+      layout = Logging.layouts.yaml(:items => %w[timestamp])
+      event = Logging::LogEvent.new('TimestampLogger', @levels['info'], 'log message', false)
+      event.time = Time.utc(2016, 12, 1, 12, 0, 0).freeze
+
+      assert_equal %Q{---\ntimestamp: '2016-12-01T12:00:00.000000Z'\n}, layout.format(event)
+
+      layout.utc_offset = "-06:00"
+      assert_equal %Q{---\ntimestamp: '2016-12-01T06:00:00.000000-06:00'\n}, layout.format(event)
+
+      layout.utc_offset = "+01:00"
+      assert_equal %Q{---\ntimestamp: '2016-12-01T13:00:00.000000+01:00'\n}, layout.format(event)
+    end
+
   private
 
     def assert_yaml_match( expected, actual )

data/test/test_layout.rb

@@ -120,6 +120,46 @@ module TestLogging
       @layout.backtrace = 'on'
       assert_equal true, @layout.backtrace
     end
+
+    def test_utc_offset
+      assert_nil @layout.utc_offset
+
+      @layout.utc_offset = 0
+      assert_equal 0, @layout.utc_offset
+
+      @layout.utc_offset = "UTC"
+      assert_equal 0, @layout.utc_offset
+
+      @layout.utc_offset = "+01:00"
+      assert_equal "+01:00", @layout.utc_offset
+
+      assert_raise(ArgumentError) {@layout.utc_offset = "06:00"}
+
+      @layout.utc_offset   = nil
+      ::Logging.utc_offset = "UTC"
+      assert_nil @layout.utc_offset
+
+      layout = ::Logging::Layout.new
+      assert_equal 0, layout.utc_offset
+    end
+
+    def test_apply_utc_offset
+      time = Time.now.freeze
+
+      offset_time = @layout.apply_utc_offset(time)
+      assert_same time, offset_time
+
+      @layout.utc_offset = "UTC"
+      offset_time = @layout.apply_utc_offset(time)
+      assert_not_same time, offset_time
+      assert offset_time.utc?
+
+      @layout.utc_offset = "+01:00"
+      offset_time = @layout.apply_utc_offset(time)
+      assert_not_same time, offset_time
+      assert !offset_time.utc?
+      assert_equal 3600, offset_time.utc_offset
+    end
   end  # class TestLayout
 end  # module TestLogging
 

data/test/test_log_event.rb

@@ -34,6 +34,14 @@ module TestLogging
       assert_match %r/test_log_event.rb\z/, @appender.event.file
     end
 
+    def test_file_with_basepath
+      ::Logging.basepath = File.expand_path("../../", __FILE__)
+
+      @logger.caller_tracing = true
+      @logger.warn "warning message"
+      assert_equal "test/test_log_event.rb", @appender.event.file
+    end
+
     def test_level
       assert_equal 1, @event.level
     end