flnt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f597c1c684124be6cbbc17b8b2fa388aa68ea6
-  data.tar.gz: 1f2b8774e99a066dcafd5032b1e0fd2d9447c109
+  metadata.gz: b571a4742a35bac7d8b9b94fdd9f764ba19d3f95
+  data.tar.gz: 6795af010a0846ef8250a3a27fb64b292cc4baab
 SHA512:
-  metadata.gz: 7dd93d150a0e618ca658560ae9b98d13b5c58c345899dfbda1f2d3c590a223850ed613333c00aaf0bbc89c32af27fb520b0b5e1c9596f406d0edc552bcab637e
-  data.tar.gz: b3d4a5c6cd88a13509e93a8351d6393966cecced7b23016c9ee0b754500ad9baf2c0c796e13564f91b8c0fbecc1da799a6c58443fb1d8d8df8233e639b95add1
+  metadata.gz: 04d5b1811f70c88b598ad5690565dff3a259dd741543c885848f7cc91f2f93467bedce0282003ac55a21cb6e0ba73d3f313f434ddd929fef24184f61d49efc0d
+  data.tar.gz: f1f7dedc3d305b4a255a72fa53479a2ad70c3d848369b70f79b8a5c3c678757ed5c9573f2188d3bd53b9ecff5e82906a79253343d1b7c47dd2cd4b96f84ef03a

data/flnt.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
 
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", ">= 3.1"
+  spec.add_development_dependency "rspec-mocks"
 end

data/lib/flnt.rb

@@ -1,5 +1,6 @@
 require "flnt/version"
 require "flnt/logger"
+require "flnt/teeable_logger"
 require "flnt/configuration"
 
 module Flnt
@@ -10,7 +11,9 @@ module Flnt
       (BasicObject.instance_methods + BasicObject.private_instance_methods)).
       delete_if {|method_name| method_name.to_s =~ /([\-\[\]\/~=+*&|%<>!?])/}.
       each do |target_method|
-      if target_method.to_sym != :object_id
+
+      # Also pass the :singleton_class to avoid rspec stubbing errors
+      unless [:singleton_class, :object_id].include?(target_method.to_sym)
         eval %Q(undef #{target_method})
       end
     end

data/lib/flnt/logger.rb

@@ -1,4 +1,6 @@
 require 'fluent/logger'
+require 'logger'
+require 'pathname'
 
 module Flnt
   class Logger < BasicObject
@@ -17,7 +19,36 @@ module Flnt
       return self
     end
 
+    # method caching for common log level name
+    %w(debug info warn error fatal).each do |log_level|
+      define_method log_level do |*args|
+        @tag << "." << log_level.to_s
+        unless args.empty?
+          emit! args.first
+        end
+
+        return self
+      end
+    end
+
     def emit!(arg)
+      ::Fluent::Logger.post @tag, to_info!(arg)
+    end
+
+    def tee!(logger_or_path)
+      new_self = TeeableLogger.new(@tag)
+      case
+      when logger_or_path.respond_to?(:info)
+        new_self.teed_logger = logger_or_path
+      when [::String, ::Pathname].include?(logger_or_path.class)
+        l = ::Logger.new(logger_or_path)
+        new_self.teed_logger = l
+      end
+      new_self
+    end
+
+    private
+    def to_info!(arg)
       info = {}
       case arg
       when ::Hash
@@ -31,7 +62,8 @@ module Flnt
       else
         info[:info] = arg
       end
-      ::Fluent::Logger.post @tag, info
+
+      info
     end
   end
 end

data/lib/flnt/teeable_logger.rb

@@ -0,0 +1,20 @@
+require 'logger'
+require 'flnt/logger'
+
+module Flnt
+  class TeeableLogger < Flnt::Logger
+    attr_accessor :teed_logger
+
+    def emit!(arg)
+      level = __get_last_tag!
+      level = 'info' unless %w(debug info warn error fatal).include?(level)
+      teed_logger.send(level, arg)
+      super
+    end
+
+    private
+    def __get_last_tag!
+      @tag.split('.').last
+    end
+  end
+end

data/lib/flnt/version.rb

@@ -1,3 +1,3 @@
 module Flnt
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/flnt/logger_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 describe "Flnt::Logger" do
   before do
     allow(Fluent::Logger::FluentLogger).to receive(:open).with(nil, an_instance_of(Hash))
+      .and_return(instance_double("Fluent::Logger::FluentLogger", :post => true))
   end
 
   def tag_of(flnt_logger)

data/spec/lib/flnt/teeable_logger_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe 'Flnt::TeeableLogger' do
+  before do
+    allow(Fluent::Logger::FluentLogger).to receive(:open).with(nil, an_instance_of(Hash))
+      .and_return(instance_double("Fluent::Logger::FluentLogger", :post => true))
+  end
+
+  describe '#tee!' do
+    let(:flnt) { Flnt.cool_log }
+    let(:logger) { Logger.new('/dev/null') }
+    let(:new_logger) { flnt.tee!(logger) }
+
+    it 'should set the teed logger' do
+      expect(new_logger.teed_logger).to be(logger)
+    end
+
+    it 'should tee the log to another logger' do
+      expect(Fluent::Logger).to receive(:post).with("cool_log.info", {message: "Hello from Hell"})
+      expect(logger).to receive(:info).with("Hello from Hell")
+
+      new_logger.info "Hello from Hell"
+    end
+
+    context 'passed just a path' do
+      let(:path) { "/tmp/log-#{$$}.log" }
+      let(:new_logger) { flnt.tee!(path) }
+
+      it 'should create a logger pointing to the path' do
+        expect(new_logger.teed_logger).to be_an_instance_of(Logger)
+        logdev = new_logger.teed_logger.instance_eval { @logdev }
+        expect(logdev.dev.path).to eq path
+      end
+    end
+
+    context 'passed just a pathname' do
+      let(:path) do
+        p = Pathname.new("/tmp/log-#{$$}")
+        p.join("app.log")
+        p
+      end
+      let(:new_logger) { flnt.tee!(path) }
+
+      it 'should create a logger pointing to the path' do
+        expect(new_logger.teed_logger).to be_an_instance_of(Logger)
+        logdev = new_logger.teed_logger.instance_eval { @logdev }
+        expect(logdev.dev.path).to eq path.to_s
+      end
+    end
+  end
+
+  # FIXME using fakefs to test real log file
+end

data/spec/lib/flnt_spec.rb

@@ -12,30 +12,37 @@ describe "Flnt" do
     Flnt.init_foo
   end
 
-  it "should initialize fluentd connection just once" do
-    allow(Flnt).to receive(:initialized?).and_return(true)
-
-    expect(Fluent::Logger::FluentLogger).not_to receive(:open)
-    expect(Flnt).not_to receive(:Configuration)
-    Flnt.init_foo
-  end
-
-  it "should return Flnt::Logger tagged with called method name" do
-    ret = Flnt.init_foo
-    expect(ret.instance_eval { @tag }).to eq "init_foo"
-
-    expect { ret.chain_bar }.not_to raise_error
-    expect { ret.respond_to? }.to raise_error NoMethodError
-  end
-
-  it "should create a new logger for each call" do
-    logger1 = Flnt.foo_tag
-    logger2 = Flnt.foo_tag
-    expect(logger1.__id__).not_to eq logger2.__id__
-  end
-
-  it "should create a new logger with custom tag" do
-    logger = Flnt.tag!("foo.bar.buz")
-    expect(logger.instance_eval { @tag }).to eq "foo.bar.buz"
+  describe 'on connection ok' do
+    before do
+      allow(Fluent::Logger::FluentLogger).to receive(:open).with(nil, an_instance_of(Hash))
+        .and_return(instance_double("Fluent::Logger::FluentLogger", :post => true))
+    end
+
+    it "should initialize fluentd connection just once" do
+      allow(Flnt).to receive(:initialized?).and_return(true)
+
+      expect(Fluent::Logger::FluentLogger).not_to receive(:open)
+      expect(Flnt).not_to receive(:Configuration)
+      Flnt.init_foo
+    end
+
+    it "should return Flnt::Logger tagged with called method name" do
+      ret = Flnt.init_foo
+      expect(ret.instance_eval { @tag }).to eq "init_foo"
+
+      expect { ret.chain_bar }.not_to raise_error
+      expect { ret.respond_to? }.to raise_error NoMethodError
+    end
+
+    it "should create a new logger for each call" do
+      logger1 = Flnt.foo_tag
+      logger2 = Flnt.foo_tag
+      expect(logger1.__id__).not_to eq logger2.__id__
+    end
+
+    it "should create a new logger with custom tag" do
+      logger = Flnt.tag!("foo.bar.buz")
+      expect(logger.instance_eval { @tag }).to eq "foo.bar.buz"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@
 require 'flnt'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus if ENV['FOCUS']
 
@@ -16,4 +15,10 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.after :each do
+    Flnt.instance_eval {
+      @initialized = false
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flnt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Uchio KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-logger
@@ -68,6 +68,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -97,9 +111,11 @@ files:
 - lib/flnt.rb
 - lib/flnt/configuration.rb
 - lib/flnt/logger.rb
+- lib/flnt/teeable_logger.rb
 - lib/flnt/version.rb
 - spec/lib/flnt/configuration_spec.rb
 - spec/lib/flnt/logger_spec.rb
+- spec/lib/flnt/teeable_logger_spec.rb
 - spec/lib/flnt_spec.rb
 - spec/spec_helper.rb
 - wercker.yml
@@ -130,5 +146,6 @@ summary: Gentle post-to-fluentd log solution
 test_files:
 - spec/lib/flnt/configuration_spec.rb
 - spec/lib/flnt/logger_spec.rb
+- spec/lib/flnt/teeable_logger_spec.rb
 - spec/lib/flnt_spec.rb
 - spec/spec_helper.rb