rmtools 1.2.0 → 1.2.2b

data/lib/rmtools/dev/logging.rb

@@ -32,7 +32,8 @@ module RMTools
           
     def _set_format file, format
       file.print = !format.q
-      file.out = format.out
+      file.out = format.out || format.log_file
+      file.color_out = format.color_out || format.color_log
                 
       file.path_format = '%'.in file.out if file.out
       file.tf   = format.time.to_a
@@ -95,7 +96,7 @@ module RMTools
       if caler
         str.sub! "%caller", caler.sub(String::CALLER_RE, cfg.cf)
       end
-      log_str = @c.clean str
+      log_str = @c.clean str if !cfg.color_out
       RMTools.write out, log_str if log_
       Kernel.print str if print_
     end
@@ -156,9 +157,9 @@ module RMTools
       end 
     end
           
-    alias <= debug
-    alias << info
-    alias <   warn
+    alias :<= :debug
+    alias :<< :info
+    alias :<   :warn
         
     Modes.each {|m| define_method("#{m}=") {|mute| send :"mute_#{m}=", !mute}}
     

data/lib/rmtools/dev/trace_format.rb

@@ -19,12 +19,19 @@ module RMTools
   #     >>  10/0 end
   #          from (irb):3
   #     >>  divbyzero
+  
+  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
     m = a[0].parse:caller
+    m.line -= 1 if m.file =~ /\.haml$/
     while i < a.size
       m2 = a[i+1] && a[i+1].parse(:caller)
-      if m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
+      m2.line -= 1 if m2 and m2.file =~ /\.haml$/
+      if 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}"

data/lib/rmtools/dev/traceback.rb

@@ -2,7 +2,7 @@
 RMTools::require 'dev/trace_format'
 require 'active_support/core_ext/class/attribute'
 
-# 1.9 may hung up processing IO while generating traceback
+# as for rmtools-1.1.0, 1.9 may hung up processing IO while generating traceback
 if RUBY_VERSION < '1.9'
   class Exception
     alias :set_bt :set_backtrace
@@ -20,6 +20,7 @@ if RUBY_VERSION < '1.9'
     # it will be possible to get the lines entered in IRB
     # else it reads only ordinal require'd files
     def set_backtrace src
+      message.hl! self.class
       if format = self.class.__trace_format
         src = RMTools.__send__ format, src
       end

data/lib/rmtools/enumerable/array.rb

@@ -89,6 +89,10 @@ class Array
     !find {|e| !yield(e)}
   end
   
+  def no?
+    !find {|e| yield(e)}
+  end
+  
   # concatenation  
   # analogue to String#>>
   def >>(ary)

data/lib/rmtools/enumerable/array_iterators.rb

@@ -14,12 +14,14 @@ unless defined? RMTools::Iterators
   # => [[1, 2, 3], [3, 4, 6]]
   class Array
     alias :throw_no :method_missing
-    RMTools::Iterators = %r{(#{(%w{select reject partition find_all find sum foldr min max}+instance_methods.grep(/_by$/))*'|'})_([\w\d\_]+[!?]?)}
+    RMTools::Iterators = %r{^(#{(%w{every no select reject partition find_all find sum foldr}+instance_methods.grep(/_by$/))*'|'})_([\w\d\_]+[!?]?)}
     
     def method_missing(method, *args, &block)
       if match = (meth = method.to_s).match(RMTools::Iterators)
         iterator, meth = match[1], match[2].to_sym
         begin
+          iterator = :every? if iterator == :every
+          iterator = :no? if iterator == :no
           return iterator == :sum ?
             __send__(iterator, args.shift) {|i| i.__send__ meth, *args, &block}: 
             __send__(iterator) {|i| i.__send__ meth, *args, &block}
@@ -27,9 +29,18 @@ unless defined? RMTools::Iterators
           e.message << " (`#{method}' interpreted as decorator-function `#{meth}')"
           raise e
         end
-      elsif meth.sub!(/sses([!?]?)$/, 'ss\1') or meth.sub!(/ies([!?]?)$/, 'y\1') or meth.sub!(/s([!?]?)$/, '\1')
+      elsif meth.sub!(/sses([=!?]?)$/, 'ss\1') or meth.sub!(/ies([=!?]?)$/, 'y\1') or meth.sub!(/s([=!?]?)$/, '\1')
+        assignment = meth =~ /=$/
         meth = meth.to_sym
-        begin return map {|i| i.__send__ meth, *args, &block}
+        begin 
+          if assignment
+            if Array === args
+                each_with_index {|e,i| e.__send__ meth, args[i]}
+            else
+                each {|e| e.__send__ meth, args}
+            end
+          else map {|e| e.__send__ meth, *args, &block}
+          end
         rescue NoMethodError => e
           e.message << " (`#{method}' interpreted as map-function `#{meth}')"
           raise e

data/lib/rmtools/enumerable/common.rb

@@ -45,4 +45,8 @@ module Enumerable
     to_a + array.to_a
   end
 
+  def threadify(threads=4, &block)
+    RMTools::threadify(self, threads, &block)
+  end
+
 end

data/lib/rmtools/enumerable/range.rb

@@ -192,13 +192,21 @@ public
   end
   
   def empty?
-    @range.empty?
+    @ranges.empty?
   end
   
   def include?(number_or_range)
     @ranges.find_include?(number_or_range)
   end
   
+  def begin
+    @ranges[0].begin
+  end
+  
+  def end
+    @ranges[-1].end
+  end
+  
   def size
     @ranges.sum_size
   end

data/lib/rmtools/fs/dir.rb

@@ -87,4 +87,8 @@ class Dir
     }
   end
   
+  def self.threadify(threads=4, &block)
+    RMTools::threadify(Dir['*'], threads, &block)
+  end
+  
 end

data/lib/rmtools/fs/file.rb

@@ -15,7 +15,9 @@ class File
   end
   
   def include?(str)
-    while s = gets do return true if s.include? str end
+    while s = gets
+      return true if s.include? str 
+    end
   end
   
   def parent

data/lib/rmtools/fs/io.rb

@@ -43,13 +43,39 @@ module RMTools
       value.size
     end
   
-    def read(df)
-      df = df.tr '\\', '/'
-      if File.file?(df)
-        File.open(df, File::RDONLY) {|f| f.read}
-      else
-        warn "couldn't read from #{df.inspect}; file missed"
-      end
+    #    read('filename')
+    ### => 'text from filename'
+    #    read('nonexistent_filename')
+    # couldn't read from "nonexistent_filename" (called from (irb):9001)
+    ### => nil
+    #    read(['file1', 'file2', 'file3'])
+    ### => 'text from first of file1, file2, file3 that exists'
+    #    read(['file1', 'file2'], ['nonexistent_file1', 'nonexistent_file2'])
+    # coludn't read from neither "nonexistent_file1", nor "nonexistent_file2" (called from (irb):9003)
+    ### => ['text from first of file1, file2 that exists', nil]
+    #    read('file1', 'file2')
+    ### => ['text from file1', 'text from file2]
+    #    read('file1', ['file2', 'file3'])
+    ### => ['text from file1', 'text from first of file2 and file3 that exists']
+    def read(*dests)
+      texts = dests.map {|dest|
+        dest = dest[0] if dest.size == 1
+        if dest.is Array
+          if file = dest.find {|f| File.file?(f.tr '\\', '/')}
+            File.open(file.tr('\\', '/'), File::RDONLY) {|f| f.read}
+          else
+            warn "couldn't read from neither #{dest[0].inspect} nor #{dest[1..-1].inspects*' nor '}; files missed (called from #{caller[0]})"
+          end
+        else
+          if File.file? dest.tr('\\', '/')
+            File.open(dest.tr('\\', '/'), File::RDONLY) {|f| f.read}
+          else
+            warn "couldn't read from #{dest.inspect}; file missed (called from #{caller[0]})"
+          end
+        end
+      }
+      texts = texts[0] if texts.size == 1
+      texts
     end
   
   module_function :read, :write, :rw

data/lib/rmtools/rand/array.rb

@@ -17,6 +17,23 @@ class Array
     RMTools.randarr(len)
   end
   
+  def rand
+    if block_given?
+      h, ua = {}, uniq
+      s = ua.size
+      loop {
+        i = Kernel.rand size
+        if h[i]
+          return if h.size == s
+        elsif yield(e = ua[i])
+          return e
+        else h[i] = true
+        end
+      }
+    else self[Kernel.rand(size)]
+    end
+  end
+  
   def rand!
     delete_at Kernel.rand size
   end

data/lib/rmtools/rand/enum.rb

@@ -4,7 +4,7 @@ module Enumerable
   def rand
     if block_given?
       h, ua = {}, to_a.uniq
-      size = ua.size
+      s = ua.size
       loop {
         i = Kernel.rand size
         if h[i]
@@ -20,7 +20,7 @@ module Enumerable
   
   def randsample(qty=Kernel.rand(size))
     a, b = [], to_a.dup
-    qty.times {a << b.rand!}
+    [qty, size].min.times {a << b.rand!}
     a
   end
 

data/lib/rmtools/text/string_scanner.rb

@@ -22,7 +22,7 @@ class StringScanner
   #         node.sum {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
   #     }
   def each(re, cbs=nil, &cb)
-    @last = 0
+    @last = pos
     res = scan_until re
     if cbs
       if cbs.is Hash
@@ -39,7 +39,7 @@ class StringScanner
         end
       else
         while res
-          if cb = cbs.find {|pair| pair[0] and matched[pair[0]]}
+          if cb = cbs.find {|patern, fun| pattern and matched[pattern]}
             # patterns should be as explicit as possible
             cb[1][self, $~] if cb[1]
             @last = pos
@@ -61,10 +61,12 @@ class StringScanner
   end
   
   def head
-    string[@last...pos-matched_size]
+    string[@last...pos-matched_size.to_i]
   end
   
-  alias tail post_match
+  def tail 
+    post_match || string[pos..-1]
+  end
   
   def hl_next(re)
     (res = scan_until re) && Painter.hl(string[[pos-1000, 0].max..pos+1000], res)

data/lib/rmtools/text/string_split.rb

@@ -9,7 +9,7 @@ class String
     def sharp_split(splitter, *args)
       count, opts = args.fetch_opts [0, :flags], :include_splitter => true
       if !opts[:report_headers] and opts[:include_splitter] and splitter.is Regexp
-        return split(/(?=#{splitter.source})/, count)
+        return split(/(?=#{splitter.source})/u, count)
       end
       a = split(splitter, count)
       return a if !opts[:include_splitter] and !opts[:report_headers]
@@ -67,7 +67,7 @@ class String
       add
     end
     
-    def sanitize_blocks!(blocks, opts)
+    def sanitize_blocks!(blocks, maxlen, opts)
       blocks.reject! {|b| b.empty?} if opts[:no_blanks]
       blocks.strips! if opts[:strips]
       blocks.each {|b| raise Exception, "can't split string by #{terminator} to blocks with max length = #{maxlen}" if b.size > maxlen} if opts[:strict_overhead]
@@ -97,7 +97,7 @@ class String
           buf = buf_add + buf
         end
         if blocks.size == opts[:lines]
-          return sanitize_blocks! blocks, opts
+          return sanitize_blocks! blocks, maxlen, opts
         end
         blocks << ''
         if buf
@@ -111,14 +111,14 @@ class String
           buf = nil
         end
       end
-      sanitize_blocks! blocks, opts
+      sanitize_blocks! blocks, maxlen, opts
     end
     
     #   'An elegant way to factor duplication out of options passed to a series of method calls. Each method called in the block, with the block variable as the receiver, will have its options merged with the default options hash provided. '.cut_line 100
     # => "An elegant way to factor duplication out of options passed to a series of method calls..."
     def cut_line(maxlen, *opts)
       terminator, opts = opts.fetch_opts [:syntax, :flags]
-      opts[:charsize] ||= RUBY_VERSION < '1.9' && a[0].cyr? ? 2 : 1
+      opts[:charsize] ||= RUBY_VERSION < '1.9' && cyr? ? 2 : 1
       return self if size <= maxlen
       maxlen -= 3
       split_to_blocks(maxlen*opts[:charsize], terminator, :strips => true, :strict_overhead => false, :lines => 1)[0][0, maxlen].chomp('.') + '...'
@@ -136,7 +136,7 @@ class String
     # options: charsize, no_blanks, strips
     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
+      opts = opts.fetch_opts [:flags], :strips=>true
       a = split("\n")
       opts[:charsize] ||= RUBY_VERSION < '1.9' && a[0].cyr? ? 2 : 1
       a.map {|string| string.strip.split_to_blocks(maxlen*opts[:charsize], opts.merge(:strict_overhead => false))}.flatten*"\n"

data/lib/rmtools/xml/finders.rb

@@ -5,18 +5,27 @@ module LibXML::XML
   DefaultNS = {}
 
   FindByIndex = lambda {|node, ns, ss|
-    node = node.is(Array) ?
-      node.sum {|n| n.__find(nil, ns, ss)[ss.matched[1..-2].to_i].to_a} : 
-                      node.__find(nil, ns, ss)[ss.matched[1..-2].to_i]
-    node.is(Array) && node.size == 1 ? node[0] : node
+    index = ss.matched[1..-2]
+    if index.index('.')
+      range = Range(*index.split('..').to_is)
+      node = node.is(Array) ?
+        node.sum([]) {|n| n.__find(nil, ns, ss).to_a[range]} : 
+                        node.__find(nil, ns, ss).to_a[range]
+    else
+      node = node.is(Array) ?
+        node.map {|n| n.__find(nil, ns, ss)[index.to_i]}.compact : 
+                        node.__find(nil, ns, ss)[index.to_i]
+    end
+    node.is(Array) && node.size < 2 ? node[0] : node
   }
+  
   FindByProc = lambda {|node, ns, ss|
     str_to_eval = ss.matched[1..-2]
-    '_' >> str_to_eval if !str_to_eval['_']
+    block = eval "lambda {|_| #{'_' if !str_to_eval['_']}#{str_to_eval}}"
     node = node.is(Array) ?
-      node.sum {|n| n.__find(nil, ns, ss).select{|_| eval str_to_eval}.to_a} : 
-                      node.__find(nil, ns, ss).select{|_| eval str_to_eval}
-    node.is(Array) && node.size == 1 ? node[0] : node
+      node.sum([]) {|n| n.__find(nil, ns, ss).select(&block).to_a} : 
+                      node.__find(nil, ns, ss).select(&block)
+    node.is(Array) && node.size < 2 ? node[0] : node
   }
     
   class Node
@@ -31,7 +40,7 @@ module LibXML::XML
     def find(xpath, nslist=DefaultNS)
       node = self
       ss = StringScanner.new xpath
-      ss.each %r{\[-?\d+\]|\{[^\}]+\}}, 
+      ss.each %r{\[-?\d+(\.\.\d+)?\]|\{[^\}]+\}}, 
         ?[ => lambda {|ss| 
           if node; node = FindByIndex[node, nslist, ss]
           else     return []     end  }, 
@@ -40,7 +49,7 @@ module LibXML::XML
           else     return []     end  },
         nil => lambda {|str|
           node = node.is(Array) ?
-            node.sum {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
+            node.sum([]) {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
         }
       node ? (!ss.eos? || node.is(Array)) ? node : [node] :  []
     end
@@ -64,7 +73,7 @@ module LibXML::XML
       xpath.sub!(/^([\w*])/, '//\1')
       node = self
       ss = StringScanner.new xpath
-      ss.each %r{\[-?\d+\]|\{[^\}]+\}}, 
+      ss.each %r{\[-?\d+(\.\.\d+)?\]|\{[^\}]+\}}, 
         ?[ => lambda {|ss|
           if node; node = FindByIndex[node, nslist, ss]
           else     return []     end  }, 
@@ -73,7 +82,7 @@ module LibXML::XML
           else     return []     end  },
         nil => lambda {|str|
           node = node.is(Array) ?
-            node.sum {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
+            node.sum([]) {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
         }
       node ? (!ss.eos? || node.is(Array)) ? node : [node] :  []
     end

data/lib/rmtools/xml/string.rb

@@ -25,10 +25,15 @@ class String
     str = b || "<html/>"
     doc = if forceutf
         XML::HTMLParser.string(str.xml_to_utf, :options => 97,
-                                        :encoding => XML::Encoding::UTF_8).parse
+                                                             :encoding => XML::Encoding::UTF_8).parse
       else
         begin
-          XML::HTMLParser.string(str, :options => 97).parse
+          if RUBY_VERSION > '1.9'
+            XML::HTMLParser.string(str, :options => 97, 
+                                                  :encoding => XML::Encoding.const_get(__ENCODING__.to_s.tr('-','_').to_sym)).parse
+          else
+            XML::HTMLParser.string(str, :options => 97).parse
+          end
         rescue
           if enc = xml_charset
             XML::HTMLParser.string(str, :options => 97, 

data/lib/rmtools_dev.rb

@@ -1,6 +1,6 @@
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 $__MAIN__ = self
-require 'rmtools/load'
+require 'rmtools/init'
 RMTools::require 'dev'
 
 unless defined? Rails; class Object; include RMTools end end