rmtools 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8d5846022ccf031d60062e4060c98a7990d4c0
-  data.tar.gz: 72f136789d589bdc3f874f9f732805f98c1cf906
+  metadata.gz: 8fad210fdab682c8f871310b8a186b5f3185f0a2
+  data.tar.gz: 69dd15ad213beba220be5461f9675971f21eef01
 SHA512:
-  metadata.gz: 0c5e969ef2e81d460003af525aea0e0db301141a4549dd05260d32586d480b811c17de0945a9e94c09d11128e34f4e675618b49ec240de1fb1fb77d01754a39e
-  data.tar.gz: a3e5360e8e737bbf00671e91d68a6bf3b4efbf8bff0f4f1b791c45ecba5aa752ac4ef863651e36d56960f0205890f07658954dd36a906572ab870547dd7e981c
+  metadata.gz: 20b229499d85c0adc1e6c59b498b363aa9e9ab0d12829001dcaacbac888e36624a61dd1dc6eee77cf5b9687c6525490083f10e0eacd478b96143b7dc302e4e35
+  data.tar.gz: 7f177261217d69c58addc6daddac61a59cca8df0dc1f5360a01f7929b3bbe83bb34b739b4f6bb95e05ff7cea816217383795018b6922a5b73fa23ec33782aeb8

data/lib/rmtools/active_record/base.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module ActiveRecord
 
-  def self.establish_connection_with config
+  def self.establish_connection_with config='config/database.yml'
     c = case config
             when String
               c = if config.inline
@@ -14,6 +14,12 @@ module ActiveRecord
             when IO then YAML.load config
             else config
           end
+    if defined? Rails
+      env = Rails.env.to_s
+      if c.include? env
+        c = c[env]
+      end
+    end
     Base.establish_connection(c) rescue(false)
   end
 

data/lib/rmtools/core/arguments.rb

@@ -23,7 +23,7 @@ class Array
     end
     return opts if return_hash
     if defaults == :flags
-      defauls = [:flags]
+      defaults = [:flags]
     end
     if defaults.last == :flags
       defaults.pop

data/lib/rmtools/dev/logging.rb

@@ -10,7 +10,7 @@ module RMTools
   class RMLogger
     __init__
     attr_accessor :mute_info, :mute_error, :mute_warn, :mute_log, :mute_debug
-    attr_reader :default_format
+    attr_reader :default_format, :log_level
         
     Modes = [:debug, :log, :info, :warn, :error]
     NOPRINT = 8
@@ -38,6 +38,8 @@ module RMTools
         self.log_level = 'WARN'
       elsif ENV['SILENT']
         self.log_level = 'ERROR'
+      else
+        self.log_level = 'INFO'
       end
     end
           
@@ -165,7 +167,7 @@ module RMTools
         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)
+        _print(:error, text, opts[:mute], cfg._caller && (@current_caller || caller)[(opts[:caller] || opts[:caller_offset]).to_i], bind, cfg)
       end  
     end
         
@@ -176,7 +178,7 @@ module RMTools
         opts[:mute] |= NOLOG if !cfg.out
         opts[:mute] |= NOPRINT if !cfg.print
         return if block_given? && (text = yield).nil?
-        _print(:warn, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
+        _print(:warn, text, opts[:mute], cfg._caller && (@current_caller || caller)[(opts[:caller] || opts[:caller_offset]).to_i], bind, cfg)
       end  
     end
         
@@ -185,9 +187,9 @@ module RMTools
       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
+        opts[:mute] |= NOPRINT if !(cfg.print && !@mute_debug)
         return if block_given? && (text = yield).nil?
-        _print(:log, text, opts[:mute], cfg._caller && (@current_caller || caller)[opts[:caller].to_i], bind, cfg)
+        _print(:log, text, opts[:mute], cfg._caller && (@current_caller || caller)[(opts[:caller] || opts[:caller_offset]).to_i], bind, cfg)
       end
     end
             
@@ -198,7 +200,7 @@ module RMTools
         opts[:mute] |= NOLOG if !(cfg.out && cfg.out_all)
         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)
+        _print(:info, text, opts[:mute], cfg._caller && (@current_caller || caller)[(opts[:caller] || opts[:caller_offset]).to_i], bind, cfg)
       end 
     end
           
@@ -209,7 +211,7 @@ module RMTools
         opts[:mute] |= NOLOG if !(cfg.out && cfg.out_all)
         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)
+        _print(:debug, text, opts[:mute], cfg._caller && (@current_caller || caller)[(opts[:caller] || opts[:caller_offset]).to_i], bind, cfg)
       end 
     end
           
@@ -227,6 +229,7 @@ module RMTools
       unless level.is_a? Integer
         level = ::Logger.const_get(level.to_s.upcase)
       end
+      @log_level = level
       self.debug = level < 1
       self.info     = level < 2
       self.log      = level < 2

data/lib/rmtools/text/string_split.rb

@@ -57,10 +57,14 @@ class String
     end
     
   private
+    # Если последний (в итераторе в #split_to_blocks
+    # результат #split_by_syntax окажется слишком велик,
+    # он всё равно не будет включен в результат #split_to_blocks.
     def split_by_syntax(str, maxlen, buflen=0)
       len, add = maxlen - buflen, nil
-      [/[^.?!…]+\z/, /[^;]+\z/, /[^,:]+\z/, /[^\n]+/, /\S+\z/, /[^。、]+z/].each {|t|
-        if !(add = str[t]) or add.size <= len
+      [/[^.?!…]+\z/, /[^;]+\z/, /[^,:]+\z/, /[^\n]+/, /\S+\z/, /[^。、]+\z/].each {|t|
+        add = str[t]
+        if !add or add.size <= len
           return add
         end
       }
@@ -84,14 +88,14 @@ class String
       blocks = []
       term_re = /[^#{terminator}]+\z/ if terminator and terminator != :syntax
       words, buf = split(opts[:strips] ? ' ' : / /), nil
-      while !words.empty? or !buf.empty?
+      while !words.empty? or (buf and !buf.empty?)
         if terminator and !blocks.empty?
           buf_add = if terminator == :syntax
             split_by_syntax blocks[-1], maxlen, buf.size
           else
             blocks[-1][term_re]
           end
-          if !buf_add.empty?
+          if buf_add and !buf_add.empty?
             if buf_add == blocks[-1]
               blocks.pop
             else
@@ -159,16 +163,16 @@ class String
   if RUBY_VERSION < '1.9'
     def split_to_lines(maxlen, *opts)
       raise Exception, "Can't break text with maxlen = #{maxlen}" if maxlen < 1
-      opts = opts.fetch_opts([:flags], :strips => true).merge(:strict_overhead => false)
+      opts = opts.fetch_opts(:flags, :strips => true)[0].merge(:strict_overhead => false)
       opts[:charsize] ||= a[0].cyr? ? 2 : 1
       split("\n").map {|string| string.strip.split_to_blocks(maxlen*opts[:charsize], opts)}.flatten*"\n"
     end
   else
     def split_to_lines(maxlen, *opts)
       raise Exception, "Can't break text with maxlen = #{maxlen}" if maxlen < 1
-      opts = opts.fetch_opts([:flags], :strips => true).merge(:strict_overhead => false)
+      opts = opts.fetch_opts(:flags, :strips => true)[0].merge(:strict_overhead => false)
       split("\n").map {|string| string.strip.split_to_blocks(maxlen, opts)}.flatten*"\n"
     end
   end
   
-end
+end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-22 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
@@ -19,7 +19,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -128,19 +128,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Collection of helpers for debug, text/array/file processing and simply easing
   a coding process
 test_files: []
+has_rdoc: