spawning-logger 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f4ef981ac63f9e56325a07b600f0c910365e95
-  data.tar.gz: d155eb095e22684f4b220232c82ae24119b342da
+  metadata.gz: 5180bc108488828c30fe2985510746039661769e
+  data.tar.gz: 1e3c97c4b6d10c7e95ecb75ab839db7084a6b19e
 SHA512:
-  metadata.gz: cb6c890b058918d0c8b9cfa8caaa87fabe3bf25d2b1d12b2d11154f3ef95ed876fe1ea7e500176cfa33a32457d2211e5d7e19f1bcd0055c1377c533369f93e62
-  data.tar.gz: 40f02dacfe6565478fd48d6b16058593fcc3e3a67f91cc11207299e86b77b7915c2f84043a399252de10f5100a23a2946905d0c19703e6075080a80f2626d483
+  metadata.gz: a80e2dcdf5c202e29be42ec051d72b086584c2fa37ace119a2e510ee6c871e2a3fe58616b7c66c25a869006ce63ce30d95a64ee20869ccb97e559d5749e23725
+  data.tar.gz: 92ed6206c004d1bc707e3096343e7b8cf6d581a7edfb8747e7b705f3b1d80a5c3eef5575896b8e7b9c0f709560cdc4966057b447710d017d8c4ba59180eb418a

data/lib/spawning_logger.rb

@@ -106,11 +106,14 @@ class SpawningLogger < ::Logger
   end
 
   # creates the logfile inside a subdir (optional).
-  def initialize(file_path, subdir = nil)
+  def initialize(file_path, debug = false)
     file_path = File.expand_path(file_path)
 
-    @log_dir = File.dirname(file_path)
+    @log_base_dir = File.dirname(file_path)
+
+    @log_dir = @log_base_dir
     @log_dir = File.join(@log_dir, @@subdir) unless @@subdir.nil?
+
     FileUtils.mkdir_p(@log_dir) if !Dir.exist?(@log_dir)
 
     @file_name = File.basename(file_path)
@@ -157,7 +160,8 @@ class SpawningLogger < ::Logger
       # add extension
       file_name = file_basename + File.extname(@file_name)
 
-      file_path = File.join(@log_dir, file_name)
+      # use base dir without subdir, because child logger adds it itself
+      file_path = File.join(@log_base_dir, file_name)
       self.class.new(file_path)
     end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 require 'logger'
 
 class SpawningLogger < ::Logger
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/spawning_logger_test.rb

@@ -4,16 +4,18 @@ require_relative "../lib/spawning_logger"
 class SpawningLoggerTest < MiniTest::Test
 
   def setup
-    @log_dir = Dir.mktmpdir('spawning_logger_test')
+    @log_base_dir = Dir.mktmpdir('spawning_logger_test')
+    @log_dir = File.join(@log_base_dir, 'test_subdir')
+
     @logfile_name = 'test_file.log'
-    @logfile_path = File.join(@log_dir, @logfile_name)
+    @logfile_path = File.join(@log_base_dir, @logfile_name)
     @child_id = 'childid'
 
     reset_logger_config
   end
 
   def teardown
-    FileUtils.remove_entry(@log_dir)
+    FileUtils.remove_entry(@log_base_dir)
     reset_logger_config
   end
 
@@ -23,9 +25,9 @@ class SpawningLoggerTest < MiniTest::Test
     SpawningLogger.configure do |config|
       config.subdir = subdir
     end
-    SpawningLogger.new(@logfile_path)
+    SpawningLogger.new(@logfile_path, true)
 
-    expected_dir = File.join(@log_dir, subdir)
+    expected_dir = File.join(@log_base_dir, subdir)
     expected_file = File.join(expected_dir, @logfile_name)
 
     assert File.exist?(expected_file)
@@ -33,6 +35,8 @@ class SpawningLoggerTest < MiniTest::Test
   end
 
   def test_spawn_interface_yields_logger_for_child_id
+    logger = SpawningLogger.new(@logfile_path)
+    logger.spawn('childid')
     assert_creates_log_file('test_file_childid.log')
   end
 
@@ -41,6 +45,9 @@ class SpawningLoggerTest < MiniTest::Test
       config.child_prefix = 'childprefix'
     end
 
+    logger = SpawningLogger.new(@logfile_path)
+    logger.spawn('childid')
+
     assert_creates_log_file('test_file_childprefix_childid.log')
   end
 
@@ -56,8 +63,10 @@ class SpawningLoggerTest < MiniTest::Test
     logger = SpawningLogger.new(@logfile_path)
     logger.self_and_spawn("childid", :error, "test_self_and_spawn_calls_both")
 
-    # make sure log message shows up in main logfile and in spawned logfile
-    [@logfile_path, File.join(@log_dir, 'test_file_childid.log')].each do |path|
+    parent_path = File.join(@log_dir, @logfile_name)
+    child_path = File.join(@log_dir, 'test_file_childid.log')
+
+    [parent_path, child_path].each do |path|
       result = File.read(path)
       assert_match(/test_self_and_spawn_calls_both/, result)
     end
@@ -81,11 +90,6 @@ class SpawningLoggerTest < MiniTest::Test
   protected
 
     def assert_creates_log_file(file_name)
-      logger = SpawningLogger.new(@logfile_path)
-      child_logger = logger.spawn(@child_id)
-
-      assert_kind_of(::Logger, child_logger)
-
       expected_path = File.join(@log_dir, file_name)
       assert File.exist?(expected_path)
     end
@@ -93,7 +97,7 @@ class SpawningLoggerTest < MiniTest::Test
     def reset_logger_config
       SpawningLogger.configure do |config|
         config.child_prefix = nil
-        config.subdir = nil
+        config.subdir = 'test_subdir'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spawning-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Markus Seeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake