rmtools 1.1.2 → 1.1.4

data/Manifest.txt

@@ -25,6 +25,7 @@ lib/rmtools/core/boolean.rb
 lib/rmtools/core/aliases.rb
 lib/rmtools/core/module.rb
 lib/rmtools/core/object.rb
+lib/rmtools/core/deprecation.rb
 lib/rmtools/core/regexp.rb
 lib/rmtools/core/class.rb
 lib/rmtools/core/proc.rb
@@ -50,6 +51,7 @@ lib/rmtools/console/highlight.rb
 lib/rmtools/core.rb
 lib/rmtools/db.rb
 lib/rmtools/debug/present.rb
+lib/rmtools/debug/observing.rb
 lib/rmtools/debug/traceback.rb
 lib/rmtools/debug/binding.rb
 lib/rmtools/debug/logging.rb
@@ -59,7 +61,9 @@ lib/rmtools/fs.rb
 lib/rmtools/ip.rb
 lib/rmtools/lang.rb
 lib/rmtools/functional.rb
+lib/rmtools/load.rb
 lib/rmtools/experimental.rb
+lib/rmtools/install.rb
 lib/rmtools/functional/string_to_proc.rb
 lib/rmtools/functional/fold.rb
 lib/rmtools/functional/unfold.rb
@@ -79,16 +83,16 @@ lib/rmtools/experimental/numeric.rb
 lib/rmtools/experimental/string.rb
 lib/rmtools/experimental/blackhole.rb
 lib/rmtools/experimental/tree.rb
-lib/rmtools/experimental/deprecation.rb
 lib/rmtools/experimental/dumps.rb
 lib/rmtools/experimental/rails_backtrace.rb
 lib/rmtools/xml.rb
 lib/rmtools/conversions.rb
-lib/rmtools/setup.rb
 lib/rmtools/conversions/string.rb
 lib/rmtools/conversions/enum.rb
 lib/rmtools/conversions/int.rb
 lib/rmtools/enumerable.rb
+lib/rmtools_notrace.rb
+lib/rmtools_nodebug.rb
 ./Rakefile
 ./Manifest.txt
 ./License.txt

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake'
-require './lib/rmtools/setup'
+require 'lib/rmtools/install'
 compile_manifest
 
-RMTools_VERSION = '1.1.2'
+RMTOOLS_VERSION = '1.1.4'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do |h|
@@ -24,8 +24,6 @@ rescue Exception => e
     STDERR.puts "error message is: #{e.message}"
 end
 
-puts "Installing RMTools..."
-
 ruby  = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 windoze = PLATFORM =~ /mswin32/
 make = windoze ? 'nmake' : 'make'
@@ -38,6 +36,4 @@ Dir.chdir "ext" do
   if File.file? 'Makefile'
     system "#{make} clean" and FileUtils.rm_f "Makefile"
   end
-end unless ext_files_not_modified 'rmtools', RMTools_VERSION
-  
-puts "RMTools installed!"
+end unless ext_files_not_modified 'rmtools', RMTOOLS_VERSION

data/lib/rmtools/core/class.rb

@@ -40,4 +40,4 @@ class Class
   
 end
 
-[Array, Hash, Regexp, File, Dir].each {|klass| klass.__init__}
+[Hash, Regexp, File, Dir].each {|klass| klass.__init__}

data/lib/rmtools/{experimental → core}/deprecation.rb

@@ -1,9 +1,7 @@
-require_with_path 'console/coloring'
-
 class Object
   # class Klass
   #   def old_method *argv
-  #     deprecation :new_method, *argv
+  #     deprecate_method :new_method, *argv
   #   end
   # end
   # Klass.new.old_method
@@ -13,15 +11,15 @@ class Object
   #
   # Same shit:
   # class Klass
-  #   deprecate :old_method, :new_method
+  #   deprecate_method :old_method, :new_method
   # end
-  def deprecation message="", *argv
+  def deprecate_method message="", *argv
     caler = caller[0].parse(:caller)
     sym = nil
     if message.is Symbol
       sym, message = message, "Use ##{message} instead."
     end
-    STDERR.puts "#{RMTools::Painter.red 'DEPRECATION'} from #{RMTools::Painter.gray caler.path}: #{self.class}##{caler.func} is deprecated. #{message.capitalize}" if caler
+    STDERR.puts "DEPRECATION from #{caler.path}: #{self.class}##{caler.func} is deprecated. #{message.capitalize}" if caler
     __send__ sym, *argv if sym
   end
   
@@ -29,8 +27,8 @@ end
 
 class Class
   
-  def deprecate old_method, new_method
-    define_method(new_method) {|*argv| deprecation old_method, *argv}
+  def deprecate_method old_method, new_method
+    define_method(new_method) {|*argv| deprecate_method old_method, *argv}
   end
   
 end

data/lib/rmtools/core/module.rb

@@ -1,6 +1,16 @@
-# encoding: utf-8
-class Module # :nodoc:
-                
+require 'active_support/core_ext/module/remove_method'
+
+class Module
+  
+  # rewrite of active suport method to not initialize significant part of NameErrors
+  def remove_possible_method(method)
+    if method_defined? method
+      begin remove_method method
+      rescue NameError
+      end
+    end
+  end
+  
   def children
     constants.map! {|c| module_eval c}.find_all {|c| c.kinda Module rescue()}
   end
@@ -11,7 +21,7 @@ class Module # :nodoc:
   end
   
   def self_name
-    @self_name ||= name.rsplit('::', 2)[1] || name
+    @self_name ||= name.match[/[^:]+$/]
   end
   
   def my_methods filter=//

data/lib/rmtools/db.rb

@@ -2,6 +2,6 @@ begin
   require 'active_record'
   ActiveRecord::Base
   require_with_path __FILE__, 'active_record'
-rescue
+rescue Exception
   nil
 end

data/lib/rmtools/debug/binding.rb

@@ -1,3 +1,6 @@
+require_with_path 'debug/logging'
+require_with_path 'debug/present'
+
 class Binding
   
   def inspect_local_variables
@@ -41,6 +44,9 @@ class Binding
     Kernel.puts RMTools.format_trace(caller(2)).join("\n")
     $__env__.present
     $__binding__ = self
+    if defined? SCRIPT_LINES__
+      SCRIPT_LINES__['(irb#1)'] = []
+    end
     
     $log << "entering irb"
     $__MAIN__.irb$__binding__
@@ -52,25 +58,4 @@ class Binding
     $__env__ = nil
   end
   
-end
-=begin
-$ignore_gems = %w{rmtools i18n active}
-$ignore_names = %w{irbrc.rb}
-$ignore_path = %r{(/usr/lib/ruby/(1.8/|gems/1.8/gems/#{"(#{$ignore_gems*'|'})" if !$ignore_all_gems})#{"|(#{$ignore_names*'|'})" if $ignore_names.b})}
-$binding_stack = []
-set_trace_func proc {|event, file, line, id, binding_here, classname|
-  if file !~ $ignore_path
-    if event == 'call'
-      $binding_stack << binding_here
-    elsif !$keep_binding_stack and event == 'return'
-      $binding_stack.pop
-    elsif event == 'raise'
-      puts Painter.c_b "STOP!!!"
-      $keep_binding_stack = true
-    end
-    puts "#{event} by #{caller[2]} -> #{classname}##{id} <#{file}>; stack size = #{$binding_stack.size}" if event.in %w{raise call return} if $panic
-  end
-}
-  
-begin; abc; rescue => e; $keep_binding_stack = false; $binding_stack.inspect_envs.present; $binding_stack.last.start_interaction; p e; $binding_stack = [] end
-=end
+end

data/lib/rmtools/debug/highlight.rb

@@ -3,11 +3,11 @@ require_with_path 'console/coloring'
 module RMTools
     
   def highlighted_line(file, line)
-    if defined? SCRIPT_LINES__
-      "   >>   #{Painter.green SCRIPT_LINES__[file][line.to_i - 1].chop}" if SCRIPT_LINES__[file]
+    if defined? SCRIPT_LINES__ and SCRIPT_LINES__[file]
+      "   >>   #{Painter.green SCRIPT_LINES__[file][line.to_i - 1].chop}"
     else
       file = Readline::TEMPLOG if file == '(irb)' and defined? Readline::TEMPLOG
-      "   >>   #{Painter.green read_lines(file, line.to_i).chop}" if File.file? file
+      "   #{Painter.cyan '>>'}   #{Painter.green read_lines(file, line.to_i).chop}" if File.file? file
     end
   end
     

data/lib/rmtools/debug/logging.rb

@@ -173,5 +173,7 @@ module RMTools
     def inspect() get_format end
           
   end
-  
+      
+  # default logger now initialized here
+  $log = RMLogger.new
 end

data/lib/rmtools/debug/observing.rb

@@ -0,0 +1,75 @@
+require_with_path 'debug/binding'
+require 'active_support/core_ext/class'
+
+module RMTools
+  class Observer
+    cattr_reader :ignore_path, :ignore_gems, :ignore_names, :ignore_all_gems
+    cattr_accessor :keep_binding_stack
+    
+    @@ignore_names = %w{irbrc.rb}
+    @@ignore_all_gems = true
+    
+    @@binding_stack = []
+    DefaultRescue = lambda {|e| 
+        @@binding_stack.inspect_envs.present
+        @@binding_stack.last.start_interaction
+        raise e
+    }
+    
+    def self.ignore_names=ary
+      @@ignore_names =ary
+      update_ignore
+    end
+    def self.ignore_gems=ary
+      @@ignore_gems =ary
+      update_ignore
+    end
+    def self.ignore_all_gems=boolean
+      @@ignore_all_gems = boolean
+      update_ignore
+    end
+    
+    def self.update_ignore
+      @@ignore_path = %r{(/usr/lib/ruby/(1.8/|gems/1.8/gems/#{
+        "(#{@@ignore_gems*'|'})" if !@@ignore_all_gems and @@ignore_gems
+      })#{
+        "|(#{@@ignore_names*'|'})" if @@ignore_names.b
+      })}
+    end
+    
+    def self.start
+      @@binding_stack.clear
+      @@keep_binding_stack = false
+      set_trace_func proc {|event, file, line, id, binding_here, classname|
+        if file !~ @@ignore_path
+          if event == 'call'
+            @@binding_stack << binding_here
+          elsif !@@keep_binding_stack and event == 'return'
+            @@binding_stack.pop
+          elsif event == 'raise'
+            @@binding_stack << binding_here
+            @@keep_binding_stack = true
+          end
+          $log.debug {"#{event} by #{caller[2]} -> #{classname}##{id} <#{file}>; stack size = #{@@binding_stack.size}" if event.in %w{raise call return}}
+        end
+      }
+    end
+    
+    def self.catch(rescue_proc=DefaultRescue)
+      begin yield
+      rescue => e
+        @@keep_binding_stack = false
+        begin
+          rescue_proc[e]
+        ensure
+          @@binding_stack.clear
+        end
+      end
+    end
+    
+    def self.stop
+      set_trace_func nil
+    end
+    
+  end
+end

data/lib/rmtools/debug/traceback.rb

@@ -1,7 +1,7 @@
 require_with_path 'debug/highlight'
 require_with_path 'debug/logging'
 
-module Kernel
+module RMTools
 
 	# Python-like traceback for exceptions; uses ANSI coloring.
   # In case of any low-level ruby error it may hang up interpreter
@@ -18,20 +18,19 @@ module Kernel
   #   >>  10/0 end
   #        from (irb):3
   #   >>  divbyzero
-  def format_trace a
+  def format_trace(a)
     bt, calls, i = [], [], 0
   #  $log.info 'a.size', binding
     m = a[0].parse:caller
     while i < a.size
-  #    $log.info i
+  #    $log.info 'i a[i]', binding
       m2 = a[i+1] && a[i+1].parse(:caller)
-  #    $log.info 'm', binding
-  #    $log.info 'm2', binding
+  #    $log.info 'm m2', binding
   #    $log.info 'm.func [m.path,m.line]==[m2.path,m2.line]', binding if m and m2
-  #    $log.info 'm.path m.line', binding if m
+  #    $log.info 'm.path m.line a[i]', binding if m
   #    $log.info RMTools.highlighted_line(m.path, m.line) if m
       if m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
-        calls << "`#{m.func}' -> "
+        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 = []
@@ -44,22 +43,15 @@ module Kernel
     bt
   end
   
+  module_function :format_trace
 end
 
 class Class
-    
+  
+private
   def trace_format method
     if Exception.in ancestors
-      class_eval(method ? %{
-    def set_backtrace src
-      src = #{method} src
-      set_bt src
-    end
-    } : %{
-    def set_backtrace src
-      set_bt src
-    end
-    }, __FILE__, __LINE__-10)
+      self.__trace_format = method
     else
       raise NoMethodError, "undefined method `trace_format' for class #{self}"
     end
@@ -71,6 +63,7 @@ end
 if RUBY_VERSION < '1.9'
   class Exception
     alias :set_bt :set_backtrace
+    class_attribute :__trace_format
     
     # to use trace formatting ensure that you have SCRIPT_LINES__ constant set
     # SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
@@ -86,9 +79,19 @@ if RUBY_VERSION < '1.9'
     # end
     # it will be possible to get the lines entered in IRB
     # else it reads only ordinal require'd files
-    
+    def set_backtrace src
+      if format = self.class.__trace_format
+        src = RMTools.__send__ format, src
+      end
+      set_bt src
+    end
+  end
+  
+  class StandardError
     trace_format :format_trace
   end
   
-  SystemStackError.trace_format false
+  class SystemStackError
+    trace_format false
+  end
 end

data/lib/rmtools/load.rb

@@ -0,0 +1,19 @@
+require 'active_support'
+
+module RMTools
+  dir = File.dirname __FILE__
+  VERSION = IO.read(File.join dir, '..', '..', 'Rakefile').match(/RMTOOLS_VERSION = '(.+?)'/)[1]
+  
+  require File.expand_path('require', dir)
+  [ 'core', 'enumerable', 'text', 'b', 'time', 'functional', 
+    'conversions', 'ip', 'lang', 'rand',
+    'fs', 'db', 'xml',
+    '../rmtools.so'
+  ].each {|file| require_with_path file}
+end
+
+# Comment out in case of any method conflicts
+# Library methods use module functions explicitly
+class Object; include RMTools end
+
+# default logger now initialized in debug/logging

data/lib/rmtools/xml.rb

@@ -2,6 +2,6 @@ begin
   require 'xml'
   LibXML::XML
   require_with_path __FILE__, 'libxml'
-rescue
+rescue Exception
   nil
 end

data/lib/rmtools.rb

@@ -1,19 +1,4 @@
-require 'active_support'
-
-module RMTools
-  VERSION = '1.1.2'
-
-  require File.expand_path('require', __FILE__[0..-4])
-  [ 'core', 'enumerable', 'text', 'b', 'time', 'functional', 
-    'conversions', 'ip', 'lang', 'rand',
-    'console', 'fs', 'debug', 
-    'db', 'xml',
-    '../rmtools.so'
-  ].each {|file| require_with_path file}
-end
-
-$log = RMTools::RMLogger.new
-
-# Comment out in case of any method conflicts
-# Library methods use module functions explicitly
-class Object; include RMTools end
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+require 'rmtools/load'
+require_with_path 'debug'
+require_with_path 'console'

data/lib/rmtools_nodebug.rb

@@ -0,0 +1 @@
+require 'rmtools/load'

data/lib/rmtools_notrace.rb

@@ -0,0 +1,4 @@
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+require 'rmtools/load'
+require_with_path 'debug_notrace'
+require_with_path 'console'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Shinku Templar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +03:00
+date: 2011-02-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - lib/rmtools/core/aliases.rb
 - lib/rmtools/core/module.rb
 - lib/rmtools/core/object.rb
+- lib/rmtools/core/deprecation.rb
 - lib/rmtools/core/regexp.rb
 - lib/rmtools/core/class.rb
 - lib/rmtools/core/proc.rb
@@ -134,6 +135,7 @@ files:
 - lib/rmtools/core.rb
 - lib/rmtools/db.rb
 - lib/rmtools/debug/present.rb
+- lib/rmtools/debug/observing.rb
 - lib/rmtools/debug/traceback.rb
 - lib/rmtools/debug/binding.rb
 - lib/rmtools/debug/logging.rb
@@ -143,7 +145,9 @@ files:
 - lib/rmtools/ip.rb
 - lib/rmtools/lang.rb
 - lib/rmtools/functional.rb
+- lib/rmtools/load.rb
 - lib/rmtools/experimental.rb
+- lib/rmtools/install.rb
 - lib/rmtools/functional/string_to_proc.rb
 - lib/rmtools/functional/fold.rb
 - lib/rmtools/functional/unfold.rb
@@ -163,16 +167,16 @@ files:
 - lib/rmtools/experimental/string.rb
 - lib/rmtools/experimental/blackhole.rb
 - lib/rmtools/experimental/tree.rb
-- lib/rmtools/experimental/deprecation.rb
 - lib/rmtools/experimental/dumps.rb
 - lib/rmtools/experimental/rails_backtrace.rb
 - lib/rmtools/xml.rb
 - lib/rmtools/conversions.rb
-- lib/rmtools/setup.rb
 - lib/rmtools/conversions/string.rb
 - lib/rmtools/conversions/enum.rb
 - lib/rmtools/conversions/int.rb
 - lib/rmtools/enumerable.rb
+- lib/rmtools_notrace.rb
+- lib/rmtools_nodebug.rb
 - ./Rakefile
 - ./Manifest.txt
 - ./License.txt