readapt 0.7.1 → 0.8.0

data/lib/readapt/frame.rb

@@ -1,42 +1,40 @@
 # frozen_string_literal: true
 
 module Readapt
+  # @!method file
+  #   @return [String]
+  # @!method line
+  #   @return [Integer]
+  # @!method binding_id
+  #   @return [Integer]
+  # @!method initialize(file, line, binding_id)
   class Frame
-    attr_reader :location
-
-    def initialize location, binding_id
-      @location = location
-      @binding = ObjectSpace._id2ref(binding_id)
-    end
-
     def evaluate code
-      @binding.eval(code).inspect
+      frame_binding.eval(code).inspect
     rescue Exception => e
       "[#{e.class}] #{e.message}"
     end
 
     def local_id
-      @binding.object_id
+      frame_binding.object_id
     end
 
     def locals
-      return [] if @binding.nil?
+      return [] if frame_binding.nil?
       result = []
-      @binding.local_variables.each do |sym|
-        var = @binding.local_variable_get(sym)
+      frame_binding.local_variables.each do |sym|
+        var = frame_binding.local_variable_get(sym)
         result.push Variable.new(sym, var)
       end
-      if @binding.receiver != TOPLEVEL_BINDING.receiver
-        result.push Variable.new(:self, @binding.receiver)
-      end
+      result.push Variable.new(:self, frame_binding.receiver)
       result
     end
 
     def local sym
-      return @binding.receiver if sym == :self
-      @binding.local_variable_get sym
+      return frame_binding.receiver if sym == :self
+      frame_binding.local_variable_get sym
     end
 
-    NULL_FRAME = Frame.new(nil, nil.object_id)
+    NULL_FRAME = Frame.new("", 0, nil)
   end
 end

data/lib/readapt/message.rb

@@ -29,13 +29,15 @@ module Readapt
     end
 
     def self.process arguments, debugger
-      message = @@messages[arguments['command']].new(arguments['arguments'], debugger)
-      message.run
-      message
-    rescue Exception => e
-      STDERR.puts "Skipping error: #{e.message}"
-      STDERR.puts "Received: #{arguments}"
-      STDERR.puts e.backtrace
+      klass = @@messages[arguments['command']]
+      if klass.nil?
+        STDERR.puts "Debugger received unrecognized command `#{arguments['command']}`"
+        Message::Base.new(arguments, debugger)
+      else
+        message = klass.new(arguments['arguments'], debugger)
+        message.run
+        message
+      end
     end
 
     register 'initialize', Message::Initialize
@@ -55,5 +57,6 @@ module Readapt
     register 'disconnect', Message::Disconnect
     register 'pause', Message::Pause
     register 'evaluate', Message::Evaluate
+    # register 'source', Message::Base # @todo Placeholder
   end
 end

data/lib/readapt/message/scopes.rb

@@ -14,7 +14,8 @@ module Readapt
             },
             {
               name: 'Global',
-              variablesReference: TOPLEVEL_BINDING.receiver.object_id,
+              # @todo 1 is a magic number representing the toplevel binding
+              variablesReference: 1,
               expensive: true
             }
           ]

data/lib/readapt/message/set_breakpoints.rb

@@ -9,7 +9,7 @@ module Readapt
         lines = []
         set_body(
           breakpoints: arguments['breakpoints'].map do |val|
-            debugger.set_breakpoint path, val['line'], val['condition']
+            debugger.set_breakpoint path, val['line'], val['condition'], val['hitCondition']
             lines.push val['line']
             {
               verified: true, # @todo Verify

data/lib/readapt/message/stack_trace.rb

@@ -3,24 +3,36 @@
 module Readapt
   module Message
     class StackTrace < Base
+      @@file_hash = {}
+
       def run
         frames = debugger.thread(arguments['threadId']).frames
         set_body({
           stackFrames: frames.map do |frm|
             {
-              name: "#{File.basename(frm.location.file)}:#{frm.location.line}",
+              name: frame_code(frm.file, frm.line),
               source: {
-                name: File.basename(frm.location.file),
-                path: frm.location.file
+                name: frm.file ? File.basename(frm.file) : nil,
+                path: frm.file
               },
               id: frm.local_id,
-              line: frm.location.line,
+              line: frm.line,
               column: 0
             }
           end,
           totalFrames: frames.length
         })
       end
+
+      private
+
+      def read_file file
+        @@file_hash[file] ||= File.read(file)
+      end
+
+      def frame_code file, line
+        read_file(file).lines[line - 1].strip
+      end
     end
   end
 end

data/lib/readapt/message/variables.rb

@@ -6,32 +6,36 @@ module Readapt
       def run
         ref = arguments['variablesReference']
         frame = debugger.frame(ref)
-        vars = if frame != Frame::NULL_FRAME && !frame.nil?
-          frame.locals
-        elsif ref == TOPLEVEL_BINDING.receiver.object_id
+        # @todo 1 is a magic number representing the toplevel binding (see
+        #   Message::Scopes)
+        vars = if ref == 1
           global_variables.map do |gv|
             Variable.new(gv, eval(gv.to_s))
           end
         else
-          obj = object_reference
-          result = []
-          if obj.is_a?(Array)
-            obj.each_with_index do |itm, idx|
-              result.push Variable.new("[#{idx}]", itm)
-            end
-          elsif obj.is_a?(Hash)
-            obj.each_pair do |idx, itm|
-              result.push Variable.new("[#{idx}]", itm)
-            end
+          if frame != Frame::NULL_FRAME && !frame.nil?
+            frame.locals
           else
-            obj.instance_variables.each do |iv|
-              result.push Variable.new(iv, obj.instance_variable_get(iv))
-            end
-            obj.class.class_variables.each do |cv|
-              result.push Variable.new(cv, obj.class.class_variable_get(cv))
+            obj = object_reference
+            result = []
+            if obj.is_a?(Array)
+              obj.each_with_index do |itm, idx|
+                result.push Variable.new("[#{idx}]", itm)
+              end
+            elsif obj.is_a?(Hash)
+              obj.each_pair do |idx, itm|
+                result.push Variable.new("[#{idx}]", itm)
+              end
+            else
+              obj.instance_variables.each do |iv|
+                result.push Variable.new(iv, obj.instance_variable_get(iv))
+              end
+              obj.class.class_variables.each do |cv|
+                result.push Variable.new(cv, obj.class.class_variable_get(cv))
+              end
             end
+            result
           end
-          result
         end
         set_body({
           variables: vars.map do |var|

data/lib/readapt/shell.rb

@@ -14,6 +14,8 @@ module Readapt
     option :host, type: :string, aliases: :h, description: 'The server host', default: '127.0.0.1'
     option :port, type: :numeric, aliases: :p, description: 'The server port', default: 1234
     def serve
+      STDOUT.sync = true
+      STDERR.sync = true
       machine = Backport::Machine.new
       machine.run do
         Signal.trap("INT") do

data/lib/readapt/snapshot.rb

@@ -7,25 +7,16 @@ module Readapt
     # @return [Integer]
     attr_reader :thread_id
 
-    # @return [Integer]
-    attr_reader :binding_id
-
     # @return [String]
     attr_reader :file
 
     # @return [Integer]
     attr_reader :line
 
-    # @return [Symbol]
-    attr_reader :method_name
-
     # The reason for pausing the debugging, e.g., "breakpoint" or "step"
     # @return [String, Symbol]
     attr_reader :event
 
-    # @return [Integer]
-    attr_reader :depth
-
     # @return [Symbol]
     attr_accessor :control
 
@@ -36,14 +27,11 @@ module Readapt
     # @param method_name [Symbol]
     # @param event [String, Symbol]
     # @param depth [Integer]
-    def initialize thread_id, binding_id, file, line, method_name, event, depth
+    def initialize thread_id, file, line, event
       @thread_id = thread_id
-      @binding_id = binding_id
       @file = file
       @line = line
-      @method_name = method_name
       @event = event
-      @depth = depth
       @control = :pause
     end
   end

data/lib/readapt/thread.rb

@@ -6,34 +6,23 @@ module Readapt
   class Thread
     @@next_id = 0
 
-    # @return [Integer]
-    attr_reader :id
-
-    # @return [String]
-    attr_reader :name
-
     # @return [Symbol]
     attr_accessor :control
 
-    def initialize id
-      @id = id
-      @@next_id += 1
-      @name = "Thread #{@@next_id}"
-    end
-
-    def frames
-      @frames ||= []
+    def name
+      @name ||= begin
+        @@next_id += 1
+        "Thread #{@@next_id}"
+      end
     end
 
-    class NullThread < Thread
-      def initialize
-        @id = 0
-        @name = 'Null Thread'
-        @frames = [].freeze
-      end
+    def object
+      STDERR.puts "Getting #{id}"
+      ObjectSpace._id2ref(id)
     end
-    private_constant :NullThread
 
-    NULL_THREAD = NullThread.new
+    # def frames
+    #   @frames ||= []
+    # end
   end
 end

data/lib/readapt/version.rb

@@ -1,3 +1,3 @@
 module Readapt
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -119,13 +119,19 @@ files:
 - ext/readapt/breakpoints.c
 - ext/readapt/breakpoints.h
 - ext/readapt/extconf.rb
+- ext/readapt/frame.c
+- ext/readapt/frame.h
 - ext/readapt/hash_table.c
 - ext/readapt/hash_table.h
+- ext/readapt/inspector.c
+- ext/readapt/inspector.h
 - ext/readapt/monitor.c
 - ext/readapt/monitor.h
 - ext/readapt/normalize.c
 - ext/readapt/normalize.h
 - ext/readapt/readapt.c
+- ext/readapt/stack.c
+- ext/readapt/stack.h
 - ext/readapt/threads.c
 - ext/readapt/threads.h
 - lib/readapt.rb
@@ -134,7 +140,6 @@ files:
 - lib/readapt/debugger.rb
 - lib/readapt/finder.rb
 - lib/readapt/frame.rb
-- lib/readapt/location.rb
 - lib/readapt/message.rb
 - lib/readapt/message/attach.rb
 - lib/readapt/message/base.rb

data/lib/readapt/location.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Readapt
-  # A simple file/line reference.
-  #
-  class Location
-    # @return [String]
-    attr_reader :file
-
-    # @return [Integer]
-    attr_reader :line
-
-    # @param file [String]
-    # @param line [Integer]
-    def initialize file, line
-      @file = file
-      @line = line
-    end
-
-    def match? other
-      return false unless other.is_a?(Location)
-      file == other.file && line == other.line
-    end
-  end
-end