rmtools 1.1.4 → 1.1.6

data/History.txt

@@ -7,3 +7,12 @@
 * Fixed some bugs
 * Divided by semantics
 * Compatible with ruby 1.8.7 (2010-08-16 patchlevel 302)
+
+=== Version 1.1.6
+
+* Rewrited few functions
+* Fixed bug with RDoc and RI
+* Compatible with 1.9
+* Binding#start_interaction and RMTools::Observer for debugging purposes
+* To require any file from lib/rmtools now RMTools::require is used
+* In order to not overload Rails apps initialization tracing is lightened and gem now may be also required as "rmtools_nodebug" and "rmtools_notrace"

data/Manifest.txt

@@ -93,6 +93,7 @@ lib/rmtools/conversions/int.rb
 lib/rmtools/enumerable.rb
 lib/rmtools_notrace.rb
 lib/rmtools_nodebug.rb
+lib/rmtools_no_b.rb
 ./Rakefile
 ./Manifest.txt
 ./License.txt

data/README.txt

@@ -1,5 +1,5 @@
-Copyright (c) 2010
-    Anonymous <tinbka@gmail.com>
+Copyright (c) 2010-2011
+    Shinku <tinbka@gmail.com>
 
 This work is licensed under the same license as Ruby language.
 

data/Rakefile

@@ -2,11 +2,11 @@ require 'rake'
 require 'lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.1.4'
+RMTOOLS_VERSION = '1.1.6'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do |h|
-        h.developer("Shinku Templar", "tinbka@gmail.com")
+        h.developer("Shinku", "tinbka@gmail.com")
 
         h.summary = 'Yet another Ruby applied framework'
         h.description = h.paragraphs_of('README.txt', 2..3).join("\n\n")

data/lib/rmtools.rb

@@ -1,4 +1,6 @@
+# encoding: utf-8
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 require 'rmtools/load'
-require_with_path 'debug'
-require_with_path 'console'
+RMTools::require 'b'
+RMTools::require 'debug'
+RMTools::require 'console'

data/lib/rmtools/b.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # {obj.b -> self or false} with python logic
 # Since 2.3.8 active_support has analogue: #presence
 

data/lib/rmtools/console.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/console/coloring.rb

@@ -1,4 +1,5 @@
-require_with_path 'enumerable/hash'
+# encoding: utf-8
+RMTools::require 'enumerable/hash'
 
 module RMTools
 
@@ -58,12 +59,12 @@ module RMTools
   Painter = Coloring.new
   ['sub', 'gsub', 'sub!', 'gsub!'].each {|m| 
     Coloring.module_eval "
-    def #{m.sub 'sub', 'hl'} str, pattern, color=:red_bold
+    def #{m.sub('sub') {'hl'}} str, pattern, color=:red_bold
         str.#{m}(pattern) {|word| send color, word}
     end
   "
     module_eval "
-    def #{m.sub 'sub', 'hl'} str, pattern, color=:red_bold
+    def #{m.sub('sub') {'hl'}} str, pattern, color=:red_bold
         str.#{m}(pattern) {|word| Painter.send color, word}
     end
   "

data/lib/rmtools/console/highlight.rb

@@ -1,4 +1,5 @@
-require_with_path 'console/coloring'
+# encoding: utf-8
+RMTools::require 'console/coloring'
 
 class String
   

data/lib/rmtools/console/printing.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RMTools
 
   # transparent print: print text (or object details) and erase it

data/lib/rmtools/conversions.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/conversions/enum.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cgi'
 
 module Enumerable

data/lib/rmtools/conversions/int.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Integer
   
     def kb;  self*1024 end

data/lib/rmtools/conversions/string.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cgi'
 
 class String

data/lib/rmtools/core.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/core/aliases.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Object
   alias :resto :respond_to?
   alias :requrie :require # most frequent typo, lol

data/lib/rmtools/core/arguments.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Array
   
   # a, b, opts = [<hash1>].fetch_opts([<hash2>, <object1>]) may work unintuitive:

data/lib/rmtools/core/class.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Class
   
   # define python-style initializer

data/lib/rmtools/core/deprecation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Object
   # class Klass
   #   def old_method *argv

data/lib/rmtools/core/js.rb

@@ -26,20 +26,20 @@ end
 class String
   if !method_defined? :plus
     alias :plus :+ 
-  end
-  
-  #   immutable:
-  # '123' + 95 # => '12395'
-  # '123'.plus 95 # => raise TypeError
-  #   mutable:
-  # '123' << 95 # => '12395'
-  # '123'.concat 95 # => '123_'
-  def +(str)
-    plus str.to_s
-  end
   
-  def <<(str)
-    concat str.to_s
+    #   immutable:
+    # '123' + 95 # => '12395'
+    # '123'.plus 95 # => raise TypeError
+    #   mutable:
+    # '123' << 95 # => '12395'
+    # '123'.concat 95 # => '123_'
+    def +(str)
+      plus str.to_s
+    end
+    
+    def <<(str)
+      concat str.to_s
+    end
   end
   
 end

data/lib/rmtools/core/kernel.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Kernel
   
   # re-require

data/lib/rmtools/core/module.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_support/core_ext/module/remove_method'
 
 class Module
@@ -47,11 +48,13 @@ private
   #   end
   def decorate f1, f2
     f1_clone = f1.to_s.dup
-    f1_clone.bump! '_' while method_defined? f1_clone.to_sym
-    class_eval do
-      alias :"#{f1_clone}" :"#{f1}"
-      define_method(f1) {|*args| send(f2, *args, &method(f1_clone))}
-    end
+    f1_clone.bump! '_' while private_method_defined? f1_clone.to_sym
+    class_eval(<<-EVAL, __FILE__, __LINE__+1
+      alias #{f1_clone} #{f1}
+      private :#{f1_clone}
+      def #{f1}(*args) #{f2}(*args, &method(:#{f1_clone})) end
+    EVAL
+    )
   end
   
   #   some FP, example:
@@ -71,11 +74,13 @@ private
   #   end
   def decorated_fof f1, f2
     f1_clone = f1.to_s.dup
-    f1_clone.bump! '_' while method_defined? f1_clone
-    class_eval do
-      alias :"#{f1_clone}" :"#{f1}"
-      define_method(f1) {send(f2, &method(f1_clone))}
-    end
+    f1_clone.bump! '_' while private_method_defined? f1_clone
+    class_eval(<<-EVAL, __FILE__, __LINE__+1
+      alias #{f1_clone} #{f1}
+      private :#{f1_clone}
+      def #{f1}() #{f2}(&method(:#{f1_clone})) end
+    EVAL
+    )
   end
   
 end

data/lib/rmtools/core/proc.rb

@@ -15,4 +15,8 @@ class Proc
     proc
   end
   
+  if RUBY_VERSION < '1.9'
+    def source_location; str.match(/([^@]+):(\d+)>$/)[1..2] end
+  end
+  
 end

data/lib/rmtools/core/regexp.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Regexp
   
   def | re

data/lib/rmtools/core/string_compliance.rb

@@ -1,31 +1,59 @@
+# encoding: utf-8
 class String
 
   if RUBY_VERSION < "1.9"
     def ord; self[0] end
+    
+    # TODO?
+    # [g]sub[!] in ruby 1.8 takes the second arg which can operate \1, \2 etc keys as if it were MatchData parts
+    # Though, in ruby 1.9 it ignores (without exception) the second arg and only pay attention to block. I can emulate ruby 1.8 second-arg-behaviour but
+    # block passed to old method must be of the same context as that method's caller
+    # in order to $~, $1 and such variables to work (and blocks with them are actualy used i.e. in Readline).
+    # So now I'm afraid it useless to redefine these methods for 1.9 but I'll try some to hack it in C-ext
+=begin
   else
-    # BUGFIX?
     alias :sub19 :sub
     alias :sub19! :sub!
     alias :gsub19 :gsub
     alias :gsub19! :gsub!
     
+    def sub a,b=nil,&c
+      if b
+        if b=~/\\\d/
+          b = b.gsub19(/\\\d/) {|m| "\#$#{m[1]}"}
+          sub19(a) {eval "\"#{b}\""}
+        else sub19(a) {b} end
+      else gsub19(a, &c) end
+    end
+    
     def sub! a,b=nil,&c
       if b
         if b=~/\\\d/
-          b = b.sub19!(/\\\d/) {|m| "\#{$#{m[1,1]}}"}
+          b = b.gsub19(/\\\d/) {|m| "\#$#{m[1]}"}
           sub19!(a) {eval "\"#{b}\""}
         else sub19!(a) {b} end
-      else sub19! a,&c end
+      else sub19!(a, &c) end
     end
 
-    def sub a,b=nil,&c
+    def gsub a,b=nil,&c
       if b
         if b=~/\\\d/
-          b = b.sub19(/\\\d/) {|m| "\#{$#{m[1,1]}}"}
-          sub19(a) {eval "\"#{b}\""}
-        else sub19(a) {b} end
-      else sub19 a,&c end
+          b = b.gsub19(/\\\d/) {|m| "\#$#{m[1]}"}
+          gsub19(a) {eval "\"#{b}\""}
+        else gsub19(a) {b} end
+      else gsub19(a, &c) end
+    end
+    
+    def gsub! a,b=nil,&c
+      if b
+        if b=~/\\\d/
+          b = b.gsub19(/\\\d/) {|m| "\#$#{m[1]}"}
+          p a
+          gsub19!(a) {p "\"#{b}\""; p $~; p eval "\"#{b}\""; p eval "\"#{b}\""}
+        else gsub19!(a) {b} end
+      else gsub19!(a, &c) end
     end
+=end
   end
 
 end

data/lib/rmtools/db.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 begin
   require 'active_record'
   ActiveRecord::Base
-  require_with_path __FILE__, 'active_record'
+  RMTools::require __FILE__, 'active_record'
 rescue Exception
   nil
 end

data/lib/rmtools/db/active_record.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_record'
 
 module ActiveRecord

data/lib/rmtools/debug.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/debug/binding.rb

@@ -1,5 +1,6 @@
-require_with_path 'debug/logging'
-require_with_path 'debug/present'
+# encoding: utf-8
+RMTools::require 'debug/logging'
+RMTools::require 'debug/present'
 
 class Binding
   
@@ -41,16 +42,16 @@ class Binding
   # end
   def start_interaction(sandbox=true)
     $__env__ = inspect_env
+    puts "Caller trace:"
     Kernel.puts RMTools.format_trace(caller(2)).join("\n")
+    puts "Environment:"
     $__env__.present
     $__binding__ = self
-    if defined? SCRIPT_LINES__
-      SCRIPT_LINES__['(irb#1)'] = []
+    if defined? SCRIPT_LINES__ and (file = caller(0)[0].parse(:caller).file) =~ /^\(irb/
+      SCRIPT_LINES__["(#{file[1..-2].next_version '#'})"] = []
     end
     
-    $log << "entering irb"
     $__MAIN__.irb$__binding__
-    $log << "exiting irb"
     
     if sandbox
       self.eval($__env__.keys.map {|k, v| "#{k} = $__env__[#{k.inspect}]" if k != 'self'} * '; ')

data/lib/rmtools/debug/highlight.rb

@@ -1,4 +1,5 @@
-require_with_path 'console/coloring'
+# encoding: utf-8
+RMTools::require 'console/coloring'
 
 module RMTools
     
@@ -17,7 +18,7 @@ end
 class Proc
   
   def inspect
-    "#{str=to_s}: #{@string ? Painter.green(@string) : "\n"+RMTools.highlighted_line(*str.match(/([^@]+):(\d+)>$/)[1..2])}"
+    "#{str=to_s}: #{@string ? Painter.green(@string) : "\n"+RMTools.highlighted_line(*source_location)}"
   end
   
 end

data/lib/rmtools/debug/logging.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-require_with_path 'console/coloring'
-require_with_path 'text/string_parse'
-require_with_path 'b'
+RMTools::require 'console/coloring'
+RMTools::require 'text/string_parse'
+RMTools::require 'b'
 
 module RMTools
 

data/lib/rmtools/debug/observing.rb

@@ -1,7 +1,12 @@
-require_with_path 'debug/binding'
+# encoding: utf-8
+RMTools::require 'debug/binding'
 require 'active_support/core_ext/class'
 
 module RMTools
+
+  # Makes binding stack as well as caller stack, 
+  # which can be used to catch errors and directly operate within context 
+  # in which error has been occured.
   class Observer
     cattr_reader :ignore_path, :ignore_gems, :ignore_names, :ignore_all_gems
     cattr_accessor :keep_binding_stack

data/lib/rmtools/debug/timer.rb

@@ -1,4 +1,5 @@
-require_with_path 'console/coloring'
+# encoding: utf-8
+RMTools::require 'console/coloring'
 
 module RMTools
 

data/lib/rmtools/debug/traceback.rb

@@ -1,5 +1,6 @@
-require_with_path 'debug/highlight'
-require_with_path 'debug/logging'
+# encoding: utf-8
+RMTools::require 'debug/highlight'
+RMTools::require 'debug/logging'
 
 module RMTools
 

data/lib/rmtools/debug_notrace.rb

@@ -1 +1,2 @@
-require_with_path 'debug', '{binding,logging,present,timer}'
+# encoding: utf-8
+RMTools::require 'debug', '{binding,logging,present,timer}'

data/lib/rmtools/enumerable.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/enumerable/array.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'active_support/core_ext/array'
-require_with_path 'functional/fold'
+RMTools::require 'functional/fold'
 
 class Array
 

data/lib/rmtools/enumerable/array_iterators.rb

@@ -1,4 +1,5 @@
-require_with_path 'enumerable/array'
+# encoding: utf-8
+RMTools::require 'enumerable/array'
 
 unless defined? RMTools::Iterators
   

data/lib/rmtools/enumerable/common.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'set'
 
 module Enumerable

data/lib/rmtools/enumerable/hash.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_support/core_ext/hash'
 
 class Hash

data/lib/rmtools/enumerable/object_space.rb

@@ -1,4 +1,5 @@
-require_with_path 'enumerable/common'
+# encoding: utf-8
+RMTools::require 'enumerable/common'
 
 module ObjectSpace
   extend Enumerable

data/lib/rmtools/experimental.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/experimental/blackhole.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class BlackHole
 
   # abc = BlackHole.new

data/lib/rmtools/experimental/dumps.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Array
   
   def dump(depth=5)

data/lib/rmtools/experimental/numeric.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Float
   
   def partial(range=100)

data/lib/rmtools/experimental/rails_backtrace.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RMTools
   def highlighted_line_html file, line
     if File.file?(file)

data/lib/rmtools/experimental/tree.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Array
   
 	def to_tree(set_keys=false)

data/lib/rmtools/fs.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/fs/dir.rb

@@ -1,4 +1,5 @@
-require_with_path 'fs/file'
+# encoding: utf-8
+RMTools::require 'fs/file'
 
 class Dir
   

data/lib/rmtools/fs/file.rb

@@ -1,4 +1,5 @@
-require_with_path 'fs/io'
+# encoding: utf-8
+RMTools::require 'fs/io'
 
 class File
   

data/lib/rmtools/fs/io.rb

@@ -15,22 +15,20 @@ module RMTools
 
     def rw(df, value=nil)
       return false if value.nil?
-      df.gsub!('\\', '/')
+      df = df.tr '\\', '/'
       path = File.dirname(df)
       FileUtils.mkpath(path) if !File.directory?(path)
-      mode = RUBY_VERSION > '1.9' ? :wb : 'wb'
-      File.open(df, mode) {|f| f << value}
+      File.open(df, File::CREAT|File::WRONLY|File::TRUNC) {|f| f << value}
       value.size
     end
   
     def write(df, value='', pos=0)
       return false if value.nil?
-      df.gsub!('\\', '/')
+      df = df.tr '\\', '/'
       path = File.dirname(df)
       FileUtils.mkpath(path) if !File.directory?(path)
       if pos == 0
-        mode = RUBY_VERSION > '1.9' ? :ab : 'ab'
-        File.open(df, mode) {|f| f << value}
+        File.open(df, File::CREAT|File::WRONLY|File::APPEND) {|f| f << value}
       else
         if pos < 0
           if !File.file?(df)  
@@ -40,17 +38,17 @@ module RMTools
           end
           pos = size - pos
         end
-        File.open(df, 'r+') {|f| f.pos = pos; f << value}
+        File.open(df, File::CREAT|File::WRONLY) {|f| f.pos = pos; f << value}
       end
       value.size
     end
   
-    def read(df, mode=(RUBY_VERSION > '1.9' ? :rb : 'rb'))
-      df.gsub!('\\', '/')
+    def read(df)
+      df = df.tr '\\', '/'
       if File.file?(df)
-        File.open(df, mode) {|f| f.read}
+        File.open(df, File::RDONLY) {|f| f.read}
       else
-        STDERR.puts "#{df} is missed!"
+        STDERR.puts "couldn't read from #{df.inspect}; file missed"
       end
     end
   

data/lib/rmtools/fs/tools.rb

@@ -1,4 +1,5 @@
-require_with_path 'fs/io'
+# encoding: utf-8
+RMTools::require 'fs/io'
 
 module RMTools
     

data/lib/rmtools/functional.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/functional/fold.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Enumerable
 
   def foldl(o, m=nil)

data/lib/rmtools/functional/string_to_proc.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # String#to_proc
 #
 # See http://weblog.raganwald.com/2007/10/stringtoproc.html ( Subscribe in a reader)

data/lib/rmtools/functional/unfold.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Object
 
   # &splitter must return a pair

data/lib/rmtools/install.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require File.expand_path('require', File.dirname(__FILE__))
-require_with_path 'fs'
+RMTools::require 'fs'
 require 'digest/md5'
 
 def ext_files_not_modified(ext_name='rmtools', version='\d')

data/lib/rmtools/ip.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/ip/numeric.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Integer
   
     def from_ip

data/lib/rmtools/ip/string.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'scanf'
 
 class String

data/lib/rmtools/lang.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/lang/ansi.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'iconv'
 
 module RMTools

data/lib/rmtools/lang/cyrillic.rb

@@ -1,4 +1,5 @@
-require_with_path 'lang/ansi'
+# encoding: utf-8
+RMTools::require 'lang/ansi'
 
 class String
   include RMTools::Cyrillic

data/lib/rmtools/lang/regexp.rb

@@ -1,4 +1,5 @@
-require_with_path 'lang/cyrillic'
+# encoding: utf-8
+RMTools::require 'lang/cyrillic'
 
 class Regexp
   

data/lib/rmtools/lang/shortcuts.rb

@@ -1,4 +1,5 @@
-require_with_path 'lang/ansi'
+# encoding: utf-8
+RMTools::require 'lang/ansi'
 
 class String
     # Actually, for short strings and 1251<->65001 it's much faster to use predefined ANSI2UTF and UTF2ANSI procs

data/lib/rmtools/load.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_support'
 
 module RMTools
@@ -5,11 +6,11 @@ module RMTools
   VERSION = IO.read(File.join dir, '..', '..', 'Rakefile').match(/RMTOOLS_VERSION = '(.+?)'/)[1]
   
   require File.expand_path('require', dir)
-  [ 'core', 'enumerable', 'text', 'b', 'time', 'functional', 
+  [ 'core', 'enumerable', 'text', 'time', 'functional', 
     'conversions', 'ip', 'lang', 'rand',
     'fs', 'db', 'xml',
     '../rmtools.so'
-  ].each {|file| require_with_path file}
+  ].each {|file| RMTools::require file}
 end
 
 # Comment out in case of any method conflicts

data/lib/rmtools/rand.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/rand/array.rb

@@ -1,4 +1,5 @@
-require_with_path 'rand/enum'
+# encoding: utf-8
+RMTools::require 'rand/enum'
 
 module RMTools
   

data/lib/rmtools/rand/enum.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Enumerable
 
   def rand

data/lib/rmtools/rand/range.rb

@@ -1,4 +1,5 @@
-require_with_path 'rand/enum'
+# encoding: utf-8
+RMTools::require 'rand/enum'
 
 class Range
   

data/lib/rmtools/rand/string.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require_with_path 'lang/ansi'
+RMTools::require 'lang/ansi'
 
 module RMTools
   begin

data/lib/rmtools/require.rb

@@ -1,13 +1,14 @@
-module Kernel
-  # ` require_with_path __FILE__, "*" ' requires all ruby files from dir named as file
-  # ` require_with_path "folder", "file" ' requires file.rb from dir `folder' in working directory
-  # `require_with_path "file" ' requires 'file.rb' from working directory
-  def require_with_path(location, mask=nil)
+# encoding: utf-8
+module RMTools
+  # ` RMTools::require __FILE__, "*" ' requires all ruby files from dir named as file
+  # ` RMTools::require "folder", "file" ' requires file.rb from dir `folder' in working directory
+  # `RMTools::require "file" ' requires 'file.rb' from working directory
+  def self.require(location, mask=nil)
     if !mask
       location, mask = File.dirname(__FILE__), location # /path/to/gems/rmtools
     end
     mask += '.rb' unless mask['.']
     location = File.expand_path(location).chomp('.rb')
-    Dir.glob(File.join location, mask) {|file| require file}
+    Dir.glob(File.join location, mask) {|file| Kernel.require file}
   end
 end

data/lib/rmtools/text.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/text/string_parse.rb

@@ -1,4 +1,5 @@
-require_with_path 'conversions/string'
+# encoding: utf-8
+RMTools::require 'conversions/string'
 
 class String
   CALLER_RE =    %r{^(.*?([^/\\]+?))#{	    # ( path ( file ) ) 
@@ -48,12 +49,12 @@ class String
     end
     
     def parseuri
-      deprecation "Use String#parse(:uri) instead."
+      deprecate_method "Use String#parse(:uri) instead."
       parse :uri
     end
     
     def parseip(range=nil)
-      deprecation "Use String#parse(:ip#{'_range' if range}) instead."
+      deprecate_method "Use String#parse(:ip#{'_range' if range}) instead."
       parse :"ip#{'_range' if range}"
     end
     

data/lib/rmtools/text/string_simple.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class String
   
   def inline

data/lib/rmtools/text/string_split.rb

@@ -1,5 +1,6 @@
-require_with_path 'text/string_simple'
-require_with_path 'enumerable/array_iterators'
+# encoding: utf-8
+RMTools::require 'text/string_simple'
+RMTools::require 'enumerable/array_iterators'
 
 class String
     

data/lib/rmtools/text/textilize.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RMTools
 
   def dump_recurse(obj, depth, maxdepth)

data/lib/rmtools/time.rb

@@ -1 +1,2 @@
-require_with_path __FILE__, '*'
+# encoding: utf-8
+RMTools::require __FILE__, '*'

data/lib/rmtools/time/global.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RMTools
 
   def puttime(ms=nil)

data/lib/rmtools/time/russian.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class String
   
     def digit_date

data/lib/rmtools/xml.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 begin
   require 'xml'
   LibXML::XML
-  require_with_path __FILE__, 'libxml'
+  RMTools::require __FILE__, 'libxml'
 rescue Exception
   nil
 end

data/lib/rmtools/xml/document.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LibXML::XML
 
   class Document

data/lib/rmtools/xml/finders.rb

@@ -1,4 +1,5 @@
-require_with_path 'text/string_scanner'
+# encoding: utf-8
+RMTools::require 'text/string_scanner'
 
 module LibXML::XML
   DefaultNS = {}

data/lib/rmtools/xml/libxml.rb

@@ -1,6 +1,7 @@
+# encoding: utf-8
 require 'xml'
-require_with_path 'xml/{xpath,finders,node,document,string}'
-require_with_path 'enumerable/common'
+RMTools::require 'xml/{xpath,finders,node,document,string}'
+RMTools::require 'enumerable/common'
 
 module LibXML::XML
   Error.reset_handler

data/lib/rmtools/xml/node.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LibXML::XML
     
     class Node

data/lib/rmtools/xml/string.rb

@@ -1,4 +1,5 @@
-require_with_path 'lang/shortcuts'
+# encoding: utf-8
+RMTools::require 'lang/shortcuts'
 
 class String
   

data/lib/rmtools/xml/xpath.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LibXML
 
   module XML::XPath

data/lib/rmtools_no_b.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+require 'rmtools/load'

data/lib/rmtools_nodebug.rb

@@ -1 +1,3 @@
-require 'rmtools/load'
+# encoding: utf-8
+require 'rmtools/load'
+RMTools::require 'b'

data/lib/rmtools_notrace.rb

@@ -1,4 +1,6 @@
+# encoding: utf-8
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 require 'rmtools/load'
-require_with_path 'debug_notrace'
-require_with_path 'console'
+RMTools::require 'b'
+RMTools::require 'debug_notrace'
+RMTools::require 'console'

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
-- Shinku Templar
+- Shinku
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +03:00
+date: 2011-02-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
 - lib/rmtools/enumerable.rb
 - lib/rmtools_notrace.rb
 - lib/rmtools_nodebug.rb
+- lib/rmtools_no_b.rb
 - ./Rakefile
 - ./Manifest.txt
 - ./License.txt