debug 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6eba8a00eaa711138e43036c5adb97834f1a87e586f8a5a3f580875e4d78e5c
-  data.tar.gz: 26ed8ac77bb93ab2a9f67fac6c4ef4481fbcdd227f116aaff78e808a2343b13b
+  metadata.gz: 556965976e9db176b06e1997eb167cf5538ccd301ddb497ae629cfda01062fa3
+  data.tar.gz: e709e60ef9b43b44a998362347b2b8d7e3d4cbddb4831cd43156d5ddc67dead8
 SHA512:
-  metadata.gz: b459267a95928388d1bf53bab8bf51fc8d5a6d0db0bc2fbaa55f740b1b446aad2294e45cc2b70471ccf8bb1daada458f239f08c7ceb7588774f08796a7838620
-  data.tar.gz: 86d06a4ec76943e26af39a26120c8a3a906d3fcecca195a662e63b9be2b7b9a1ba82bd2fba177205b436cde89be9214988e0f2cccc0f7fb2dcbf7226e92886e9
+  metadata.gz: 9169efb00f3f9cebb0f9f21d2773e29d4c67edd7a4bb0b7330664080a15972cfe43199ae3c43e86424b2a6f94b83ce1fb8be1c208149cdd04f28c12f5d9f2842
+  data.tar.gz: a56d82fb5beb82cd821639ae073d8f902aafbdfc762236ea6eb0b2d391cc1e121e541d16083b6b22ae5a8c73b2c2c2e49e54c39f37ac9d4c03d38210499398c8

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Your environment**
+
+* `ruby -v`: 
+* `rdbg -v`:
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Blank issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Your proposal**
+What is your idea?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/debug.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ['ext/debug/extconf.rb']
 
-  spec.add_dependency "irb" # for its color_printer class, which was added after 1.3
+  spec.add_dependency "irb", ">= 1.3.6" # for its color_printer class, which was added after 1.3
   spec.add_dependency "reline", ">= 0.2.7"
 end

data/lib/debug/color.rb

@@ -17,9 +17,25 @@ end
 module DEBUGGER__
   module Color
     if defined? IRB::Color.colorize
+      begin
+        IRB::Color.colorize('', [:DIM], colorable: true)
+        SUPPORT_COLORABLE_OPTION = true
+      rescue ArgumentError
+      end
+
+      if defined? SUPPORT_COLORABLE_OPTION
+        def irb_colorize str, color
+          IRB::Color.colorize str, color, colorable: true
+        end
+      else
+        def irb_colorize str, color
+          IRB::Color.colorize str, color
+        end
+      end
+
       def colorize str, color
         if !CONFIG[:no_color]
-          IRB::Color.colorize str, color, colorable: true
+          irb_colorize str, color
         else
           str
         end
@@ -63,8 +79,14 @@ module DEBUGGER__
     end
 
     if defined? IRB::Color.colorize_code
-      def colorize_code code
-        IRB::Color.colorize_code(code, colorable: true)
+      if SUPPORT_COLORABLE_OPTION
+        def colorize_code code
+          IRB::Color.colorize_code(code, colorable: true)
+        end
+      else
+        def colorize_code code
+          IRB::Color.colorize_code(code)
+        end
       end
     else
       def colorize_code code

data/lib/debug/server_dap.rb

@@ -182,7 +182,7 @@ module DEBUGGER__
           @q_msg << 'continue'
         when 'attach'
           send_response req
-          Process.kill(:SIGINT, Process.pid)
+          Process.kill(:SIGURG, Process.pid)
         when 'disconnect'
           send_response req
           @q_msg << 'continue'
@@ -205,7 +205,7 @@ module DEBUGGER__
           exit
         when 'pause'
           send_response req
-          Process.kill(:SIGINT, Process.pid)
+          Process.kill(:SIGURG, Process.pid)
         when 'reverseContinue'
           send_response req,
                         success: false, message: 'cancelled',
@@ -256,7 +256,7 @@ module DEBUGGER__
     def event type, *args
       case type
       when :suspend_bp
-        _i, bp = *args
+        _i, bp, tid = *args
         if bp.kind_of?(CatchBreakpoint)
           reason = 'exception'
           text = bp.description
@@ -268,24 +268,26 @@ module DEBUGGER__
         send_event 'stopped', reason: reason,
                               description: text,
                               text: text,
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       when :suspend_trap
+        _sig, tid = *args
         send_event 'stopped', reason: 'pause',
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       when :suspended
+        tid, = *args
         send_event 'stopped', reason: 'step',
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       end
     end
   end
 
   class Session
-    def find_tc id
+    def find_waiting_tc id
       @th_clients.each{|th, tc|
-        return tc if tc.id == id
+        return tc if tc.id == id && tc.waiting?
       }
       return nil
     end
@@ -306,7 +308,7 @@ module DEBUGGER__
 
       when 'stackTrace'
         tid = req.dig('arguments', 'threadId')
-        if tc = find_tc(tid)
+        if tc = find_waiting_tc(tid)
           tc << [:dap, :backtrace, req]
         else
           fail_response req
@@ -315,7 +317,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
-          if tc = find_tc(tid)
+          if tc = find_waiting_tc(tid)
             tc << [:dap, :scopes, req, fid]
           else
             fail_response req
@@ -348,7 +350,7 @@ module DEBUGGER__
             frame_id = ref[1]
             tid, fid = @frame_map[frame_id]
 
-            if tc = find_tc(tid)
+            if tc = find_waiting_tc(tid)
               tc << [:dap, :scope, req, fid]
             else
               fail_response req
@@ -357,7 +359,7 @@ module DEBUGGER__
           when :variable
             tid, vid = ref[1], ref[2]
 
-            if tc = find_tc(tid)
+            if tc = find_waiting_tc(tid)
               tc << [:dap, :variable, req, vid]
             else
               fail_response req
@@ -373,7 +375,7 @@ module DEBUGGER__
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
           expr = req.dig('arguments', 'expression')
-          if tc = find_tc(tid)
+          if tc = find_waiting_tc(tid)
             tc << [:dap, :evaluate, req, fid, expr]
           else
             fail_response req

data/lib/debug/session.rb

@@ -215,16 +215,16 @@ module DEBUGGER__
           case ev_args.first
           when :breakpoint
             bp, i = bp_index ev_args[1]
-            @ui.event :suspend_bp, i, bp
+            @ui.event :suspend_bp, i, bp, tc.id
           when :trap
-            @ui.event :suspend_trap, sig = ev_args[1]
+            @ui.event :suspend_trap, sig = ev_args[1], tc.id
 
             if sig == :SIGINT && (@intercepted_sigint_cmd.kind_of?(Proc) || @intercepted_sigint_cmd.kind_of?(String))
               @ui.puts "#{@intercepted_sigint_cmd.inspect} is registerred as SIGINT handler."
               @ui.puts "`sigint` command execute it."
             end
           else
-            @ui.event :suspended
+            @ui.event :suspended, tc.id
           end
 
           if @displays.empty?

data/lib/debug/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +48,9 @@ extensions:
 - ext/debug/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/custom.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - CONTRIBUTING.md