rmtools 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4af007b3b54a30faa10b74f7954970878d36ab73
-  data.tar.gz: 202e16f990d3115ef0d9a934b0fec88f52c85644
+  metadata.gz: 3543de2cf0e25504f8c5be1c6e91aad75b102672
+  data.tar.gz: 75d5c56892deed75940a1d990e4bd681a39351a6
 SHA512:
-  metadata.gz: 5c2869bcd4ca80a81bec45e10c23eb778bc48e03b89f9889d5efe901e09e28fb843204f9c293cb4b55032636175bf5fe8e9e8786632295c7c6e9c6a45fdd2c0c
-  data.tar.gz: bec7b536593e4c95fbb689e5a9eed3aaa6f211eef5a895d2f9a76e11db4aa9d71237a37eebb568ea1d2292f5aff602a77b7b4b9bf0571add58553519559fac5d
+  metadata.gz: a2239289a4dde502cca7e83dfaff86803c56ac352b702f51012a6faa97443b87cd1600d03809131c5a3c49222a27a537b766d331a8dd1bb50fa9b62812c550ab
+  data.tar.gz: 0c1a64bdafb956dce0ae7af597fbe6f7f4188260ab1c471dfe6950dd91c2441dc72940063b78afa6c4654328d7f2b040f88ecca86bdafb59bedb20f65a88dc02

data/README.md

@@ -29,6 +29,16 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
+##### Version 2.4.1
+
+* Fixed trace_format for exceptions using Thread::Backtrace
+* Added String#decapitalize and (for cyrillic strings) #funcap
+* RMLogger
+ * made indifferent of global variables: $panic, $verbose, $quiet
+ * control log level by
+  * env variables (globally): LOGLEVEL, DEBUG || VERBOSE, WARN || QUIET, SILENT
+  * instance methods: log_level=, debug=, log=, info=, warn=, error=
+
 ##### Version 2.4.0
 
 * Ruby 2.1+ behaviour:

data/lib/rmtools/dev/logging.rb

@@ -9,10 +9,10 @@ module RMTools
   # with caller processing and highlighting
   class RMLogger
     __init__
-    attr_accessor :mute_info, :mute_warn, :mute_log, :mute_debug
+    attr_accessor :mute_info, :mute_error, :mute_warn, :mute_log, :mute_debug
     attr_reader :default_format
         
-    Modes = [:debug, :log, :info, :warn]
+    Modes = [:debug, :log, :info, :warn, :error]
     NOPRINT = 8
     NOLOG = 4
     PREV_CALLER = 2
@@ -21,6 +21,7 @@ module RMTools
     def initialize format={}
       @c = Painter
       @highlight = {
+          :error => @c.red_bold("ERROR"),
           :warn => @c.red_bold("WARN"),
           :log => @c.cyan("INFO"),
           :info => @c.cyan_bold("INFO"),
@@ -28,6 +29,16 @@ module RMTools
       }
       @file_formats = Hash.new(@default_format = {})
       set_format :global, format
+      
+      if ENV['LOGLEVEL']
+        self.log_level = ENV['LOGLEVEL']
+      elsif ENV['DEBUG'] || ENV['VERBOSE']
+        self.log_level = 'DEBUG'
+      elsif ENV['WARN'] || ENV['QUIET']
+        self.log_level = 'WARN'
+      elsif ENV['SILENT']
+        self.log_level = 'ERROR'
+      end
     end
           
     def _set_format file, format
@@ -97,6 +108,8 @@ module RMTools
       %{<Logger #{cfg.fmt.sub('%time', "%time(#{cfg.tf*'.'})").sub('%caller', "%caller(#{cfg.cf0})")}#{' -> '+cfg.out if cfg.out} #{modes.b ? modes.inspect : 'muted'}>}
     end
             
+    # TODO: добавить фильтров, 
+    # например, для обработки текста, который будет логирован
     def _print mode, text, opts, caler, bind, cfg
       log_ = opts&NOLOG==0
       print_ = opts&NOPRINT==0
@@ -139,12 +152,22 @@ module RMTools
     end
         
     # controls:
-    # - $panic: print debug messages
-    # - $verbose: print log messages
-    # - $quiet: print only warn messages regardless of other globals
-    # - @mute_warn, @mute_info, @mute_log: do not print
-    #                       this messages regardless of any globals
-    # - @out_all: write to file any messages
+    # - @mute_warn, @mute_info, @mute_log, @mute_debug: 
+    #       do not print this messages regardless of any globals
+    # - @out_all: write to file info and debug messages
+    # - @out:      write to file
+    # - @print:    write to stdout
+        
+    def error *args
+      cfg = get_config!
+      if (cfg.out or cfg.print) && !@mute_error
+        text, bind, opts = args.get_opts [!block_given? && args[0].kinda(Hash) ? args[0] : "\b\b ", nil], :mute => 0
+        opts[:mute] |= NOLOG if !cfg.out
+        opts[:mute] |= NOPRINT if !cfg.print
+        return if block_given? && (text = yield).nil?
+        _print(:error, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
+      end  
+    end
         
     def warn *args
       cfg = get_config!
@@ -159,10 +182,10 @@ module RMTools
         
     def log *args
       cfg = get_config!
-      if (cfg.out or cfg.print && !$quiet && $verbose) && !@mute_log
+      if (cfg.out or cfg.print) && !@mute_log
         text, bind, opts = args.get_opts [!block_given? && args[0].kinda(Hash) ? args[0] : "\b\b ", nil], :mute => 0
         opts[:mute] |= NOLOG if !cfg.out
-        opts[:mute] |= NOPRINT if !(cfg.print && !$quiet && $verbose)
+        opts[:mute] |= NOPRINT if !cfg.print
         return if block_given? && (text = yield).nil?
         _print(:log, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
       end
@@ -170,10 +193,10 @@ module RMTools
             
     def info *args
       cfg = get_config!
-      if (cfg.print && !$quiet or cfg.out && cfg.out_all) && !@mute_info
+      if (cfg.print or cfg.out && cfg.out_all) && !@mute_info
         text, bind, opts = args.get_opts [!block_given? && args[0].kinda(Hash) ? args[0] : "\b\b ", nil], :mute => 0
         opts[:mute] |= NOLOG if !(cfg.out && cfg.out_all)
-        opts[:mute] |= NOPRINT if !(cfg.print && !$quiet)
+        opts[:mute] |= NOPRINT if !cfg.print
         return if block_given? && (text = yield).nil?
         _print(:info, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
       end 
@@ -181,10 +204,10 @@ module RMTools
           
     def debug *args
       cfg = get_config!
-      if (cfg.print && $panic && !$quiet or cfg.out && cfg.out_all) && !@mute_debug
+      if (cfg.print or cfg.out && cfg.out_all) && !@mute_debug
         text, bind, opts = args.get_opts [!block_given? && args[0].kinda(Hash) ? args[0] : "\b\b ", nil], :mute => 0
         opts[:mute] |= NOLOG if !(cfg.out && cfg.out_all)
-        opts[:mute] |= NOPRINT if !(cfg.print && $panic && !$quiet)
+        opts[:mute] |= NOPRINT if !cfg.print
         return if block_given? && (text = yield).nil?
         _print(:debug, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
       end 
@@ -192,12 +215,24 @@ module RMTools
           
     alias :<= :debug
     alias :<< :info
-    alias :<   :warn
     alias :puts :info
+    alias :<   :warn
+    alias :fatal :error
     
     def print text
       info text, caller: 1, mute: INLINE 
     end
+    
+    def log_level=(level)
+      unless level.is_a? Integer
+        level = ::Logger.const_get(level.to_s.upcase)
+      end
+      self.debug = level < 1
+      self.info     = level < 2
+      self.log      = level < 2
+      self.warn   = level < 3
+      self.error   = level < 4
+    end
         
     Modes.each {|m| define_method("#{m}=") {|mute| send :"mute_#{m}=", !mute}}
     

data/lib/rmtools/dev/trace_format.rb

@@ -104,12 +104,30 @@ class Exception
   #   end
   # it will be possible to fetch lines entered in IRB
   # else format_trace would only read ordinally require'd files
-  def set_backtrace src
-    if format = self.class.trace_format
-      src = RMTools.__send__ format, src
+  if RUBY_VERSION > '2.1'
+    
+    def set_backtrace src
+      if format = self.class.trace_format
+        if src.is_a? Thread::Backtrace
+          return src
+        else
+          src = RMTools.__send__ format, src
+        end
+      end
+      set_bt src
     end
-    set_bt src
+    
+  else
+    
+    def set_backtrace src
+      if format = self.class.trace_format
+        src = RMTools.__send__ format, src
+      end
+      set_bt src
+    end
+    
   end
+  
 end
   
 # This is the most usable setting, I think. Set it in the irbrc, config/initializers or wherever

data/lib/rmtools/lang/cyrillic.rb

@@ -84,6 +84,10 @@ class String
     def cuncap
       self[0].cdowncase + self[1..-1]
     end
+    
+    def funcap
+      self[0].fdowncase + self[1..-1]
+    end
       
     alias csize size
     alias cljust ljust

data/lib/rmtools/text/string_simple.rb

@@ -70,6 +70,11 @@ class String
   end
   alias :next_version :bump_version
     
+  def uncap
+    self[0].downcase + self[1..-1]
+  end
+  alias :decapitalize :uncap
+    
   def to_re(esc=false)
     Regexp.new(esc ? Regexp.escape(self) : self)
   end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies: []
 description: RMTools is a collection of helpers for debug, text/array/file processing
   and simply easing a coding process