debug 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948301b2d85d9acb8758ae20e63a60d0253dc1d1e1bf5c2ddc276abb39d12993
-  data.tar.gz: 2e6b7c89ee568710d52d3fcaff1ff5eb44db71c4e296e039a6f21f4e5de9b9ee
+  metadata.gz: d2f3adfa33baa3d7ef0a8ff1924d4d148be909f8cbdfc1992efda7e4ef564a17
+  data.tar.gz: 43085e7bec187d698d42bf7a4fc7c3ee2f4cde387cf411b2648411dc6cbb1721
 SHA512:
-  metadata.gz: dd5237c7fc194760f33cdd97c007fe1c879ed4140342821972d2385a612bd5fd4c8faffd2a3763adea1378931be13e65d46e2a23f5997412ac96c6e7c802e0d2
-  data.tar.gz: 396eab432e765065288f49cda52ce8a4449ee6c97465bde2ef70ec8ca39678b80831748b551d6aa6e4417c1c6512b8b0f8caf4371516a9178181582b9bf9542c
+  metadata.gz: 5bafcaeeb661378a3696968655cfc9b24aadb6c0ada385d143406472db4cc1a51d55bb460431ef9679d8e6ffe846c269f731335380999256565b2d259139f2d9
+  data.tar.gz: 961d6a453a4f117af9e056658d31afc39e173668f32eb1745f0bdad842c4891a2b6bff0bfec45d6e17fc94108da3ac4a5274118a4f0213ae0a2a5a181de89f99

data/CONTRIBUTING.md

@@ -206,17 +206,15 @@ end
 #### gentest options
 You can get more information about `gentest` here.
 
-The default method name is `test_foo` and the class name is `FooTest`. The file name will be `[Lowercase letters with "Test" removed from the class name]_test.rb`.
-```shell
-# run without any options(test method name will be `test_foo`, class name will be `FooTest`, file name will be `foo_test.rb`)
-$ bin/gentest target.rb
-# specify the class name(test method name will be `test_foo`, class name will be `StepTest`, file name will be `step_test.rb`)
-$ bin/gentest target.rb -c StepTest
-# specify the method name(test method name will be `test_step`, class name will be `FooTest`, file name will be `foo_test.rb`)
-$ bin/gentest target.rb -m test_step
-# specify class name and method name(test method name will be `test_step`, class name will be `StepTest`, file name will be `step_test.rb`.)
-$ bin/gentest target.rb -c StepTest -m test_step
-```
+The default method name is `test_#{some integer numbers}`, the class name is `FooTest`, and the file name will be `foo_test.rb`.
+The following table shows examples of the gentest options.
+
+| Command | Description | File | Class | Method |
+| --- | --- | --- | --- | --- |
+| `$ bin/gentest target.rb` | Run without any options | `foo_test.rb` | `FooTest` | `test_#{some integer numbers}` |
+| `$ bin/gentest target.rb -c step` | Specify the class name | `step_test.rb` | `StepTest` | `test_#{some integer numbers}` |
+| `$ bin/gentest target.rb -m test_step` | Specify the method name | `foo_test.rb` | `FooTest` | `test_step` |
+| `$ bin/gentest target.rb -c step -m test_step` | Specify the class name and the method name | `step_test.rb` | `StepTest` | `test_step` |
 
 ## To Update README
 

data/README.md

@@ -11,7 +11,7 @@ New debug.rb has several advantages:
 * [Remote debugging](#remote-debugging): Support remote debugging natively.
   * UNIX domain socket
   * TCP/IP
-  * Integeration with rich debugger frontend
+  * Integration with rich debugger frontend
     * VSCode/DAP ([VSCode rdbg Ruby Debugger - Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=KoichiSasada.vscode-rdbg))
     * Chrome DevTools
 * Extensible: application can introduce debugging support with several ways:
@@ -340,7 +340,7 @@ $ RUBY_DEBUG_PORT=12345 ruby target.rb
 
 ### Integration with external debugger frontend
 
-You can attach with external debuger frontend with VSCode and Chrome.
+You can attach with external debugger frontend with VSCode and Chrome.
 
 ```
 $ rdbg --open=[frontend] target.rb
@@ -352,7 +352,7 @@ Also `open` command allows opening the debug port.
 
 #### VSCode integration
 
-If you don't run a debuggee Ruby process on VSCode, you can attach with VSCode later with the fowllowing steps.
+If you don't run a debuggee Ruby process on VSCode, you can attach with VSCode later with the following steps.
 
 `rdbg --open=vscode` opens the debug port and tries to invoke the VSCode (`code` command).
 
@@ -364,7 +364,7 @@ Launching: code /tmp/ruby-debug-vscode-20211014-27706-gd7e85/ /tmp/ruby-debug-vs
 DEBUGGER: Connected.
 ```
 
-And it tris to invoke the new VSCode window and VSCode starts attaching to the debuggee Ruby program automatically.
+And it tries to invoke the new VSCode window and VSCode starts attaching to the debuggee Ruby program automatically.
 
 You can also use `open vscode` command in REPL.
 

data/ext/debug/debug.c

@@ -64,7 +64,7 @@ di_body(const rb_debug_inspector_t *dc, void *ptr)
 
         if (!NIL_P(iseq)) {
             VALUE path = iseq_realpath(iseq);
-            if (!NIL_P(path) && str_start_with(path, skip_path_prefix)) continue;
+            if (!NIL_P(path) && !NIL_P(skip_path_prefix) && str_start_with(path, skip_path_prefix)) continue;
         }
 
         loc = RARRAY_AREF(locs, i);

data/lib/debug/color.rb

@@ -79,7 +79,7 @@ module DEBUGGER__
     end
 
     if defined? IRB::Color.colorize_code
-      if SUPPORT_COLORABLE_OPTION
+      if defined? SUPPORT_COLORABLE_OPTION
         def colorize_code code
           IRB::Color.colorize_code(code, colorable: true)
         end

data/lib/debug/server.rb

@@ -116,6 +116,8 @@ module DEBUGGER__
 
         self.extend(UI_CDP)
         @repl = false
+        CONFIG.set_config no_color: true
+
         @web_sock = UI_CDP::WebSocket.new(@sock)
         @web_sock.handshake
       else

data/lib/debug/server_cdp.rb

@@ -14,9 +14,7 @@ module DEBUGGER__
         @sock = s
       end
 
-      def handshake
-        CONFIG.set_config no_color: true
-  
+      def handshake  
         req = @sock.readpartial 4096
         $stderr.puts '[>]' + req if SHOW_PROTOCOL
   
@@ -97,10 +95,11 @@ module DEBUGGER__
     end
 
     def process
+      bps = []
+      @src_map = {}
       loop do
         req = @web_sock.extract_data
         $stderr.puts '[>]' + req.inspect if SHOW_PROTOCOL
-        bps = []
 
         case req['method']
 
@@ -108,6 +107,7 @@ module DEBUGGER__
         when 'Page.getResourceTree'
           abs = File.absolute_path($0)
           src = File.read(abs)
+          @src_map[abs] = src
           send_response req,
                         frameTree: {
                           frame: {
@@ -124,7 +124,7 @@ module DEBUGGER__
                       url: "http://debuggee#{abs}",
                       startLine: 0,
                       startColumn: 0,
-                      endLine: src.count('\n'),
+                      endLine: src.count("\n"),
                       endColumn: 0,
                       executionContextId: 1,
                       hash: src.hash
@@ -136,7 +136,7 @@ module DEBUGGER__
                       }
         when 'Debugger.getScriptSource'
           s_id = req.dig('params', 'scriptId')
-          src = File.read(s_id)
+          src = get_source_code s_id
           send_response req, scriptSource: src
           @q_msg << req
         when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse',
@@ -169,7 +169,10 @@ module DEBUGGER__
         # breakpoint
         when 'Debugger.getPossibleBreakpoints'
           s_id = req.dig('params', 'start', 'scriptId')
-          line = req.dig('params', 'lineNumber')
+          line = req.dig('params', 'start', 'lineNumber')
+          src = get_source_code s_id
+          end_line = src.count("\n")
+          line = end_line  if line > end_line
           send_response req,
                         locations: [
                           { scriptId: s_id,
@@ -180,6 +183,9 @@ module DEBUGGER__
           line = req.dig('params', 'lineNumber')
           path = req.dig('params', 'url').match('http://debuggee(.*)')[1]
           cond = req.dig('params', 'condition')
+          src = get_source_code path
+          end_line = src.count("\n")
+          line = end_line  if line > end_line
           if cond != ''
             bps << SESSION.add_line_breakpoint(path, line + 1, cond: cond)
           else
@@ -202,6 +208,14 @@ module DEBUGGER__
       end
     end
 
+    def get_source_code path
+      return @src_map[path] if @src_map[path]
+
+      src = File.read(path)
+      @src_map[path] = src
+      src
+    end
+
     ## Called by the SESSION thread
 
     def readline prompt
@@ -269,7 +283,7 @@ module DEBUGGER__
                             url: frame[:url],
                             startLine: 0,
                             startColumn: 0,
-                            endLine: src.count('\n'),
+                            endLine: src.count("\n"),
                             endColumn: 0,
                             executionContextId: @script_paths.size + 1,
                             hash: src.hash

data/lib/debug/server_dap.rb

@@ -491,7 +491,7 @@ module DEBUGGER__
       case type
       when :backtrace
         event! :dap_result, :backtrace, req, {
-          stackFrames: @target_frames.map.with_index{|frame, i|
+          stackFrames: @target_frames.map.{|frame|
             path = frame.realpath || frame.path
             ref = frame.file_lines unless path && File.exist?(path)
 

data/lib/debug/session.rb

@@ -91,7 +91,7 @@ module DEBUGGER__
                 #   [:check, expr] => CheckBreakpoint
       #
       @tracers = {}
-      @th_clients = nil # {Thread => ThreadClient}
+      @th_clients = {} # {Thread => ThreadClient}
       @q_evt = Queue.new
       @displays = []
       @tc = nil
@@ -1358,7 +1358,7 @@ module DEBUGGER__
     end
 
     def setup_threads
-      prev_clients = @th_clients || {}
+      prev_clients = @th_clients
       @th_clients = {}
 
       Thread.list.each{|th|
@@ -1555,6 +1555,36 @@ module DEBUGGER__
       @postmortem = false
     end
 
+    def capture_exception_frames *exclude_path
+      postmortem_hook = TracePoint.new(:raise){|tp|
+        exc = tp.raised_exception
+        frames = DEBUGGER__.capture_frames(__dir__)
+
+        exclude_path.each{|ex|
+          if Regexp === ex
+            frames.delete_if{|e| ex =~ e.path}
+          else
+            frames.delete_if{|e| e.path.start_with? ex.to_s}
+          end
+        }
+        exc.instance_variable_set(:@__debugger_postmortem_frames, frames)
+      }
+      postmortem_hook.enable
+
+      begin
+        yield
+        nil
+      rescue Exception => e
+        if e.instance_variable_defined? :@__debugger_postmortem_frames
+          e
+        else
+          raise
+        end
+      ensure
+        postmortem_hook.disable
+      end
+    end
+
     def postmortem=(is_enable)
       if is_enable
         unless @postmortem_hook

data/lib/debug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DEBUGGER__
-  VERSION = "1.3.1"
+  VERSION = "1.3.3"
 end

data/misc/README.md.erb

@@ -11,7 +11,7 @@ New debug.rb has several advantages:
 * [Remote debugging](#remote-debugging): Support remote debugging natively.
   * UNIX domain socket
   * TCP/IP
-  * Integeration with rich debugger frontend
+  * Integration with rich debugger frontend
     * VSCode/DAP ([VSCode rdbg Ruby Debugger - Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=KoichiSasada.vscode-rdbg))
     * Chrome DevTools
 * Extensible: application can introduce debugging support with several ways:
@@ -340,7 +340,7 @@ $ RUBY_DEBUG_PORT=12345 ruby target.rb
 
 ### Integration with external debugger frontend
 
-You can attach with external debuger frontend with VSCode and Chrome.
+You can attach with external debugger frontend with VSCode and Chrome.
 
 ```
 $ rdbg --open=[frontend] target.rb
@@ -352,7 +352,7 @@ Also `open` command allows opening the debug port.
 
 #### VSCode integration
 
-If you don't run a debuggee Ruby process on VSCode, you can attach with VSCode later with the fowllowing steps.
+If you don't run a debuggee Ruby process on VSCode, you can attach with VSCode later with the following steps.
 
 `rdbg --open=vscode` opens the debug port and tries to invoke the VSCode (`code` command).
 
@@ -364,7 +364,7 @@ Launching: code /tmp/ruby-debug-vscode-20211014-27706-gd7e85/ /tmp/ruby-debug-vs
 DEBUGGER: Connected.
 ```
 
-And it tris to invoke the new VSCode window and VSCode starts attaching to the debuggee Ruby program automatically.
+And it tries to invoke the new VSCode window and VSCode starts attaching to the debuggee Ruby program automatically.
 
 You can also use `open vscode` command in REPL.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb