rmtools 1.1.0 → 1.1.2

data/Manifest.txt

@@ -22,6 +22,7 @@ lib/rmtools/core/js.rb
 lib/rmtools/core/string_compliance.rb
 lib/rmtools/core/kernel.rb
 lib/rmtools/core/boolean.rb
+lib/rmtools/core/aliases.rb
 lib/rmtools/core/module.rb
 lib/rmtools/core/object.rb
 lib/rmtools/core/regexp.rb

data/Rakefile

@@ -2,9 +2,10 @@ require 'rake'
 require './lib/rmtools/setup'
 compile_manifest
 
+RMTools_VERSION = '1.1.2'
 begin
     require 'hoe'
-    config = Hoe.new('rmtools', '1.1.0') do |h|
+    config = Hoe.spec 'rmtools' do |h|
         h.developer("Shinku Templar", "tinbka@gmail.com")
 
         h.summary = 'Yet another Ruby applied framework'
@@ -37,6 +38,6 @@ Dir.chdir "ext" do
   if File.file? 'Makefile'
     system "#{make} clean" and FileUtils.rm_f "Makefile"
   end
-end unless ext_files_not_modified 'rmtools', '1.1.0'
+end unless ext_files_not_modified 'rmtools', RMTools_VERSION
   
 puts "RMTools installed!"

data/lib/rmtools.rb

@@ -1,6 +1,8 @@
 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',

data/lib/rmtools/console/coloring.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+require_with_path 'enumerable/hash'
+
 module RMTools
 
   class Coloring

data/lib/rmtools/core/aliases.rb

@@ -0,0 +1,10 @@
+class Object
+  alias :resto :respond_to?
+  alias :requrie :require # most frequent typo, lol
+end
+
+class String
+  if !method_defined? :/
+    alias :/ :split 
+  end
+end

data/lib/rmtools/core/arguments.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash'
-
 class Array
   
   # a, b, opts = [<hash1>].fetch_opts([<hash2>, <object1>]) may work unintuitive:

data/lib/rmtools/core/class.rb

@@ -38,4 +38,6 @@ class Class
     (self.public_instance_methods - self.superclass.public_instance_methods).sort!.grep(filter)
   end
   
-end
+end
+
+[Array, Hash, Regexp, File, Dir].each {|klass| klass.__init__}

data/lib/rmtools/core/object.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 class Object
-  alias :resto :respond_to?
-  alias :requrie :require # most frequent typo, lol
   
   def is klass
     if Array === klass

data/lib/rmtools/debug/binding.rb

@@ -39,18 +39,38 @@ class Binding
   def start_interaction(sandbox=true)
     $__env__ = inspect_env
     Kernel.puts RMTools.format_trace(caller(2)).join("\n")
-    $env.present
+    $__env__.present
     $__binding__ = self
     
     $log << "entering irb"
-    $__MAIN__.irb
-    # Now input "irb_change_binding$__binding__" and have fun with debug
+    $__MAIN__.irb$__binding__
     $log << "exiting irb"
     
     if sandbox
-      self.eval($env.keys.map {|k, v| "#{k} = $env[#{k.inspect}]"} * '; ')
+      self.eval($__env__.keys.map {|k, v| "#{k} = $__env__[#{k.inspect}]" if k != 'self'} * '; ')
     end
     $__env__ = nil
   end
   
-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

data/lib/rmtools/debug/highlight.rb

@@ -4,10 +4,10 @@ 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]
+      "   >>   #{Painter.green SCRIPT_LINES__[file][line.to_i - 1].chop}" if SCRIPT_LINES__[file]
     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.green read_lines(file, line.to_i).chop}" if File.file? file
     end
   end
     

data/lib/rmtools/debug/logging.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require_with_path 'console/coloring'
 require_with_path 'text/string_parse'
+require_with_path 'b'
 
 module RMTools
 
@@ -11,7 +12,7 @@ module RMTools
     attr_accessor :mute_info, :mute_warn, :mute_log, :mute_debug
     attr_reader :default_format
         
-    Modes = %w{debug log info warn}.to_syms
+    Modes = [:debug, :log, :info, :warn]
     NOPRINT = 4
     NOLOG = 2
     INLINE = 1
@@ -118,7 +119,7 @@ module RMTools
         bind, opts = check_binding a
         opts |= NOLOG if !cfg.out
         opts |= NOPRINT if !cfg.print
-        text ||= yield if block_given?
+        text = yield if block_given?
         _print(:warn, text, opts, cfg._caller && caller[0], bind, cfg)
       end  
     end
@@ -129,7 +130,7 @@ module RMTools
         bind, opts = check_binding a
         opts |= NOLOG if !cfg.out
         opts |= NOPRINT if !(cfg.print && !$quiet && $verbose)
-        text ||= yield if block_given?
+        text = yield if block_given?
         _print(:log, text, opts, cfg._caller && caller[0], bind, cfg)
       end
     end
@@ -140,7 +141,7 @@ module RMTools
         bind, opts = check_binding a
         opts |= NOLOG if !(cfg.out && cfg.out_all)
         opts |= NOPRINT if !(cfg.print && !$quiet)
-        text ||= yield if block_given?
+        text = yield if block_given?
         _print(:info, text, opts, cfg._caller && caller[0], bind, cfg)
       end 
     end
@@ -151,7 +152,7 @@ module RMTools
         bind, opts = check_binding a
         opts |= NOLOG if !(cfg.out && cfg.out_all)
         opts |= NOPRINT if !(cfg.print && $panic && !$quiet)
-        text ||= yield if block_given?
+        text = yield if block_given?
         _print(:debug, text, opts, cfg._caller && caller[0], bind, cfg)
       end 
     end

data/lib/rmtools/debug/present.rb

@@ -2,6 +2,7 @@
 class Object
   
   def present
+    [true, false, nil, Numeric, String, Regexp].each {|klass| return puts inspect if klass === self}
     Hash[readable_variables.map {|v| [":#{v}", __send__(v)]}].present
   end
   

data/lib/rmtools/debug/traceback.rb

@@ -1,4 +1,6 @@
 require_with_path 'debug/highlight'
+require_with_path 'debug/logging'
+
 module Kernel
 
 	# Python-like traceback for exceptions; uses ANSI coloring.
@@ -25,12 +27,12 @@ module Kernel
       m2 = a[i+1] && a[i+1].parse(:caller)
   #    $log.info 'm', binding
   #    $log.info 'm2', binding
-  #    $log.info 'm[3] m[1..2]==m2[1..2]', binding if m and m2
-  #    $log.info 'm[1] m[2]', binding if m
-  #    $log.info highlighted_line(*m[1..2]) if m
+  #    $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 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}' -> "
-      elsif m and m.line != 0 and line = highlighted_line(m.path, m.line)
+      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]
@@ -38,7 +40,7 @@ module Kernel
       i += 1
       m = m2
     end
-  #  $log << Painter.r("FORMAT DONE! #{bt.size} lines formatted")
+  #  $log << RMTools::Painter.r("FORMAT DONE! #{bt.size} lines formatted")
     bt
   end
   
@@ -57,7 +59,7 @@ class Class
     def set_backtrace src
       set_bt src
     end
-    })
+    }, __FILE__, __LINE__-10)
     else
       raise NoMethodError, "undefined method `trace_format' for class #{self}"
     end

data/lib/rmtools/enumerable/hash.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash'
+
 class Hash
   alias :>> :reverse_merge!
   

data/lib/rmtools/text/string_parse.rb

@@ -1,10 +1,10 @@
 require_with_path 'conversions/string'
 
 class String
-  CALLER_RE = %r{^\(?(.*?([^/\\]+?))#{	  # ( path ( file ) ) 
-                            }\)?:(\d+)(?::in #{	      # :( line )[ :in
-                            }[`<]([^'>]+)[>']#{	    # `( closure )' ]
-                      })?$}
+  CALLER_RE =    %r{^(.*?([^/\\]+?))#{	    # ( path ( file ) ) 
+                              }:(\d+)(?::in #{	      # :( line )[ :in
+                              }[`<]([^'>]+)[>']#{   # `( closure )' ]
+                            })?$}
   URL_RE = %r{^((?:([^:]+)://)#{	            #  ( protocol
                       }([^/:]*(?::(\d+))?))?#{	  #  root[:port] )
                       }((/[^?#]*?(?:\.(\w+))?)#{	#  ( path[.( fileext )]
@@ -33,7 +33,7 @@ class String
                 'anchor'	    => m[9] }
         when :caller
           m = match CALLER_RE
-          m || m[0].empty? ? nil : 
+          !m || m[0].empty? ? nil : 
             {  'path' => m[1],
                 'file' => m[2],
                 'line' => m[3].to_i,

data/lib/rmtools/text/string_simple.rb

@@ -1,7 +1,4 @@
 class String
-  if !method_defined? :/
-    alias :/ :split 
-  end
   
   def inline
     count("\n") == 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Shinku Templar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +03:00
+date: 2011-02-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/rmtools/core/string_compliance.rb
 - lib/rmtools/core/kernel.rb
 - lib/rmtools/core/boolean.rb
+- lib/rmtools/core/aliases.rb
 - lib/rmtools/core/module.rb
 - lib/rmtools/core/object.rb
 - lib/rmtools/core/regexp.rb
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rmtools
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Yet another Ruby applied framework