debug 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f83c7a7b44c3cae68d784d70fd653410ebce976c02bf846a9992f102634d98
-  data.tar.gz: b34c3d6b060aa20db1794905aef969105070d556862ceac4cf02ccc88db9bf0a
+  metadata.gz: 2247fdc7a834d652c93b28303b0a8de444aedfc75952965797f3d7e0f4e5115b
+  data.tar.gz: 6dfd3fd3f3e9a4d8e7469bb8dea86a056fc92d249353809be35691828142dbf8
 SHA512:
-  metadata.gz: c408ae087cd00a03e53410a9f6c3c54e2e4536d41784fb109dedd278d8b7941182a925593bf34991bfc2c15ed43e7baa20c736bde0aecb72b832fbdb4f4b55fe
-  data.tar.gz: b223e415ae539a0b95303b065f029afe48cd2007697979d66ca94e157d7823b848ffd40c1ccc5e2947d69a8aa1c23c08961ade262bc6315f267ec73176c2d882
+  metadata.gz: 8c1defaf4f8ff5d90a7becbbcf839953f61669672eefcbe82fb14d5a11e8706fe8fe8f38a097fecc07cdc57576b2e9c30cffce24252bd6da700d24bc3495f380
+  data.tar.gz: 620083feac21bbe224eb93d752b181a0a85421ebf1f5ae3e2f35a223737c1ad73e09215357ea231a05fb1c8b2c9157a2ea7eed04377b5103284ec6e60d33d171

data/exe/rdbg

@@ -13,10 +13,10 @@ when :start
   start_mode = config[:remote] ? "open" : 'start'
   cmd = config[:command] ? ARGV.shift : (ENV['RUBY'] || RbConfig.ruby)
 
+  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['RUBYOPT'] = "#{rubyopt} #{added}"
 
   exec(env, cmd, *ARGV)
 

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_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'

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
@@ -2120,7 +2127,7 @@ module DEBUGGER__
   end
 
   # Inspector
-  
+
   SHORT_INSPECT_LENGTH = 40
 
   class LimitedPP

data/lib/debug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DEBUGGER__
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 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

metadata

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