dexc 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa1312aa4c3a44113ff7fecaa6e2e1fc38e1a389
-  data.tar.gz: 6aad9ecdde10db98b53618eecee06fa071e8d238
+SHA256:
+  metadata.gz: d0a30f2b433ef0df84fb07b87731dd3b3c6cd63fa7d972f09915b53c3a0b9179
+  data.tar.gz: 52cfcbf75dd76eedee0748e831be63cbfe9cf07a404feea207346fe0772b4abe
 SHA512:
-  metadata.gz: cc5a2f85d36d611efae7d6d133664fd5d1ea8bab46068a22b59ffdc3dfe8b3e2a64a72f46b896f1833abc77226f6541706915c919940de9fcad43f1adff4c4a7
-  data.tar.gz: e99d13437da5c18ec260b516ccd00c4239bdab5f255d1f5f83181fd35a9d261faea915cdf801f6b73e9b0165048015af5f95b9611491844d50df39504624380e
+  metadata.gz: c4f4ed54edde6d05892ec6957faa2d44e0d4f3746d140b37082ea18efbc2a3d0a71d7d561ed9aa692249bc2830405f10a081e6d0401af44aec57937aadaaa265
+  data.tar.gz: 5781ce31f628d3d1a6d6bb7f66c902dd8f82e5b96b34656d27fcbf9ad6c439e5b6fedd95444405937d9a189e0a6427744bb1c873cfd012ea30a70bc86c436939

data/BSDL

@@ -1,4 +1,4 @@
-Copyright (C) 2013-2016 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2013 Kazuki Tsujimoto, All rights reserved.
 Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved. (lib/irb.rb)
 
 Redistribution and use in source and binary forms, with or without

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2013-2016 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2013 Kazuki Tsujimoto, All rights reserved.
 Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved. (lib/irb.rb)
 
 You can redistribute it and/or modify it under either the terms of the

data/dexc.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths    = ['lib']
+  s.add_runtime_dependency 'irb'
+  s.add_runtime_dependency 'binding_of_caller'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
   s.extra_rdoc_files = ['README.rdoc']

data/lib/dexc.rb

@@ -1,13 +1,16 @@
 # dexc.rb
 #
-# Copyright (C) 2013-2016 Kazuki Tsujimoto, All rights reserved.
+# Copyright (C) 2013 Kazuki Tsujimoto, All rights reserved.
 
 raise LoadError, "TracePoint is undefined. Use Ruby 2.0.0 or later." unless defined? TracePoint
 
 require 'dexc/version'
+require 'irb/color'
+require 'irb/color_printer'
+require 'binding_of_caller'
 
 module Dexc
-  EXC_BINDING_VAR = :@dexc_binding
+  EXC_CALLERS_VAR = :@dexc_callers
 
   class RingBuffer
     def initialize(n)
@@ -29,42 +32,44 @@ module Dexc
   RaiseEvent  = Struct.new(:event, :raised_exception)
   ReturnEvent = Struct.new(:event, :lineno, :path, :defined_class, :method_id, :return_value)
 
-  # See MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS,
-  # Test::Unit::ErrorHandler::PASS_THROUGH_EXCEPTIONS
-  # to know why Interrupt is used
-  class ExceptionWrapper < NoMemoryError
-    attr_reader :wrapped_exception
+  module IrbHelper
+    def dexc_print_frame
+      @dexc_callers.each_with_index do |i, idx|
+        if @dexc_callers_idx == idx
+          print ' => '
+        else
+          print '    '
+        end
+        print("[%#{@dexc_callers_width}d] " % idx)
+        filename, lineno = i.source_location
+        puts "#{filename}:#{lineno}:in `#{i.frame_description}'"
+      end
+    end
 
-    def initialize(wrapped_exception)
-      super(nil)
-      @wrapped_exception = wrapped_exception
+    def dexc_current_frame
+      @dexc_callers[@dexc_callers_idx]
     end
-  end
 
-  module TestPassThroughException
-    def run_test(*)
-      super
-    rescue => e
-      raise ExceptionWrapper, e
+    def dexc_up_frame
+      if @dexc_callers_idx < @dexc_callers.length - 1
+        @dexc_callers_idx += 1
+      end
+      dexc_current_frame
     end
-  end
 
-  class ::Object
-    prepend Module.new {
-      def require(path)
-        super.tap do
-          if path == 'minitest/unit'
-            MiniTest::Unit::TestCase.class_eval do
-              prepend TestPassThroughException
-            end
-          elsif path == 'test/unit'
-            Test::Unit::TestCase.class_eval do
-              prepend TestPassThroughException
-            end
-          end
-        end
+    def dexc_down_frame
+      if @dexc_callers_idx > 0
+        @dexc_callers_idx -= 1
+      end
+      dexc_current_frame
+    end
+
+    def dexc_change_frame(idx)
+      if (0...@dexc_callers.length) === idx
+        @dexc_callers_idx = idx
       end
-    }
+      dexc_current_frame
+    end
   end
 
   def start
@@ -73,7 +78,7 @@ module Dexc
     tp = TracePoint.new(:raise, :return, :c_return, :b_return) do |tp|
       if tp.event == :raise
         exc = tp.raised_exception
-        exc.instance_variable_set(EXC_BINDING_VAR, tp.binding)
+        exc.instance_variable_set(EXC_CALLERS_VAR, tp.binding.callers[1..-1])
         events.add(RaiseEvent.new(tp.event, exc))
       else
         events.add(ReturnEvent.new(tp.event, tp.lineno, tp.path, tp.defined_class, tp.method_id, tp.return_value))
@@ -82,19 +87,16 @@ module Dexc
 
     at_exit do
       exc = $!
-      if exc.kind_of?(ExceptionWrapper)
-        exc = exc.wrapped_exception
-      end
       tp.disable
-      b = exc.instance_variable_get(EXC_BINDING_VAR)
-      if exc.kind_of?(StandardError) and b
+      callers = exc.instance_variable_get(EXC_CALLERS_VAR)
+      if exc.kind_of?(StandardError) and callers
         raise_idx = events.to_a.find_index {|i| i.event == :raise and i.raised_exception == exc }
         latest_events = raise_idx ? events.to_a[0...raise_idx] : []
         return_events = latest_events.find_all {|i| i.event != :raise }
         return_values = return_events.map(&:return_value)
 
         show_trace(return_events)
-        error_print(exc)
+        puts exc.full_message
 
         Kernel.module_eval do
           define_method(:dexc_hist) do
@@ -109,18 +111,24 @@ module Dexc
             pry.last_exception = exc
             pry.backtrace = (exc.backtrace || [])
           end
-          b.pry
+          callers[0].pry
         rescue LoadError
           require 'irb'
-          IRB::Irb.class_eval do
-            alias_method :eval_input_orig, :eval_input
-            define_method(:eval_input) do
-              IRB::Irb.class_eval { alias_method :eval_input, :eval_input_orig }
-              require 'irb/ext/multi-irb'
-              IRB.irb(nil, b)
-            end
+          IRB::Context.include(IrbHelper)
+          require 'dexc/irb/cmd/stack_explorer'
+          b = callers[0]
+          filename = b.source_location[0]
+          IRB.setup(filename, argv: [])
+          workspace = IRB::WorkSpace.new(b)
+          STDOUT.print(workspace.code_around_binding)
+          binding_irb = IRB::Irb.new(workspace)
+          binding_irb.context.irb_path = File.expand_path(filename)
+          binding_irb.context.instance_eval do
+            @dexc_callers = callers
+            @dexc_callers_width = Math.log10(callers.length).floor + 1
+            @dexc_callers_idx = 0
           end
-          IRB.start
+          binding_irb.run(IRB.conf)
         end
         exit!
       end
@@ -135,7 +143,7 @@ module Dexc
     file_cache = {}
     events.each_with_index do |i, idx|
       show_line(i.path, i.lineno, idx, idx_width, file_cache)
-      puts " " * (idx_width + 1) + "#{i.defined_class}##{i.method_id}#{i.event == :b_return ? '(block)' : ''}: #{i.return_value.inspect}"
+      puts " " * (idx_width + 1) + "#{i.defined_class}##{i.method_id}#{i.event == :b_return ? '(block)' : ''}: #{IRB::ColorPrinter.pp(i.return_value.inspect, '')}"
     end
     puts
   end
@@ -145,41 +153,13 @@ module Dexc
     print "#{"%#{index_width}d" % index}:#{path}:#{lineno}"
     begin
       cache[path] ||= open(path).each_line.map(&:chomp)
-      print "> #{lineno > 0 ? cache[path][lineno - 1] : ''}"
+      print "> #{lineno > 0 ? ::IRB::Color.colorize_code(cache[path][lineno - 1], complete: false, ignore_error: true) : ''}"
     rescue Errno::ENOENT
       cache[path] = []
     end
     puts
   end
   module_function :show_line
-
-  # from Irb#eval_input(lib/irb.rb)
-  def error_print(exc)
-    print exc.class, ": ", exc, "\n"
-    messages = []
-    lasts = []
-    levels = 0
-    back_trace_limit = 30
-    for m in exc.backtrace
-      if m
-        if messages.size < back_trace_limit
-          messages.push "\tfrom "+m
-        else
-          lasts.push "\tfrom "+m
-          if lasts.size > back_trace_limit
-            lasts.shift
-            levels += 1
-          end
-        end
-      end
-    end
-    print messages.join("\n"), "\n"
-    unless lasts.empty?
-      printf "... %d levels...\n", levels if levels > 0
-      print lasts.join("\n")
-    end
-  end
-  module_function :error_print
 end
 
 Dexc.start

data/lib/dexc/irb/cmd/stack_explorer.rb

@@ -0,0 +1,41 @@
+require "irb"
+require "irb/cmd/nop"
+require "irb/cmd/chws"
+
+module IRB
+  module ExtendCommand
+
+    class DexcFrame < Nop
+      def execute(idx = nil)
+        if idx
+          irb_context.dexc_change_frame(idx)
+          STDOUT.print(irb_context.workspace.code_around_binding)
+        end
+        irb_context.dexc_print_frame
+        irb_context.main
+      end
+    end
+
+    class DexcUp < Nop
+      def execute(*)
+        irb_context.change_workspace(irb_context.dexc_up_frame)
+        STDOUT.print(irb_context.workspace.code_around_binding)
+        irb_context.dexc_print_frame
+        irb_context.main
+      end
+    end
+
+    class DexcDown < Nop
+      def execute(*)
+        irb_context.change_workspace(irb_context.dexc_down_frame)
+        STDOUT.print(irb_context.workspace.code_around_binding)
+        irb_context.dexc_print_frame
+        irb_context.main
+      end
+    end
+  end
+end
+
+IRB::ExtendCommandBundle.def_extend_command(:irb_frame, :DexcFrame, "dexc/irb/cmd/stack_explorer", [:frame, IRB::ExtendCommandBundle::OVERRIDE_ALL])
+IRB::ExtendCommandBundle.def_extend_command(:irb_up, :DexcUp, "dexc/irb/cmd/stack_explorer", [:up, IRB::ExtendCommandBundle::OVERRIDE_ALL])
+IRB::ExtendCommandBundle.def_extend_command(:irb_down, :DexcDown, "dexc/irb/cmd/stack_explorer", [:down, IRB::ExtendCommandBundle::OVERRIDE_ALL])

data/lib/dexc/version.rb

@@ -1,3 +1,3 @@
 module Dexc
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dexc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +82,7 @@ files:
 - Rakefile
 - dexc.gemspec
 - lib/dexc.rb
+- lib/dexc/irb/cmd/stack_explorer.rb
 - lib/dexc/version.rb
 - test/test_dexc.rb
 homepage: https://github.com/k-tsj/dexc
@@ -76,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: A library that helps you to debug an exception