filum 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426959005772065dfb25532dc64f4e9a947ac84b
-  data.tar.gz: 54089585bc896384ad9125ac370073433e842f5e
+  metadata.gz: 0c43cbb4c0a3529ad8e0e1b4ec868fc3927795ce
+  data.tar.gz: 02b286c120a26e3622a3c02b138db17cc86ed0ed
 SHA512:
-  metadata.gz: ba784e9ac29471e59f74186630f125042abb96a85d6bba4af164bc5953f5fec245ccf084fd3b39d8ce9ba9074f811dd22d153761c019507ca737b24b4760d7d1
-  data.tar.gz: e79a649b039a704ed1fc6cb7884c089c750a1d5908754d6544bfed40cb724744b8b36ffe820b552b4a78b1599a56cbc4c2f33ce79c59f34120669ae7fa334242
+  metadata.gz: a54fc4bc7dbdde39c63f832d9e0e4c2ca2a3f01dba257b7859ea0ccfd137749d15725492424b1628a369b2dc3bc182fe7ab609e145c06756777652fcf7518ec0
+  data.tar.gz: 12a0b5c4a8f065d642c27cf84255012e07452796ea22b9ace2ecd9cba14862867629cea82a7d7d7e536588728a3b8b92247c9f31c455ceb52bb5cc64ba45b4b2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+2.1.0 / 2014-07-12
+[FEATURE] Allow STDOUT as logging options
+
 2.0.0 / 2014-02-22
 [FEATURE] Remove config and add Filum.setup
 

data/lib/filum/logger.rb

@@ -19,6 +19,7 @@ module Filum
 
     private
     def create_log_directory
+      return unless @logfile.is_a?(String)
       dir = File.dirname(@logfile)
       unless File.directory?(dir)
         FileUtils.mkdir_p(dir)

data/lib/filum/version.rb

@@ -1,3 +1,3 @@
 module Filum
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/integration/integration_test_base.rb

@@ -0,0 +1,50 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Filum
+
+  class Worker
+    def self.process
+      Filum.logger.info "Processing"
+    end
+  end
+
+  module IntegrationTestBase
+
+    def test_one_logline
+      test_thread = Thread.new do
+        Filum.logger.context_id = "123456"
+        Worker.process
+      end
+      test_thread.join
+      assert_logged(/\[123456\]/)
+    end
+
+    def test_multiple_threads
+      test_thread1 = Thread.new do
+        Filum.logger.context_id = "23456a"
+        Worker.process
+      end
+      test_thread2 = Thread.new do
+        Filum.logger.context_id = "34567a"
+        Worker.process
+      end
+      test_thread1.join
+      test_thread2.join
+      assert_logged(/\[23456a\]/)
+      assert_logged(/\[34567a\]/)
+    end
+
+    def test_info_string_is_correct
+      random_string = [*'a'..'z'].sample(10).join
+      Filum.logger.info "Foobar #{random_string}"
+      assert_logged(/Foobar #{random_string}$/)
+    end
+
+    def test_caller_line_is_correct
+      expected_file = 'integration_test_...'
+      expected_line = __LINE__+1
+      Filum.logger.info "Foobar"
+      assert_logged(/#{expected_file}:#{expected_line}/)
+    end
+  end
+end

data/test/integration/logger_test.rb

@@ -1,52 +1,16 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative 'integration_test_base'
 
 module Filum
 
-  class Worker
-    def self.process
-      Filum.logger.info "Processing"
-    end
-  end
-
-  class LoggerTest < IntegrationTest
-    def test_one_logline
-      test_thread = Thread.new do
-        Filum.logger.context_id = "123456"
-        Worker.process
-      end
-      test_thread.join
-      assert_logged(/\[123456\]/)
-    end
-
-    def test_multiple_threads
-      test_thread1 = Thread.new do
-        Filum.logger.context_id = "23456a"
-        Worker.process
-      end
-      test_thread2 = Thread.new do
-        Filum.logger.context_id = "34567a"
-        Worker.process
-      end
-      test_thread1.join
-      test_thread2.join
-      assert_logged(/\[23456a\]/)
-      assert_logged(/\[34567a\]/)
-    end
-
-    def test_info_string_is_correct
-      random_string = [*'a'..'z'].sample(10).join
-      Filum.logger.info "Foobar #{random_string}"
-      assert_logged(/Foobar #{random_string}$/)
-    end
+  class LoggerTest < Minitest::Test
+    include IntegrationTestBase
+    protected
 
-    def test_caller_line_is_correct
-      expected_file = 'logger_test.rb'
-      expected_line = __LINE__+1
-      Filum.logger.info "Foobar"
-      assert_logged(/#{expected_file}:#{expected_line}/)
+    def setup
+      super
+      Filum.setup("/tmp/log/filum_test_#{Time.now.to_i}.log")
     end
 
-    private
     def assert_logged(regex)
       assert File.readlines(Filum.logger.logfile).grep(regex).size == 1
     end

data/test/integration/stdout_logger_test.rb

@@ -0,0 +1,31 @@
+require_relative 'integration_test_base'
+
+module Filum
+
+  class StdOutLoggerTest < Minitest::Test
+    include IntegrationTestBase
+
+    def setup
+      super
+
+      @filename = "/tmp/log/filum_stdout_test_#{Time.now.to_i}.log"
+      $stdout.expects(:write).at_least_once.with do |data|
+        File.open(@filename, "a") do |file|
+          file.write(data)
+        end
+      end
+
+      Filum.setup($stdout)
+    end
+
+    def teardown
+      super
+      mocha_teardown
+    end
+
+    def assert_logged(regex)
+      assert File.readlines(@filename).grep(regex).size == 1
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filum
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - MalcyL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,8 +99,9 @@ files:
 - lib/filum/log_formatter.rb
 - lib/filum/logger.rb
 - lib/filum/version.rb
-- test/integration/integration_test.rb
+- test/integration/integration_test_base.rb
 - test/integration/logger_test.rb
+- test/integration/stdout_logger_test.rb
 - test/test_helper.rb
 - test/unit/filum_test.rb
 - test/unit/log_formatter_test.rb
@@ -130,8 +131,9 @@ signing_key:
 specification_version: 4
 summary: Identifies the context of log lines using a context id stored in Thread local
 test_files:
-- test/integration/integration_test.rb
+- test/integration/integration_test_base.rb
 - test/integration/logger_test.rb
+- test/integration/stdout_logger_test.rb
 - test/test_helper.rb
 - test/unit/filum_test.rb
 - test/unit/log_formatter_test.rb

data/test/integration/integration_test.rb

@@ -1,11 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-module Filum
-
-  class IntegrationTest < Minitest::Test
-    def setup
-      super
-      Filum.setup("/tmp/log/filum_test_#{Time.now.to_i}.log")
-    end
-  end
-end