tlogger 0.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b86e2cb6836e268176b31f6ce4e7d6fcfd819f736988ae110dbbd00d40260881
-  data.tar.gz: 17b63a9ee7a5d60c9f22381d3da9b2107d854d5f445d24e41410aee51d9026d9
+  metadata.gz: 81d536a6b52ad6b35e449b2a19b92d72c16310f6bcb8214b4fce73e4b32785f7
+  data.tar.gz: 4fc37ffecf6133063994e87ae8689641a391f545b52965f37aa28fa3ec316fca
 SHA512:
-  metadata.gz: 998b911a6eb9195d62aed020e36e86422c36081bb3a95eb8eb4c787b032b97f2b804094b33ebfd4b60a41fc3ac3f26f5e72867db9684ee6a0587e5822eea6f26
-  data.tar.gz: 6d7b8f29e67dc041e3787a2e69ad958a72df10f3da7e3d38d00800a445a1dbbd1ed8570b7ebf92dc8c607a08cd78b5ef7348369f02f2c5cbfaf7207fb9141235
+  metadata.gz: 7ca899db52484b56c039954d196a563c133f5d9d19d0c0c2d1617c92ef3d8974632721f0461db718a2ba2d3588b005502b6ce610cbe7d9de84c55982fa3aa7a7
+  data.tar.gz: a59e8c857a39769189c98f97dc92d7405268dca08655f85d14eb855164fc936cbd338865bd48bea8c2b418226ff43abb398df99a9064370b80dc58755ba41fac

data/Gemfile.lock

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

data/lib/tlogger/version.rb

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

data/lib/tlogger.rb

@@ -14,15 +14,23 @@ module Tlogger
   #
   class TloggerConf
     include Singleton
-    attr_reader :active_tags, :scoped_tag, :disabled_tags, :auto_tag
+    attr_reader :active_tags, :scoped_tag, :blacklisted_tags, :auto_tag
     #GLOBAL_TAG = :global
     GLOBAL_TAG = ""
+    INT_TAG = :tlogger
     
     def initialize
       @active_tags = []
-      @disabled_tags = []
+      # tag added to black listed will not be printed out even the tag is added later in the code path
+      @blacklisted_tags = []
       @disable_all_tags = false
       @auto_tag = false
+      # todo
+      # allow to redirect certain tag to specific output. tag: [<config>]
+      @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 = {}
+      # end todo
     end
 
     def auto_tag_on
@@ -45,11 +53,11 @@ module Tlogger
       @active_tags.delete(tag)
     end
 
-    def disable_tag(tag)
+    def blacklist_tag(tag)
       if tag.is_a?(Array)
-        @disabled_tags += tag
+        @blacklisted_tags += tag
       else
-        @disabled_tags << tag
+        @blacklisted_tags << tag
       end
     end
 
@@ -61,21 +69,25 @@ module Tlogger
       @disable_all_tags = false
     end
 
-    def enable_tag(tag)
+    def whitelist_tag(tag)
       if tag.is_a?(Array)
         tag.each do |t|
-          @disabled_tags.delete(t)
+          @blacklisted_tags.delete(t)
         end
       else
-        @disabled_tags.delete(tag)
+        @blacklisted_tags.delete(tag)
       end
     end
-    
+
+    def whitelist_all_tags
+      @disabled_tags.clear
+    end
+   
     def is_tag_active?(tag)
       if @disable_all_tags
         false
       else
-        @active_tags.include?(tag) and not @disabled_tags.include?(tag)
+        @active_tags.include?(tag) #and not @disabled_tags.include?(tag)
       end
     end
 
@@ -83,10 +95,6 @@ module Tlogger
       @active_tags.clear
     end
 
-    def remove_all_disabled_tags
-      @disabled_tags.clear
-    end
-
     def set_scoped_tag(tag)
       @scoped_tag = tag
     end
@@ -104,7 +112,8 @@ module Tlogger
     end
 
     def is_scoped_tag_active?
-      not @disabled_tags.include?(@scoped_tag)
+      #@active_tags.include?(@scoped_tag)
+      not @blacklisted_tags.include?(@scoped_tag)
     end
 
     def self.method_missing(mtd,*args,&block)
@@ -133,6 +142,8 @@ module Tlogger
       end
       @tlogger = Logger.new(*args)
       @tag = TloggerConf::GLOBAL_TAG
+      # disable by default
+      # If there is issue then enable it back in application level
       self
     end
 
@@ -144,75 +155,85 @@ module Tlogger
 
     def tdebug(tag,*args)
       with_tag(tag) do
-        debug(*args)
+        self.debug(*args)
       end
       self
     end
 
     def terror(tag, *args)
       with_tag(tag) do
-        error(*args)
+        self.error(*args)
       end
       self
     end
 
     def tinfo(tag, *args)
       with_tag(tag) do
-        info(*args)
+        self.info(*args)
       end
       self
     end
 
     def twarn(tag, *args)
       with_tag(tag) do
-        warn(*args)
+        self.warn(*args)
       end
       self
     end
 
+    def intDebug(msg)
+      #puts TloggerConf.active_tags
+      if TloggerConf.instance.is_tag_active?(TloggerConf::INT_TAG)
+        msg2 = "[#{TloggerConf::INT_TAG}] #{msg}"
+        #puts "intDebug"
+        @tlogger.debug(msg2)
+      end
+    end
+
     def method_missing(mtd,*args,&block)
-      @tlogger.debug "[tlogger] method_missing: Method #{mtd}"
+      #@tlogger.debug "[tlogger] method_missing: Method #{mtd}"
+      intDebug("method_missing: #{mtd}")
       if @tlogger.respond_to?(mtd)
-        if TloggerConf.is_tag_active?(@tag) or TloggerConf.has_scoped_tag?
-          if PROXY_MTD.include?(mtd)
-            # All messages should be tagged under this section...
+
+        if PROXY_MTD.include?(mtd)
+          
+          if @tag.nil? or @tag.empty?
+            # no tag. Output like normal log
+            @tlogger.send(mtd, *args, &block)
+            
+          else
+
             if TloggerConf.has_scoped_tag?
               if TloggerConf.is_scoped_tag_active?
+                intDebug("Scoped tag detected")
                 args[0] = "[#{TloggerConf.scoped_tag}] #{args[0]}"
                 @tlogger.send(mtd,*args,&block)
               end
-            else
-              if not @tag.nil? and not @tag.empty?
-                if @tag == TloggerConf::GLOBAL_TAG
-                  if TloggerConf.is_auto_tag_on?
-                    args = tag_class(*args)
-                    @tlogger.send(mtd,*args,&block)
-                  end
-                else
-                  args[0] = "[#{@tag}] #{args[0]}"
-                  @tlogger.send(mtd,*args,&block)
-                end
-              elsif TloggerConf.is_auto_tag_on?
-                args = tag_class(*args)
-                @tlogger.send(mtd,*args,&block)
-              end
+            elsif TloggerConf.is_auto_tag_on?
+              intDebug("auto_tag is on...")
+              args = tag_class(*args)
+              @tlogger.send(mtd,*args,&block)
+            elsif TloggerConf.is_tag_active?(@tag)
+              intDebug("Tagged output...")
+              args[0] = "[#{@tag}] #{args[0]}"
+              @tlogger.send(mtd,*args,&block)
             end
-          
-          else
-            @tlogger.send(mtd,*args,&block)
+            
           end
-          # if in proxy method list
-          
-          #@tlogger.send(mtd,*args,&block)
 
-        elsif TloggerConf.is_auto_tag_on?
-          args = tag_class(*args)
+        else
+          intDebug("Not proxy method for logger. Pass to logger to handle. (#{mtd})")
+          ## not the debug, info, warn and error method, no need change message
           @tlogger.send(mtd, *args, &block)
         end
-      elsif TloggerConf.respond_to?(mtd)
+
+
+      elsif TloggerConf.instance.respond_to?(mtd)
         # redirect the config method to make it consistent API
+        intDebug("Redirect to TloggerConf for consistancy (#{mtd})")
         TloggerConf.send(mtd, *args, &block)
       else
+        intDebug("Call method_missing parent to handle method '#{mtd}'")
         super
       end
     end
@@ -229,7 +250,7 @@ module Tlogger
       
       if not @cal.nil? and not @cal.empty?
         wd = Dir.getwd
-        @scal = @cal[wd.length+1..-1]
+        @scal = @cal[wd.length..-1]
         args[0] = "[#{@scal}] #{args[0]}"
       end
 

data/samples/basic2.rb

@@ -0,0 +1,24 @@
+
+
+l = Tlogger.new
+l.tag = "dance"
+#l.activate_tag(Tlogger::TloggerConf::INT_TAG)
+
+l.debug "here"
+
+#Tlogger::TloggerConf.blacklist_tag("jan")
+
+l.with_tag 'jan' do
+  l.debug "inside"
+  puts "inside string"
+  l.debug "outside"
+end
+
+l.debug "towards the end"
+
+l.tdebug :hans, "hans here"
+l.terror :solo, "Error!"
+l.tinfo :luke, "This is info!"
+l.twarn :sky, "Sky is the limit"
+
+#l.warn "warning!!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tlogger
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/tlogger/version.rb
 - release.job
 - samples/basic.rb
+- samples/basic2.rb
 - tlogger.gemspec
 homepage: ''
 licenses: