debug 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f83c7a7b44c3cae68d784d70fd653410ebce976c02bf846a9992f102634d98
-  data.tar.gz: b34c3d6b060aa20db1794905aef969105070d556862ceac4cf02ccc88db9bf0a
+  metadata.gz: 61c14c6e761a2ed0f10294682cb7b152c4329d3cd0eccbffff68e3ae122d00a0
+  data.tar.gz: 714add08d21df0ceb674a8a9c8b8599f0dcc45cb38b68611c766fab1b6ddcd41
 SHA512:
-  metadata.gz: c408ae087cd00a03e53410a9f6c3c54e2e4536d41784fb109dedd278d8b7941182a925593bf34991bfc2c15ed43e7baa20c736bde0aecb72b832fbdb4f4b55fe
-  data.tar.gz: b223e415ae539a0b95303b065f029afe48cd2007697979d66ca94e157d7823b848ffd40c1ccc5e2947d69a8aa1c23c08961ade262bc6315f267ec73176c2d882
+  metadata.gz: 2c43d785c88ce38a676941b87ab320d126d9083f8b4dcc487ef22b8f7f0c4a144ed2fe9dfc800f8d7b2bf9287694c3d5abcd3b7c5075248b5ca08bd6bd0b3bcf
+  data.tar.gz: 8f2e9922aac4e297c437f3fc63ec11df2af430c2f3b3406df8723d4703fc254705246300fee99fee6f38f1da62348184b3ff0dcb6a4ddf302c3345f8ae5d4634

data/CONTRIBUTING.md

@@ -269,7 +269,7 @@ Currently, there are 2 kinds of test frameworks for DAP and CDP.
 
 If you want to write protocol-based tests, you should use the test generator.
 To run the test generator, you can enter `$ bin/gentest target.rb --open=vscode` in the terminal, VSCode will be executed.
-Also, if you enter ``$ bin/gentest target.rb --open=chrome` there, Chrome will be executed.
+Also, if you enter `$ bin/gentest target.rb --open=chrome` there, Chrome will be executed.
 If you need to modify existing tests, it is basically a good idea to regenerate them by the test generator instead of rewriting them directly.
 Please refer to [the Microsoft "Debug Adapter Protocol" article](https://microsoft.github.io/debug-adapter-protocol/specification) to learn more about DAP formats.
 Please refer to [Procol viewer for "Chrome DevTools Protocol"](https://chromedevtools.github.io/devtools-protocol/) to learn more about CDP formats.

data/README.md

@@ -438,12 +438,12 @@ $ rdbg target.rb --open=chrome
 DEBUGGER: Debugger can attach via TCP/IP (127.0.0.1:43633)
 DEBUGGER: With Chrome browser, type the following URL in the address-bar:
 
-   devtools://devtools/bundled/inspector.html?ws=127.0.0.1:43633
+   devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=127.0.0.1:57231/b32a55cd-2eb5-4c5c-87d8-b3dfc59d80ef
 
 DEBUGGER: wait for debugger connection...
 ```
 
-Type `devtools://devtools/bundled/inspector.html?ws=127.0.0.1:43633` in the address-bar on Chrome browser, and you can continue the debugging with chrome browser.
+Type `devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=127.0.0.1:57231/b32a55cd-2eb5-4c5c-87d8-b3dfc59d80ef` in the address-bar on Chrome browser, and you can continue the debugging with chrome browser.
 
 Also `open chrome` command works like `open vscode`.
 

data/exe/rdbg

@@ -13,10 +13,25 @@ when :start
   start_mode = config[:remote] ? "open" : 'start'
   cmd = config[:command] ? ARGV.shift : (ENV['RUBY'] || RbConfig.ruby)
 
+  if defined?($:.resolve_feature_path)
+    begin
+      _, sopath = $:.resolve_feature_path('debug/debug.so')
+    rescue LoadError
+      # raises LoadError before 3.1 (2.7 and 3.0)
+    else
+      sopath = File.dirname(File.dirname(sopath)) if sopath
+    end
+  else
+    # `$:.resolve_feature_path` is not defined in 2.6 or earlier.
+    so = "debug/debug.#{RbConfig::CONFIG['DLEXT']}"
+    sopath = $:.find {|dir| File.exist?(File.join(dir, so))}
+  end
+  added = "-r #{libpath}/#{start_mode}"
+  added = "-I #{sopath} #{added}" if sopath
+  rubyopt = ENV['RUBYOPT']
   env = ::DEBUGGER__::Config.config_to_env_hash(config)
-  rubyopt = env['RUBYOPT']
-  env['RUBY_DEBUG_ADDED_RUBYOPT'] = added = "-r #{libpath}/#{start_mode}"
-  env['RUBYOPT'] = "#{added} #{rubyopt}"
+  env['RUBY_DEBUG_ADDED_RUBYOPT'] = added
+  env['RUBYOPT'] = "#{rubyopt} #{added}"
 
   exec(env, cmd, *ARGV)
 

data/lib/debug/client.rb

@@ -42,7 +42,7 @@ module DEBUGGER__
         when /csh/
           :csh
         when /zsh/
-          :szh
+          :zsh
         when /dash/
           :dash
         else

data/lib/debug/prelude.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+return if ENV['RUBY_DEBUG_ENABLE'] == '0'
 return if defined?(::DEBUGGER__)
 
 # Put the following line in your login script (e.g. ~/.bash_profile) with modified path:

data/lib/debug/server_cdp.rb

@@ -998,7 +998,7 @@ module DEBUGGER__
 
     def search_const b, expr
       cs = expr.delete_prefix('::').split('::')
-      [Object, *b.eval('Module.nesting')].reverse_each{|mod|
+      [Object, *b.eval('::Module.nesting')].reverse_each{|mod|
         if cs.all?{|c|
              if mod.const_defined?(c)
                mod = mod.const_get(c)

data/lib/debug/server_dap.rb

@@ -263,7 +263,7 @@ module DEBUGGER__
 
     def process
       while req = recv_request
-        raise "not a request: #{req.inpsect}" unless req['type'] == 'request'
+        raise "not a request: #{req.inspect}" unless req['type'] == 'request'
         args = req.dig('arguments')
 
         case req['command']
@@ -348,6 +348,9 @@ module DEBUGGER__
         when 'disconnect'
           terminate = args.fetch("terminateDebuggee", false)
 
+          SESSION.clear_all_breakpoints
+          send_response req
+
           if SESSION.in_subsession?
             if terminate
               @q_msg << 'kill!'
@@ -361,9 +364,6 @@ module DEBUGGER__
             end
           end
 
-          SESSION.clear_all_breakpoints
-          send_response req
-
         ## control
         when 'continue'
           @q_msg << 'c'
@@ -911,7 +911,7 @@ module DEBUGGER__
 
     def search_const b, expr
       cs = expr.delete_prefix('::').split('::')
-      [Object, *b.eval('Module.nesting')].reverse_each{|mod|
+      [Object, *b.eval('::Module.nesting')].reverse_each{|mod|
         if cs.all?{|c|
              if mod.const_defined?(c)
                mod = mod.const_get(c)

data/lib/debug/session.rb

@@ -22,8 +22,9 @@ end
 # restore RUBYOPT
 if (added_opt = ENV['RUBY_DEBUG_ADDED_RUBYOPT']) &&
    (rubyopt = ENV['RUBYOPT']) &&
-   rubyopt.start_with?(added_opt)
-  ENV['RUBYOPT'] = rubyopt.delete_prefix(rubyopt)
+   rubyopt.end_with?(added_opt)
+
+  ENV['RUBYOPT'] = rubyopt.delete_suffix(added_opt)
   ENV['RUBY_DEBUG_ADDED_RUBYOPT'] = nil
 end
 
@@ -212,18 +213,24 @@ module DEBUGGER__
 
     def process_event evt
       # variable `@internal_info` is only used for test
-      @tc, output, ev, @internal_info, *ev_args = evt
+      tc, output, ev, @internal_info, *ev_args = evt
 
       output.each{|str| @ui.puts str} if ev != :suspend
 
-      case ev
-
-      when :thread_begin # special event, tc is nil
+      # special event, tc is nil
+      # and we don't want to set @tc to the newly created thread's ThreadClient
+      if ev == :thread_begin
         th = ev_args.shift
         q = ev_args.shift
         on_thread_begin th
         q << true
 
+        return
+      end
+
+      @tc = tc
+
+      case ev
       when :init
         enter_subsession
         wait_command_loop
@@ -1886,9 +1893,11 @@ module DEBUGGER__
 
     def after_fork child: true
       if child || !@lock_file
-        @m = Mutex.new
-        @lock_level = 0
-        @lock_file = open(@lock_tempfile.path, 'w')
+        @m = Mutex.new unless @m
+        @m.synchronize do
+          @lock_level = 0
+          @lock_file = open(@lock_tempfile.path, 'w')
+        end
       end
     end
 
@@ -2120,7 +2129,7 @@ module DEBUGGER__
   end
 
   # Inspector
-  
+
   SHORT_INSPECT_LENGTH = 40
 
   class LimitedPP
@@ -2222,7 +2231,7 @@ module DEBUGGER__
     # depend on the file system. So this check is only roughly estimation.
 
     def self.compare_path(a, b)
-      a.downcase == b.downcase
+      a&.downcase == b&.downcase
     end
   else
     def self.compare_path(a, b)

data/lib/debug/thread_client.rb

@@ -568,7 +568,7 @@ module DEBUGGER__
         unless only_self
           s.ancestors.each{|c| break if c == Object; cs[c] = :ancestors}
           if b = current_frame&.binding
-            b.eval('Module.nesting').each{|c| cs[c] = :nesting unless cs.has_key? c}
+            b.eval('::Module.nesting').each{|c| cs[c] = :nesting unless cs.has_key? c}
           end
         end
 

data/lib/debug/version.rb

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

data/lib/debug.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 require_relative 'debug/session'
+return unless defined?(DEBUGGER__)
 DEBUGGER__::start no_sigint_hook: true, nonstop: true

data/misc/README.md.erb

@@ -438,12 +438,12 @@ $ rdbg target.rb --open=chrome
 DEBUGGER: Debugger can attach via TCP/IP (127.0.0.1:43633)
 DEBUGGER: With Chrome browser, type the following URL in the address-bar:
 
-   devtools://devtools/bundled/inspector.html?ws=127.0.0.1:43633
+   devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=127.0.0.1:57231/b32a55cd-2eb5-4c5c-87d8-b3dfc59d80ef
 
 DEBUGGER: wait for debugger connection...
 ```
 
-Type `devtools://devtools/bundled/inspector.html?ws=127.0.0.1:43633` in the address-bar on Chrome browser, and you can continue the debugging with chrome browser.
+Type `devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=127.0.0.1:57231/b32a55cd-2eb5-4c5c-87d8-b3dfc59d80ef` in the address-bar on Chrome browser, and you can continue the debugging with chrome browser.
 
 Also `open chrome` command works like `open vscode`.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb