tlogger 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d536a6b52ad6b35e449b2a19b92d72c16310f6bcb8214b4fce73e4b32785f7
-  data.tar.gz: 4fc37ffecf6133063994e87ae8689641a391f545b52965f37aa28fa3ec316fca
+  metadata.gz: adf500751775578bf59767ced9bb9c99aa9c818bc3c42545f9bb9141b410200b
+  data.tar.gz: 2c63441093ac202313c3286ba42d2866be74c99569e10a82a8797da7f7fd3c95
 SHA512:
-  metadata.gz: 7ca899db52484b56c039954d196a563c133f5d9d19d0c0c2d1617c92ef3d8974632721f0461db718a2ba2d3588b005502b6ce610cbe7d9de84c55982fa3aa7a7
-  data.tar.gz: a59e8c857a39769189c98f97dc92d7405268dca08655f85d14eb855164fc936cbd338865bd48bea8c2b418226ff43abb398df99a9064370b80dc58755ba41fac
+  metadata.gz: 33f79574622d9e61a7cfc0d61b6465f18ab740e1217240d89edee8502f8aa914a4b857a59e0f99f94fead0226873c06fca516501813148cd5c75bb517a0c688a
+  data.tar.gz: 474f8bd690784fe4461337ab3aeb5be59b6b5b8f67c20e86c6e39ffc994adf0a65a7721ec31ed328bdccfa4774c65e8caa403e36eaa4227c13bb684d7bfd05c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tlogger (0.4)
+    tlogger (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/tlogger/version.rb

@@ -1,3 +1,3 @@
 module Tlogger
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/tlogger.rb

@@ -14,7 +14,7 @@ module Tlogger
   #
   class TloggerConf
     include Singleton
-    attr_reader :active_tags, :scoped_tag, :blacklisted_tags, :auto_tag
+    attr_reader :active_tags, :scoped_tag, :blacklisted_tags, :show_source
     #GLOBAL_TAG = :global
     GLOBAL_TAG = ""
     INT_TAG = :tlogger
@@ -30,20 +30,37 @@ module Tlogger
       @output_map = {}
       # if output_map is there, then there should be pre created log file with specific output defined in the map. [<config>] => log_instance
       @output_log = {}
+      # show where is the log being printed out. Like auto_tag output
+      @show_source = false
       # end todo
     end
 
-    def auto_tag_on
-      @auto_tag = true
+    def show_source
+      @show_source = true
     end
+    alias_method :auto_tag_on, :show_source
 
-    def auto_tag_off
-      @auto_tag = false
+    def hide_source
+      @show_source = false
     end
+    alias_method :auto_tag_off, :hide_source
 
-    def is_auto_tag_on?
-      @auto_tag
+    def is_show_source?
+      @show_source
     end
+    alias_method :is_auto_tag_on?, :is_show_source?
+
+    #def auto_tag_on
+    #  @auto_tag = true
+    #end
+
+    #def auto_tag_off
+    #  @auto_tag = false
+    #end
+
+    #def is_auto_tag_on?
+    #  @auto_tag
+    #end
 
     def activate_tag(tag)
       @active_tags << tag
@@ -206,7 +223,13 @@ module Tlogger
             if TloggerConf.has_scoped_tag?
               if TloggerConf.is_scoped_tag_active?
                 intDebug("Scoped tag detected")
-                args[0] = "[#{TloggerConf.scoped_tag}] #{args[0]}"
+                tag = []
+                tag << TloggerConf.scoped_tag
+                if TloggerConf.instance.is_show_source?
+                  tag << " - "
+                  tag << find_caller
+                end
+                args[0] = "[#{tag.join}] #{args[0]}"
                 @tlogger.send(mtd,*args,&block)
               end
             elsif TloggerConf.is_auto_tag_on?
@@ -215,7 +238,13 @@ module Tlogger
               @tlogger.send(mtd,*args,&block)
             elsif TloggerConf.is_tag_active?(@tag)
               intDebug("Tagged output...")
-              args[0] = "[#{@tag}] #{args[0]}"
+              tag = []
+              tag << @tag
+              if TloggerConf.instance.is_show_source?
+                tag << " - "
+                tag << find_caller
+              end
+              args[0] = "[#{tag.join}] #{args[0]}"
               @tlogger.send(mtd,*args,&block)
             end
             
@@ -242,22 +271,35 @@ module Tlogger
 
     private
     def tag_class(*args)
+      args[0] = "[#{find_caller}] #{args[0]}"
+      args
+    end
+    # end tag_class()
+    #
+  
+    def find_caller
       caller.each do |c|
         next if c =~ /tlogger.rb/
         @cal = c
         break
       end
+
+      if @cal.nil? or @cal.empty?
+        @cal = caller[0] 
+      end 
       
-      if not @cal.nil? and not @cal.empty?
-        wd = Dir.getwd
-        @scal = @cal[wd.length..-1]
-        args[0] = "[#{@scal}] #{args[0]}"
+      wd = Dir.getwd
+      indx = @cal =~ /#{wd}/
+      if indx != nil
+        @scal = []
+        @scal << @cal[0..indx]
+        @scal << @cal[indx+wd.length..-1]
+        @scal.join
+      else
+        @cal
       end
-
-      args
-      #args[0] = "[#{@cal}] #{args[0]}"
     end
-    # end tag_class()
+    # end find_caller
     #
   end
   # 

data/samples/basic2.rb

@@ -7,6 +7,7 @@ l.tag = "dance"
 l.debug "here"
 
 #Tlogger::TloggerConf.blacklist_tag("jan")
+Tlogger::TloggerConf.show_source
 
 l.with_tag 'jan' do
   l.debug "inside"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlogger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler