debug 1.0.0.beta5 → 1.0.0.beta6

data/lib/debug/source_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'color'
 
 module DEBUGGER__

data/lib/debug/thread_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'objspace'
 require 'pp'
 
@@ -136,6 +138,11 @@ module DEBUGGER__
       wait_next_action
     end
 
+    def on_init name
+      event! :init, name
+      wait_next_action
+    end
+
     def on_breakpoint tp, bp
       on_suspend tp.event, tp, bp: bp
     end
@@ -394,7 +401,7 @@ module DEBUGGER__
       end
     end
 
-    def add_breakpoint args
+    def make_breakpoint args
       case args.first
       when :method
         klass_name, op, method_name, cond = args[1..]
@@ -405,7 +412,11 @@ module DEBUGGER__
           puts e.message
           ::DEBUGGER__::METHOD_ADDED_TRACKER.enable
         end
-        event! :result, :method_breakpoint, bp
+
+        bp
+      when :watch
+        ivar, object, result = args[1..]
+        WatchIVarBreakpoint.new(ivar, object, result)
       else
         raise "unknown breakpoint: #{args}"
       end
@@ -437,11 +448,15 @@ module DEBUGGER__
             frame = @target_frames.first
             path = frame.location.absolute_path || "!eval:#{frame.path}"
             line = frame.location.lineno
-            frame.iseq.traceable_lines_norec(lines = {})
-            next_line = lines.keys.bsearch{|e| e > line}
-            if !next_line && (last_line = frame.iseq.last_line) > line
-              next_line = last_line
+
+            if frame.iseq
+              frame.iseq.traceable_lines_norec(lines = {})
+              next_line = lines.keys.bsearch{|e| e > line}
+              if !next_line && (last_line = frame.iseq.last_line) > line
+                next_line = last_line
+              end
             end
+
             depth = @target_frames.first.frame_depth
 
             step_tp{
@@ -469,17 +484,14 @@ module DEBUGGER__
         when :eval
           eval_type, eval_src = *args
 
-          case eval_type
-          when :display, :try_display
-          else
-            result = frame_eval(eval_src)
-          end
           result_type = nil
 
           case eval_type
           when :p
+            result = frame_eval(eval_src)
             puts "=> " + result.inspect
           when :pp
+            result = frame_eval(eval_src)
             puts "=> "
             PP.pp(result, out = ''.dup, SESSION.width)
             puts out
@@ -497,23 +509,6 @@ module DEBUGGER__
 
             result_type = eval_type
             result = failed_results
-          when :watch
-            if @success_last_eval
-              if eval_src.match?(/@\w+/)
-                object =
-                  if b = current_frame.binding
-                    b.receiver
-                  else
-                    current_frame.self
-                  end
-                puts "#{object} #{eval_src} = #{result}"
-                result = WatchIVarBreakpoint.new(eval_src, object, result)
-              end
-
-              result_type = :watch
-            else
-              result = nil
-            end
           else
             raise "unknown error option: #{args.inspect}"
           end
@@ -576,13 +571,30 @@ module DEBUGGER__
           end
 
           event! :result, nil
-
         when :breakpoint
-          add_breakpoint args
+          case args[0]
+          when :method
+            bp = make_breakpoint args
+            event! :result, :method_breakpoint, bp
+          when :watch
+            ivar = args[1]
+            result = frame_eval(ivar)
 
+            if @success_last_eval
+              object =
+                if b = current_frame.binding
+                  b.receiver
+                else
+                  current_frame.self
+                end
+              bp = make_breakpoint [:watch, ivar, object, result]
+              event! :result, :watch_breakpoint, bp
+            else
+              event! :result, nil
+            end
+          end
         when :dap
           process_dap args
-
         else
           raise [cmd, *args].inspect
         end

data/lib/debug/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DEBUGGER__
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0.beta6"
 end

data/misc/README.md.erb

@@ -11,7 +11,7 @@ New debug.rb has several advantages:
 * Remote debugging: Support remote debugging natively.
   * UNIX domain socket
   * TCP/IP
-  * VSCode/DAP integration (TODO)
+  * VSCode/DAP integration ([VSCode rdbg Ruby Debugger - Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=KoichiSasada.vscode-rdbg))
 * Extensible: application can introduce debugging support with several methods
   * By `rdbg` command
   * By loading libraries with `-r` command line option
@@ -29,6 +29,16 @@ $ gem install debug --pre
 
 or specify `-Ipath/to/debug/lib` in `RUBYOPT` or each ruby command-line option, especially for debug this gem development.
 
+If you use Bundler, write the following line to your Gemfile. And use rdbg command with -c option.
+
+```
+gem "debug", ">= 1.0.0.beta"
+```
+
+```
+$ rdbg -c bundle exec ruby target.rb
+```
+
 # How to use
 
 ## Invoke with debugger
@@ -70,10 +80,6 @@ $ ruby -r debug/run target.rb
 # target.rb
 require 'debug/run' # start the debug console
 
-# or
-
-require 'debug/session'  # introduce the functionality
-DEBUGGER__.console       # and start the debug console
 # ... rest of program ...
 ```
 
@@ -300,11 +306,9 @@ $ rdbg --attach hostname 12345
 
 ### Initial scripts
 
-If there are `.rdbgrc` files are there at the current directory and the home directory, files are loaded as initial scripts which contains debugger commands. `RUBY_DEBUG_INIT_SCRIPT` environment variable can specify the initial script file.
-
-Initial scripts are evaluated at the first suspend timing (generally, it is the beginning of the target script). For example, you can set break points with `break file:123`.
+If there are `~/.rdbgrc`, the file is loaded as initial scripts which contains debugger commands at the beginning of debug session. `RUBY_DEBUG_INIT_SCRIPT` environment variable can specify the initial script file. You can write configurations in a file. For example, you can set break points with `break file:123` in `~/.rdbgrc`.
 
-If there are `.rdbgrc.rb` files at the current directory and the home directory, files are loaded as a ruby script at the initializing timing.
+If there are `~/.rdbgrc.rb` is available, it is loaded as a ruby script at same timing.
 
 ### Environment variables
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.beta6
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -43,6 +43,7 @@ files:
 - Rakefile
 - TODO.md
 - bin/console
+- bin/gentest
 - bin/setup
 - debug.gemspec
 - exe/rdbg
@@ -63,7 +64,6 @@ files:
 - lib/debug/server_dap.rb
 - lib/debug/session.rb
 - lib/debug/source_repository.rb
-- lib/debug/test_console.rb
 - lib/debug/thread_client.rb
 - lib/debug/version.rb
 - misc/README.md.erb