rmtools 1.2.8.1 → 1.2.10b

data/README.txt

@@ -8,6 +8,11 @@ Methods for basic classes addon collection.
 
 == CHANGES
 
+== Version 1.2.10
+
+* Update String#parse:caller to parse ruby 1.9 "block level". Now block level processes in RMLogger and RMTools.format_trace
+* lib/dev/traceback.rb now applies to ruby > 1.9 as well
+
 == Version 1.2.8
 
 * StringScanner#each changed to compare `cbs' keys with @matched by number in ruby 1.8 and by first character in ruby 1.9, since ?x in 1.9 returns string instead of a charcode

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.2.8.1'
+RMTOOLS_VERSION = '1.2.10b'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do

data/lib/rmtools/console/coloring.rb

@@ -89,7 +89,7 @@ module RMTools
         String.class_eval %{
       def #{m.sub'sub','hl'} pattern, color=:red_bold
         Painter.#{m.sub'sub','hl'} self, pattern, color
-        self
+        #{'self' if '!'.in m}
       end
       }
       }

data/lib/rmtools/core/class.rb

@@ -47,4 +47,4 @@ class Class
 end
 
 require 'set'
-[Hash, Array, Set, Regexp, File, Dir, Range, Class, Module].each {|klass| klass.__init__}
+[Hash, Set, Regexp, File, Dir, Range, Class, Module].each {|klass| klass.__init__}

data/lib/rmtools/dev/logging.rb

@@ -107,7 +107,8 @@ module RMTools
         out = now.strftime cfg.out if cfg.path_format
       end
       if caler
-        str.gsub! "%caller", caler.sub(String::CALLER_RE, cfg.cf)
+        caler.sub!(/block (?:\((\d+) levels\) )?in/) {"{#{$1||1}}"}
+        str.gsub! "%caller", caler.sub(String::SIMPLE_CALLER_RE, cfg.cf)
       end
       str.gsub! "%text", text
       str << "\n" if opts&INLINE==0

data/lib/rmtools/dev/trace_format.rb

@@ -23,20 +23,26 @@ module RMTools
   IgnoreFiles = %r{#{Regexp.escape $:.grep(%r{/ruby/1\.(8|9\.\d)$})[0]}/irb(/|\.rb$)|/active_support/dependencies.rb$}
   
   def format_trace(a)
-    bt, calls, i = [], [], 0
+    bt, steps, i = [], [], 0
     m = a[0].parse:caller
-    m.line -= 1 if m.file =~ /\.haml$/
+    m.line -= 1 if m and m.file =~ /\.haml$/
     while i < a.size
       m2 = a[i+1] && a[i+1].parse(:caller)
       m2.line -= 1 if m2 and m2.file =~ /\.haml$/
       if !m or m.path =~ IgnoreFiles
-          nil
-      elsif m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
-          calls << " -> `#{m.func}'"
-      elsif m and m.line != 0 and line = RMTools.highlighted_line(m.path, m.line)
-          bt << "#{a[i]}#{calls.join}\n#{line}"
-          calls = []
-      else bt << a[i]
+        nil
+      else
+        step = a[i]
+        if m.block_level # > 1.9
+          step = step.sub(/block (\(\d+ levels\) )?in/, '{'+m.block_level+'}')
+        end
+        if m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
+          steps << " -> `#{'{'+m.block_level+'} ' if m.block_level}#{m.func}'"
+        elsif m and m.line != 0 and line = RMTools.highlighted_line(m.path, m.line)
+          bt << "#{step}#{steps.join}\n#{line}"
+          steps = []
+        else bt << step
+        end
       end
       i += 1
       m = m2

data/lib/rmtools/dev/traceback.rb

@@ -3,7 +3,7 @@ RMTools::require 'dev/trace_format'
 require 'active_support/core_ext/class/attribute'
 
 # as for rmtools-1.1.0, 1.9 may hung up processing IO while generating traceback
-if RUBY_VERSION < '1.9'
+#if RUBY_VERSION < '1.9'
   class Exception
     alias :set_bt :set_backtrace
     class_attribute :__trace_format
@@ -35,4 +35,4 @@ if RUBY_VERSION < '1.9'
   class SystemStackError
     trace_format false
   end
-end
+#end

data/lib/rmtools/lang/ansi.rb

@@ -3,8 +3,6 @@ require 'iconv'
 # Although ruby >= 1.9.3 would complain about not using String#encode, iconv is 2-4 times faster and still handles the ruby string encoding
 
 module RMTools
-  ANSI2UTF = Iconv.new("UTF-8", "WINDOWS-1251").method :iconv
-  UTF2ANSI = Iconv.new("WINDOWS-1251", "UTF-8").method :iconv
 
   module Cyrillic
     RU_LETTERS = "абвгдеёжзийклмнопрстуфхцчшщьыъэюя", "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ"
@@ -17,17 +15,19 @@ module RMTools
     end
   end
   
+  ANSI2UTF = Cyrillic::ANSI2UTF = Iconv.new("UTF-8", "WINDOWS-1251").method(:iconv)
+  UTF2ANSI = Cyrillic::UTF2ANSI = Iconv.new("WINDOWS-1251", "UTF-8").method(:iconv)
+  ICONVS = {}
 end
   
 class String
   
-  # Actually, for short strings and 1251<->65001 it's much faster to use predefined ANSI2UTF and UTF2ANSI procs
   def utf(from_encoding='WINDOWS-1251')
-    Iconv.new('UTF-8', from_encoding).iconv(self)
+    (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8', from_encoding)).iconv(self)
   end
   
   def ansi(from_encoding='UTF-8')
-    Iconv.new('WINDOWS-1251', from_encoding).iconv(self)
+    (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251', from_encoding)).iconv(self)
   end
   
   def utf!(from_encoding='WINDOWS-1251')

data/lib/rmtools/lang/cyrillic.rb

@@ -3,26 +3,26 @@ RMTools::require 'lang/ansi'
 
 class String
   include RMTools::Cyrillic
+  
+  def swap
+    sub(/([a-zA-Z])|([А-пр-ёЁ])/) {|m| return $~[1]? en2ru: ru2en}
+    self
+  end
+  
+  def caps?
+    self =~ /^[А-ЯЁ][А-ЯЁ\d ]+$/
+  end
+  
+  def cyr?
+    self !~ /[^А-пр-ёЁ]/
+  end
+    
+  if RUBY_VERSION > "1.9"
 
     def translit
-      gsub(/[ёЁ]/, 'yo').gsub(/[йЙ]/, 'y').gsub(/[цЦ]/, 'c').gsub(/[уУ]/, 'u').gsub(/[кК]/, 'k').gsub(/[еЕ]/, 'e').gsub(/[нН]/, 'n').gsub(/[гГ]/, 'g').gsub(/[шШ]/, 'sh').gsub(/[щЩ]/, 'sch').gsub(/[зЗ]/, 'z').gsub(/[хХ]/, 'h').gsub(/[ьЬъЪ]/, "'").gsub(/[фФ]/, 'f').gsub(/[иИыЫ]/, 'i').gsub(/[вВ]/, 'v').gsub(/[аА]/, 'a').gsub(/[пП]/, 'p').gsub(/[рР]/, 'r').gsub(/[оО]/, 'o').gsub(/[лЛ]/, 'l').gsub(/[дД]/, 'd').gsub(/[жЖ]/, 'j').gsub(/[эЭ]/, 'e').gsub(/[яЯ]/, 'ya').gsub(/[чЧ]/, 'ch').gsub(/[сС]/, 's').gsub(/[мМ]/, 'm').gsub(/[тТ]/, 't').gsub(/[бБ]/, 'b').gsub(/[юЮ]/, 'yu')
-    end
-    
-    def swap
-      sub(/([a-zA-Z])|([А-пр-ёЁ])/) {|m| return $~[1]? en2ru: ru2en}
-      self
+      gsub(/ё/i, 'yo').gsub(/й/i, 'y').gsub(/ц/i, 'c').gsub(/у/i, 'u').gsub(/к/i, 'k').gsub(/е/i, 'e').gsub(/н/i, 'n').gsub(/г/i, 'g').gsub(/ш/i, 'sh').gsub(/щ/i, 'sch').gsub(/з/i, 'z').gsub(/х/i, 'h').gsub(/[ьъ]/i, "'").gsub(/ф/i, 'f').gsub(/[иы]/i, 'i').gsub(/в/i, 'v').gsub(/а/i, 'a').gsub(/п/i, 'p').gsub(/р/i, 'r').gsub(/о/i, 'o').gsub(/л/i, 'l').gsub(/д/i, 'd').gsub(/ж/i, 'j').gsub(/э/i, 'e').gsub(/я/i, 'ya').gsub(/ч/i, 'ch').gsub(/с/i, 's').gsub(/м/i, 'm').gsub(/т/i, 't').gsub(/б/i, 'b').gsub(/ю/i, 'yu')
     end
     
-    def caps?
-      self =~ /^[А-ЯЁ][А-ЯЁ\d ]+$/
-    end
-    
-    def cyr?
-      self !~ /[^А-пр-ёЁ]/
-    end
-    
-  if RUBY_VERSION > "1.9"
-    
     def ru2en
       tr "ёйцукенгшщзхъфывапролдэячсмить/.ю?,б\"№;:жЁЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИВТЬБЮ", "`qwertyuiop[]asdfghjkl'zxcvbnm|/.&?,@\#$^;~QWERTYUIOP{}ASDFGHJKL:\"ZXCVBDNM<>"
     end
@@ -61,7 +61,12 @@ class String
     alias csqueeze squeeze
     
     def ci; self end
+    
   else
+
+    def translit
+      gsub(/[ёЁ]/, 'yo').gsub(/[йЙ]/, 'y').gsub(/[цЦ]/, 'c').gsub(/[уУ]/, 'u').gsub(/[кК]/, 'k').gsub(/[еЕ]/, 'e').gsub(/[нН]/, 'n').gsub(/[гГ]/, 'g').gsub(/[шШ]/, 'sh').gsub(/[щЩ]/, 'sch').gsub(/[зЗ]/, 'z').gsub(/[хХ]/, 'h').gsub(/[ьЬъЪ]/, "'").gsub(/[фФ]/, 'f').gsub(/[иИыЫ]/, 'i').gsub(/[вВ]/, 'v').gsub(/[аА]/, 'a').gsub(/[пП]/, 'p').gsub(/[рР]/, 'r').gsub(/[оО]/, 'o').gsub(/[лЛ]/, 'l').gsub(/[дД]/, 'd').gsub(/[жЖ]/, 'j').gsub(/[эЭ]/, 'e').gsub(/[яЯ]/, 'ya').gsub(/[чЧ]/, 'ch').gsub(/[сС]/, 's').gsub(/[мМ]/, 'm').gsub(/[тТ]/, 't').gsub(/[бБ]/, 'b').gsub(/[юЮ]/, 'yu')
+    end
     
     def csize
       UTF2ANSI[self].size

data/lib/rmtools/text/regexp.rb

@@ -37,7 +37,7 @@ class Regexp
           next
         elsif ext and m == '#'
           s.scan_until(/\n\s*/)
-        else case m.ord
+        else case m[0]
           when ?[;      klass = ''
           when ?];      new << "[#{klass}]"; klass = nil
           when ?{;      klass ? klass << m : count = ''

data/lib/rmtools/text/string_parse.rb

@@ -4,7 +4,11 @@ RMTools::require 'conversions/string'
 class String
   CALLER_RE =    %r{^(.*?([^/\\]+?))#{	    # ( path ( file ) ) 
                               }:(\d+)(?::in #{	      # :( line )[ :in
-                              }[`<](.+?)[>']#{   # `( closure )' ]
+                              }`(block (?:\((\d+) levels\) )?in )?(.+?)'#{   # `[ block in ] ( closure )' ]
+                            })?$}
+  SIMPLE_CALLER_RE =    %r{^(.*?([^/\\]+?))#{	    # ( path ( file ) ) 
+                              }:(\d+)(?::in #{	      # :( line )[ :in
+                              }`(.+?)'#{   # `( closure )' ]
                             })?$}
   URL_RE = %r{^((?:([^:]+)://)#{	            #  ( protocol
                       }([^/:]*(?::(\d+))?))?#{	  #  root[:port] )
@@ -38,10 +42,11 @@ class String
             {  'path' => m[1],
                 'file' => m[2],
                 'line' => m[3].to_i,
-                'func' => m[4],
-                'fullpath' => 
-                 m[1]['('] ? m[1] : 
-           File.expand_path(m[1])     }
+                'block_level' => m[4] && (m[5] || 1).to_i, # > 1.9
+                'func' => m[6],
+                'fullpath' => m[1] =~ /[\(\[]/ ? 
+                  m[1] : 
+                  File.expand_path(m[1])     }
         when :ip;          self[IP_RE]
         when :ip_range; (m = match IP_RANGE_RE) && m[1]..m[2]
         else raise ArgumentError, "Incorrect flag. Correct flags: :uri, :caller, :ip, :ip_range"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 109
-  prerelease: 
+  hash: 3
+  prerelease: 6
   segments: 
   - 1
   - 2
-  - 8
-  - 1
-  version: 1.2.8.1
+  - 10
+  - b
+  version: 1.2.10b
 platform: ruby
 authors: 
 - Sergey Baev
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-27 00:00:00 Z
+date: 2012-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -195,12 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rmtools