readapt 1.4.0 → 1.4.4

data/lib/readapt/debugger.rb

@@ -1,228 +1,227 @@
-# frozen_string_literal: true
-
-require 'backport'
-require 'observer'
-require 'set'
-
-module Readapt
-  class Debugger
-    include Observable
-    include Finder
-
-    attr_reader :monitor
-
-    attr_reader :file
-
-    attr_writer :pause_on_raise
-
-    def initialize
-      @stack = []
-      @frames = {}
-      @running = false
-      @attached = false
-      @request = nil
-      @config = {}
-      @original_argv = ARGV.clone
-      @original_prog = $0
-      @breakpoints = {}
-    end
-
-    def config arguments, request
-      @file = Readapt.normalize_path(find(arguments['program']))
-      @config = arguments
-      @request = request
-    rescue LoadError => e
-      STDERR.puts e.message
-    end
-
-    def pause_on_raise?
-      @pause_on_raise ||= false
-    end
-
-    # @return [Readapt::Thread]
-    def thread id
-      Thread.find(id)
-    end
-
-    def threads
-      Thread.all
-    end
-
-    def frame id
-      @frames[id] || Frame::NULL_FRAME
-    end
-
-    def launched?
-      @request == :launch
-    end
-
-    def attached?
-      @request == :attach
-    end
-
-    def start
-      ::Thread.new do
-        set_program_args
-        run { load @file }
-        set_original_args
-      end
-    end
-
-    def run
-      # raise RuntimeError, 'Debugger is already running' if @running
-      @running = true
-      send_event('process', {
-        name: @file
-      })
-      Monitor.start @file do |snapshot|
-        debug snapshot
-      end
-      yield if block_given?
-    rescue StandardError => e
-      STDERR.puts "[#{e.class}] #{e.message}"
-      STDERR.puts e.backtrace.join("\n")
-    ensure
-      Monitor.stop
-      @running = false
-      STDOUT.flush #unless STDOUT.closed?
-      STDERR.flush #unless STDERR.closed?
-      changed
-      send_event 'terminated', nil
-    end
-
-    def output data, category = :console
-      send_event('output', {
-        output: data,
-        category: category
-      })
-    end
-
-    def get_breakpoint source, line
-      @breakpoints["#{source}:#{line}"] || Breakpoint.new(source, line, nil, 0)
-    end
-
-    def set_breakpoint source, line, condition, hitcount
-      @breakpoints["#{source}:#{line}"] = Breakpoint.new(source, line, condition, hitcount)
-    end
-
-    def clear_breakpoints source
-      @breakpoints.delete_if { |_key, value|
-        value.source == source
-      }
-    end
-
-    def disconnect
-      shutdown if launched?
-      @request = nil
-    end
-
-    def self.run &block
-      new.run &block
-    end
-
-    private
-
-    # @param [Snapshot]
-    # return [void]
-    def debug snapshot
-      sleep 0.001 # @todo Trying to let thread data sync
-      References.clear
-      if snapshot.event == :thread_begin || snapshot.event == :entry
-        thr = Thread.find(snapshot.thread_id)
-        thr.control = :continue
-        send_event('thread', {
-          reason: 'started',
-          threadId: snapshot.thread_id
-        }, true)
-        snapshot.control = :continue
-      elsif snapshot.event == :thread_end
-        thr = thread(snapshot.thread_id)
-        thr.control = :continue
-        send_event('thread', {
-          reason: 'exited',
-          threadId: snapshot.thread_id
-        })
-        snapshot.control = :continue
-      else
-        confirmed_pause = true
-        thread = self.thread(snapshot.thread_id)
-        if snapshot.event == :breakpoint
-          bp = get_breakpoint(snapshot.file, snapshot.line)
-          unless bp.condition.nil? || bp.condition.empty?
-            # @type [Binding]
-            bnd = thread.frames.first.frame_binding
-            begin
-              unless bnd.eval(bp.condition)
-                confirmed_pause = false
-              end
-            rescue Exception => e
-              STDERR.puts "Breakpoint condition raised an error"
-              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
-              STDERR.puts "[#{e.class}] #{e.message}"
-              confirmed_pause = false
-            end
-          end
-          unless !confirmed_pause || bp.hit_condition.nil? || bp.hit_condition.empty?
-            bp.hit_cursor += 1
-            bnd = thread.frames.first.frame_binding
-            begin
-              hit_count = bnd.eval(bp.hit_condition)
-              if bp.hit_cursor == hit_count
-                bp.hit_cursor = 0
-              else
-                confirmed_pause = false
-              end
-            rescue Exception => e
-              STDERR.puts "Breakpoint condition raised an error"
-              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
-              STDERR.puts "[#{e.class}] #{e.message}"
-              confirmed_pause = false
-            end
-          end
-        elsif snapshot.event == :raise && !pause_on_raise?
-          confirmed_pause = false
-        end
-        if confirmed_pause
-          changed
-          thread.control = :pause
-          thread.frames.each do |frm|
-            @frames[frm.local_id] = frm
-          end
-          send_event('stopped', {
-            reason: snapshot.event,
-            threadId: thread.id
-          })
-          sleep 0.01 until thread.control != :pause || !Thread.include?(thread.id)
-          thread.frames.each do |frm|
-            @frames.delete frm.local_id
-          end
-        else
-          thread.control = :continue
-        end
-        snapshot.control = thread.control
-      end
-    end
-
-    def set_program_args
-      $0 = file
-      ARGV.clear
-      ARGV.replace(@config['programArgs'] || [])
-    end
-
-    def set_original_args
-      $0 = @original_prog
-      ARGV.clear
-      ARGV.replace @original_argv
-    end
-
-    def shutdown
-      exit
-    end
-
-    def send_event event, data, wait = false
-      changed
-      notify_observers event, data
-      sleep 0.01 if wait
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'backport'
+require 'observer'
+require 'set'
+
+module Readapt
+  class Debugger
+    include Observable
+    include Finder
+
+    attr_reader :monitor
+
+    attr_reader :file
+
+    attr_writer :pause_on_raise
+
+    def initialize
+      @stack = []
+      @frames = {}
+      @running = false
+      @attached = false
+      @request = nil
+      @config = {}
+      @original_argv = ARGV.clone
+      @original_prog = $0
+      @breakpoints = {}
+    end
+
+    def config arguments, request
+      @file = Readapt.normalize_path(find(arguments['program']))
+      @config = arguments
+      @request = request
+    rescue LoadError => e
+      STDERR.puts e.message
+    end
+
+    def pause_on_raise?
+      @pause_on_raise ||= false
+    end
+
+    # @return [Readapt::Thread]
+    def thread id
+      Thread.find(id)
+    end
+
+    def threads
+      Thread.all
+    end
+
+    def frame id
+      @frames[id] || Frame::NULL_FRAME
+    end
+
+    def launched?
+      @request == :launch
+    end
+
+    def attached?
+      @request == :attach
+    end
+
+    def start
+      ::Thread.new do
+        set_program_args
+        run { load @file }
+        set_original_args
+      end
+    end
+
+    def run
+      # raise RuntimeError, 'Debugger is already running' if @running
+      @running = true
+      send_event('process', {
+        name: @file
+      })
+      Monitor.start @file do |snapshot|
+        debug snapshot
+      end
+      yield if block_given?
+    rescue StandardError => e
+      STDERR.puts "[#{e.class}] #{e.message}"
+      STDERR.puts e.backtrace.join("\n")
+    ensure
+      Monitor.stop
+      @running = false
+      STDOUT.flush #unless STDOUT.closed?
+      STDERR.flush #unless STDERR.closed?
+      changed
+      send_event 'terminated', nil
+    end
+
+    def output data, category = :console
+      send_event('output', {
+        output: data,
+        category: category
+      })
+    end
+
+    def get_breakpoint source, line
+      @breakpoints["#{source}:#{line}"] || Breakpoint.new(source, line, nil, 0)
+    end
+
+    def set_breakpoint source, line, condition, hitcount
+      @breakpoints["#{source}:#{line}"] = Breakpoint.new(source, line, condition, hitcount)
+    end
+
+    def clear_breakpoints source
+      @breakpoints.delete_if { |_key, value|
+        value.source == source
+      }
+    end
+
+    def disconnect
+      shutdown if launched?
+      @request = nil
+    end
+
+    def self.run &block
+      new.run &block
+    end
+
+    private
+
+    # @param [Snapshot]
+    # return [void]
+    def debug snapshot
+      References.clear
+      if snapshot.event == :thread_begin || snapshot.event == :entry
+        thr = Thread.find(snapshot.thread_id)
+        thr.control = :continue
+        send_event('thread', {
+          reason: 'started',
+          threadId: snapshot.thread_id
+        }, true)
+        snapshot.control = :continue
+      elsif snapshot.event == :thread_end
+        thr = thread(snapshot.thread_id)
+        thr.control = :continue
+        send_event('thread', {
+          reason: 'exited',
+          threadId: snapshot.thread_id
+        })
+        snapshot.control = :continue
+      else
+        confirmed_pause = true
+        thread = self.thread(snapshot.thread_id)
+        if snapshot.event == :breakpoint
+          bp = get_breakpoint(snapshot.file, snapshot.line)
+          unless bp.condition.nil? || bp.condition.empty?
+            # @type [Binding]
+            bnd = thread.frames.first.frame_binding
+            begin
+              unless bnd.eval(bp.condition)
+                confirmed_pause = false
+              end
+            rescue StandardError => e
+              STDERR.puts "Breakpoint condition raised an error"
+              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
+              STDERR.puts "[#{e.class}] #{e.message}"
+              confirmed_pause = false
+            end
+          end
+          unless !confirmed_pause || bp.hit_condition.nil? || bp.hit_condition.empty?
+            bp.hit_cursor += 1
+            bnd = thread.frames.first.frame_binding
+            begin
+              hit_count = bnd.eval(bp.hit_condition)
+              if bp.hit_cursor == hit_count
+                bp.hit_cursor = 0
+              else
+                confirmed_pause = false
+              end
+            rescue StandardError => e
+              STDERR.puts "Breakpoint condition raised an error"
+              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
+              STDERR.puts "[#{e.class}] #{e.message}"
+              confirmed_pause = false
+            end
+          end
+        elsif snapshot.event == :raise && !pause_on_raise?
+          confirmed_pause = false
+        end
+        if confirmed_pause
+          changed
+          thread.control = :pause
+          thread.frames.each do |frm|
+            @frames[frm.local_id] = frm
+          end
+          send_event('stopped', {
+            reason: snapshot.event,
+            threadId: thread.id
+          })
+          sleep 0.01 until thread.control != :pause || !Thread.include?(thread.id)
+          thread.frames.each do |frm|
+            @frames.delete frm.local_id
+          end
+        else
+          thread.control = :continue
+        end
+        snapshot.control = thread.control
+      end
+    end
+
+    def set_program_args
+      $0 = file
+      ARGV.clear
+      ARGV.replace(@config['programArgs'] || [])
+    end
+
+    def set_original_args
+      $0 = @original_prog
+      ARGV.clear
+      ARGV.replace @original_argv
+    end
+
+    def shutdown
+      exit
+    end
+
+    def send_event event, data, wait = false
+      changed
+      notify_observers event, data
+      sleep 0.01 if wait
+    end
+  end
+end

data/lib/readapt/error.rb

@@ -1,63 +1,63 @@
-require 'securerandom'
-
-module Readapt
-  module Error
-    class << self
-      attr_accessor :adapter
-    end
-
-    def opening
-      @buffer = ''
-    end
-
-    def receiving data
-      output = ''
-      data.each_char do |char|
-        @buffer += char
-        if open_message.start_with?(@buffer) || @buffer.start_with?(open_message)
-          if @buffer.end_with?(close_message)
-            msg = @buffer[open_message.length..-(close_message.length+1)]
-            exit if msg == '__TERMINATE__'
-            Error.adapter.write msg
-            @buffer.clear
-          end
-        else
-          output += @buffer
-          @buffer.clear
-        end
-      end
-      return if output.empty?
-      send_event('output', {
-        output: output,
-        category: 'stderr'
-      })
-    end
-
-    def send_event event, data
-      obj = {
-        type: 'event',
-        event: event
-      }
-      obj[:body] = data unless data.nil?
-      json = obj.to_json
-      envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-      Error.adapter.write envelope
-    end
-
-    def self.procid= pid
-      @@procid = pid
-    end
-
-    def procid
-      @@procid
-    end
-
-    def open_message
-      @@open_message ||= "<readapt-#{procid}>"
-    end
-
-    def close_message
-      @@close_message ||= "</readapt-#{procid}>"
-    end
-  end
-end
+require 'securerandom'
+
+module Readapt
+  module Error
+    class << self
+      attr_accessor :adapter
+    end
+
+    def opening
+      @buffer = ''
+    end
+
+    def receiving data
+      output = ''
+      data.each_char do |char|
+        @buffer += char
+        if open_message.start_with?(@buffer) || @buffer.start_with?(open_message)
+          if @buffer.end_with?(close_message)
+            msg = @buffer[open_message.length..-(close_message.length+1)]
+            exit if msg == '__TERMINATE__'
+            Error.adapter.write msg
+            @buffer.clear
+          end
+        else
+          output += @buffer
+          @buffer.clear
+        end
+      end
+      return if output.empty?
+      send_event('output', {
+        output: output,
+        category: 'stderr'
+      })
+    end
+
+    def send_event event, data
+      obj = {
+        type: 'event',
+        event: event
+      }
+      obj[:body] = data unless data.nil?
+      json = obj.to_json
+      envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+      Error.adapter.write envelope
+    end
+
+    def self.procid= pid
+      @@procid = pid
+    end
+
+    def procid
+      @@procid
+    end
+
+    def open_message
+      @@open_message ||= "<readapt-#{procid}>"
+    end
+
+    def close_message
+      @@close_message ||= "</readapt-#{procid}>"
+    end
+  end
+end

data/lib/readapt/finder.rb

@@ -1,34 +1,34 @@
-require 'pathname'
-
-module Readapt
-  # Methods to find a program in the current directory or one of the
-  # environment paths.
-  #
-  module Finder
-    module_function
-
-    # Get the program's fully qualified path. Search first in the current
-    # directory, then the environment paths.
-    #
-    # @raise [LoadError] if the program was not found
-    #
-    # @param program [String] The name of the program
-    # @return [String] The fully qualified path
-    def find program
-      return program if File.exist?(program)
-      which(program) || raise(LoadError, "#{program} is not a valid Ruby file or program")
-    end
-
-    # Search the environment paths for the given program.
-    #
-    # @param program [String] The name of the program
-    # @return [String] The fully qualified path, or nil if it was not found
-    def which program
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exe = File.join(path, program)
-        return exe if File.file?(exe)
-      end
-      nil
-    end
-  end
-end
+require 'pathname'
+
+module Readapt
+  # Methods to find a program in the current directory or one of the
+  # environment paths.
+  #
+  module Finder
+    module_function
+
+    # Get the program's fully qualified path. Search first in the current
+    # directory, then the environment paths.
+    #
+    # @raise [LoadError] if the program was not found
+    #
+    # @param program [String] The name of the program
+    # @return [String] The fully qualified path
+    def find program
+      return program if File.exist?(program)
+      which(program) || raise(LoadError, "#{program} is not a valid Ruby file or program")
+    end
+
+    # Search the environment paths for the given program.
+    #
+    # @param program [String] The name of the program
+    # @return [String] The fully qualified path, or nil if it was not found
+    def which program
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exe = File.join(path, program)
+        return exe if File.file?(exe)
+      end
+      nil
+    end
+  end
+end