logging 1.5.1 → 1.5.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.5.2 / 2011-07-07
+
+Bug Fixes
+- Changing working directory breaks rolling file appenders [issue #8]
+
 == 1.5.1 / 2011-06-03
 
 Bug Fixes

data/lib/logging/appenders/file.rb

@@ -42,6 +42,8 @@ module Logging::Appenders
     def initialize( name, opts = {} )
       @fn = opts.getopt(:filename, name)
       raise ArgumentError, 'no filename was given' if @fn.nil?
+
+      @fn = ::File.expand_path(@fn)
       self.class.assert_valid_logfile(@fn)
       @mode = opts.getopt(:truncate) ? 'w' : 'a'
 

data/lib/logging/appenders/rolling_file.rb

@@ -69,8 +69,10 @@ module Logging::Appenders
     def initialize( name, opts = {} )
       # raise an error if a filename was not given
       @fn = opts.getopt(:filename, name)
-      @fn_copy = @fn + '._copy_'
       raise ArgumentError, 'no filename was given' if @fn.nil?
+
+      @fn = ::File.expand_path(@fn)
+      @fn_copy = @fn + '._copy_'
       ::Logging::Appenders::File.assert_valid_logfile(@fn)
 
       # grab our options

data/test/appenders/test_file.rb

@@ -43,7 +43,7 @@ module TestAppenders
       log = File.join(TMP, 'file.log')
       appender = Logging.appenders.file(NAME, 'filename' => log)
       assert_equal 'logfile', appender.name
-      assert_equal log, appender.filename
+      assert_equal ::File.expand_path(log), appender.filename
       appender << "This will be the first line\n"
       appender << "This will be the second line\n"
       appender.flush
@@ -56,7 +56,7 @@ module TestAppenders
 
       appender = Logging.appenders.file(NAME, :filename => log)
       assert_equal 'logfile', appender.name
-      assert_equal log, appender.filename
+      assert_equal ::File.expand_path(log), appender.filename
       appender << "This will be the third line\n"
       appender.flush
       File.open(log, 'r') do |file|
@@ -79,7 +79,23 @@ module TestAppenders
       cleanup
     end
 
-    private
+    def test_changing_directories
+      log = File.join(TMP, 'file.log')
+      appender = Logging.appenders.file(NAME, 'filename' => log)
+
+      assert_equal 'logfile', appender.name
+      assert_equal ::File.expand_path(log), appender.filename
+
+      begin
+        pwd = Dir.pwd
+        Dir.chdir TMP
+        assert_nothing_raised { appender.reopen }
+      ensure
+        Dir.chdir pwd
+      end
+    end
+
+  private
     def cleanup
       unless Logging.appenders[NAME].nil?
         Logging.appenders[NAME].close false
@@ -87,9 +103,8 @@ module TestAppenders
       end
     end
 
-  end  # class TestFile
+  end  # TestFile
 
-end  # module TestAppenders
-end  # module TestLogging
+end  # TestAppenders
+end  # TestLogging
 
-# EOF

data/test/appenders/test_rolling_file.rb

@@ -13,9 +13,9 @@ module TestAppenders
       super
       Logging.init
 
-      @fn = File.join(TMP, 'test.log')
-      @fn_fmt = File.join(TMP, 'test.%d.log')
-      @glob = File.join(TMP, '*.log')
+      @fn = File.expand_path('test.log', TMP)
+      @fn_fmt = File.expand_path('test.%d.log', TMP)
+      @glob = File.expand_path('*.log', TMP)
     end
 
     def test_initialize
@@ -194,7 +194,24 @@ module TestAppenders
       assert_equal 100, File.size(@fn)
     end
 
-    private
+    def test_changing_directories
+      ap = Logging.appenders.rolling_file(NAME, :filename => @fn, :size => 100)
+
+      begin
+        pwd = Dir.pwd
+        Dir.chdir TMP
+
+        ap << 'X' * 100; ap.flush
+        assert_equal 1, Dir.glob(@glob).length
+
+        ap << 'X'; ap.flush
+        assert_equal 2, Dir.glob(@glob).length
+      ensure
+        Dir.chdir pwd
+      end
+    end
+
+  private
     def cleanup
       unless Logging.appenders[NAME].nil?
         Logging.appenders[NAME].close false
@@ -202,8 +219,7 @@ module TestAppenders
       end
     end
 
-  end  # class TestRollingFile
-end  # module TestAppenders
-end  # module TestLogging
+  end  # TestRollingFile
+end  # TestAppenders
+end  # TestLogging
 
-# EOF

data/test/setup.rb

@@ -29,15 +29,14 @@ module LoggingTestCase
     FileUtils.rm_rf TMP
     FileUtils.mkdir TMP
   end
-    
+
   def teardown
     super
     FileUtils.rm_rf TMP
   end
 
-end  # module LoggingTestCase
-end  # module TestLogging
+end  # LoggingTestCase
+end  # TestLogging
 
-end  # unless defined?
+end  # defined?
 
-# EOF

data/test/test_logging.rb

@@ -57,7 +57,7 @@ module TestLogging
       logfile = ::Logging::Appenders['logfile']
       assert_instance_of ::Logging::Appenders::File, logfile
       assert_equal 0, logfile.level
-      assert_equal 'tmp/temp.log', logfile.instance_variable_get(:@fn)
+      assert_equal ::File.expand_path('tmp/temp.log'), logfile.instance_variable_get(:@fn)
 
       layout = logfile.layout
       assert_instance_of ::Logging::Layouts::Pattern, layout

data/version.txt

@@ -1 +1 @@
-1.5.1
+1.5.2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -06:00
+date: 2011-07-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency