logspot 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6595774b426267654aafd83076d8e173ca7b320d
-  data.tar.gz: 25d9c409f6bf3db7a88860332a77620f8994c501
+  metadata.gz: a4edef053fc6b53e57b5189c8d2ff6c1750d578f
+  data.tar.gz: b28973b319462b292ede579ee2673b4df401bacb
 SHA512:
-  metadata.gz: 5d9fd46216eda1d1ed768d84fd79dba9709d608691f35468ad66f7818042590cce959e550b6f48b5afa704882da4d55f09126e422281ef1a7a892493fc69f27e
-  data.tar.gz: 55cb548f9c70e5562ffb9974b7f105b98be5da1af1da1129d52e738973cbd00a03b665e58137417799e4a38efb8b8f6d40fb6d08f1f0f2db129594774794b81d
+  metadata.gz: ee34d18e23317aceda4d2accaf75292444a2aa23a42993ba8916f63cdd638927a0a118d6acd2786caef16fc72a7e780bcda19df07d19ac18760145e7414d2591
+  data.tar.gz: 539e68ee94ad552ae5bfd19416e2a2fb0bc9eeff0b53b8c1773210e817e277a03e24cd6a4ba583fee007b902ef82ad07c2646bcf316489cf8c14a935b580a66c

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation

data/README.md

@@ -1,5 +1,34 @@
 #LoGspot
 
+##Usage
+
+### Initialization
+
+```
+logger = LoGspot.new('/home/user/logs/production.log')
+logger = LoGspot.new # STDOUT
+```
+
+### Output
+
+```
+logger.info 'Foo' # [2015/01/20 22:13:42 INFO] Foo
+```
+
+```
+logger.tagged 'Foo: ' do
+  logger.info 'Bar'
+  logger.info 'Foo'
+end
+# [2015/01/20 22:13:42 INFO] Foo: Bar
+# [2015/01/20 22:13:42 INFO] Foo: Foo
+```
+
 ```
-LoGspot.new('/home/user/logs/production.log')
+logger.tagged_list 'Foo: ' do
+  logger.info 'Bar'
+  logger.info 'Foo'
+end
+# [2015/01/20 22:13:42 INFO] Foo: Bar
+#                                 Foo
 ```

data/lib/lo_gspot/output/wrap.rb

@@ -8,6 +8,10 @@ class LoGspot::Output::Wrap
     wrapper.call(output, data)
   end
 
+  def inner_output
+    output
+  end
+
   private
 
   attr_reader :wrapper, :output

data/lib/logspot.rb

@@ -3,16 +3,16 @@ require_relative 'initialize'
 class LoGspot
   LOG_LEVELS = %w(DEBUG INFO WARN ERROR FATAL)
 
-  def initialize(file_or_file_name = STDOUT, wrapper = nil)
+  def initialize(file_or_file_name = STDOUT, wrapper: nil, tag_format: '[%{time} %{level}] ', time_format: '%Y/%m/%d %H:%M:%S', tag_block: nil)
     wrapper = ->(output, data) {
-      base = "[#{Time.now.strftime('%Y/%m/%d %H:%M:%S')} #{level}] "
+      base = tag_block ? tag_block.(Time.current, level) : tag_format % { time: Time.current.strftime(time_format), level: level }
       if data[:space]
         base = ' ' * base.length
       end
       output.puts(message: "#{base}#{data[:message]}")
     }
-    @file = Output::File.new(file_or_file_name)
-    @output = @original_output = Output::Wrap.new(wrapper, @file)
+    @raw_output = @file = Output::File.new(file_or_file_name)
+    @top_output = @output = Output::Wrap.new(wrapper, @file)
     @level = nil
   end
 
@@ -76,7 +76,19 @@ class LoGspot
   end
 
   def untagged(&block)
-    previous_output, @output = output, original_output
+    previous_output, @output = output, output.inner_output
+    block.call
+    @output = previous_output
+  end
+
+  def top(&block)
+    previous_output, @output = output, top_output
+    block.call
+    @output = previous_output
+  end
+
+  def raw(&block)
+    previous_output, @output = output, raw_output
     block.call
     @output = previous_output
   end
@@ -93,7 +105,7 @@ class LoGspot
 
   private
 
-  attr_reader :original_output, :output, :level
+  attr_reader :raw_output, :top_output, :output, :level
 
   def write(l, *args, &block)
     @level = l

data/logspot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logspot'
-  s.version = '0.4.0'
+  s.version = '0.5.0'
   s.authors = ['Tetsuri Moriya']
   s.email = ['tetsuri.moriya@gmail.com']
   s.summary = 'Logger'

data/spec/logspot_spec.rb

@@ -2,20 +2,74 @@ require 'spec_helper'
 
 describe LoGspot do
   let(:filename) { File.expand_path('../../tmp/spec.log', __FILE__) }
-  let(:logger) { LoGspot.new(filename) }
+
+  before do
+    FileUtils.rm(filename)
+  end
+
+  let(:tag_format) { '' }
+  let(:logger) { LoGspot.new(filename, tag_format: tag_format) }
   let(:read) { -> { File.read(filename) } }
 
   describe '#write' do
-    it 'should output' do
+    it 'should output properly' do
       logger.info('test')
-      expect(read.call).to include 'test'
+      expect(read.()).to eq "test\n"
     end
   end
 
   describe '#value' do
-    it 'should output' do
+    it 'should output properly' do
       logger.value(:info, test: 'test')
-      expect(read.call).to include 'test: test'
+      expect(read.()).to eq "test: test\n"
+    end
+  end
+
+  describe '#tagged' do
+    it 'should output properly' do
+      logger.tagged('tag') do
+        logger.info('test')
+      end
+      expect(read.()).to eq "tagtest\n"
+    end
+  end
+
+  describe '#untagged' do
+    it 'should output properly' do
+      logger.tagged('tag') do
+        logger.tagged('tag2') do
+          logger.untagged do
+            logger.info('test')
+          end
+        end
+      end
+      expect(read.()).to eq "tagtest\n"
+    end
+  end
+
+  describe '#top' do
+    let(:tag_format) { 'a' }
+
+    it 'should output properly' do
+      logger.tagged('tag') do
+        logger.top do
+          logger.info('test')
+        end
+      end
+      expect(read.()).to eq "atest\n"
+    end
+  end
+
+  describe '#raw' do
+    let(:tag_format) { 'a' }
+
+    it 'should output properly' do
+      logger.tagged('tag') do
+        logger.raw do
+          logger.info('test')
+        end
+      end
+      expect(read.()).to eq "test\n"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logspot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Tetsuri Moriya
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock