readapt 0.7.1 → 1.1.1

data/lib/readapt/output.rb

@@ -0,0 +1,25 @@
+module Readapt
+  module Output
+    class << self
+      attr_accessor :adapter
+    end
+
+    def receiving data
+      send_event('output', {
+        output: data.force_encoding('utf-8'),
+        category: 'stdout'
+      })
+    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}"
+      Output.adapter.write envelope
+    end
+  end
+end

data/lib/readapt/references.rb

@@ -0,0 +1,27 @@
+module Readapt
+  module References
+    module_function
+
+    @variable_reference_map = {}
+    @reference_variable_map = {}
+    @reference_id = 1000
+
+    def clear
+      @variable_reference_map.clear
+      @reference_variable_map.clear
+      @reference_id = 1000
+    end
+
+    def identify object
+      return @variable_reference_map[object] if @variable_reference_map.has_key?(object)
+      @reference_id += 1
+      @variable_reference_map[object] = @reference_id
+      @reference_variable_map[@reference_id] = object
+      @reference_id
+    end
+
+    def get id
+      @reference_variable_map[id]
+    end
+  end
+end

data/lib/readapt/server.rb

@@ -0,0 +1,22 @@
+require 'securerandom'
+require 'stringio'
+
+module Readapt
+  module Server
+    class << self
+      attr_accessor :target_in
+      attr_accessor :target_pid
+    end
+
+    def opening
+      Error.adapter = self
+      Output.adapter = self
+    end
+
+    def receiving data
+      Server.target_in.syswrite data
+    rescue Errno::EPIPE, IOError
+      close
+    end
+  end
+end

data/lib/readapt/shell.rb

@@ -1,39 +1,104 @@
-require 'thor'
-require 'backport'
-
-module Readapt
-  class Shell < Thor
-    map %w[--version -v] => :version
-
-    desc "--version, -v", "Print the version"
-    def version
-      puts Readapt::VERSION
-    end
-
-    desc 'serve', 'Run a DAP server'
-    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
-      machine = Backport::Machine.new
-      machine.run do
-        Signal.trap("INT") do
-          graceful_shutdown
-        end
-        Signal.trap("TERM") do
-          graceful_shutdown
-        end
-        debugger = Readapt::Debugger.new(machine)
-        Readapt::Adapter.host debugger
-        machine.prepare Backport::Server::Tcpip.new(host: options[:host], port: options[:port], adapter: Readapt::Adapter)
-        STDERR.puts "Readapt Debugger #{Readapt::VERSION} is listening HOST=#{options[:host]} PORT=#{options[:port]} PID=#{Process.pid}"
-      end
-    end
-
-    private
-
-    def graceful_shutdown
-      Backport.stop
-      exit
-    end
-  end
-end
+require 'thor'
+require 'backport'
+require 'open3'
+require 'securerandom'
+require 'socket'
+
+module Readapt
+  class Shell < Thor
+    map %w[--version -v] => :version
+
+    desc "--version, -v", "Print the version"
+    def version
+      puts Readapt::VERSION
+    end
+
+    desc 'socket', 'Run a DAP server over TCP'
+    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 socket
+      machine = Backport::Machine.new
+      machine.run do
+        prepare_machine machine
+        server = Backport::Server::Tcpip.new(host: options[:host], port: options[:port], adapter: Readapt::Server)
+        machine.prepare server
+        STDERR.puts "Readapt Debugger #{Readapt::VERSION} is listening HOST=#{options[:host]} PORT=#{options[:port]} PID=#{Process.pid}"
+      end
+    end
+    map serve: :socket
+
+    desc 'stdio', 'Run a DAP server over STDIO'
+    def stdio
+      machine = Backport::Machine.new
+      machine.run do
+        prepare_machine machine
+        server = Backport::Server::Stdio.new(adapter: Readapt::Server)
+        machine.prepare server
+      end
+    end
+
+    desc 'target [PROCID]', 'Run a target process'
+    def target procid = nil
+      STDIN.binmode
+      STDOUT.binmode
+      STDERR.binmode
+      STDOUT.sync = true
+      STDERR.sync = true
+      Readapt::Adapter.procid = procid
+      machine = Backport::Machine.new
+      Signal.trap("INT") do
+        graceful_shutdown machine
+      end
+      Signal.trap("TERM") do
+        graceful_shutdown machine
+      end
+      machine.run do
+        debugger = Readapt::Debugger.new
+        Readapt::Adapter.host debugger
+        machine.prepare Backport::Server::Stdio.new(input: STDIN, output: STDERR, adapter: Readapt::Adapter)
+      end
+    end
+
+    private
+
+    # @param machine [Backport::Machine]
+    # @return [void]
+    def prepare_machine machine
+      STDOUT.sync = true
+      STDERR.sync = true
+      Signal.trap("INT") do
+        graceful_shutdown machine
+      end
+      Signal.trap("TERM") do
+        graceful_shutdown machine
+      end
+      procid = SecureRandom.hex(8)
+      Readapt::Error.procid = procid
+      stdin, stdout, stderr, thr = Open3.popen3('ruby', $0, 'target', procid)
+      stdin.sync = true
+      stdout.sync = true
+      stderr.sync = true
+      stdin.binmode
+      Readapt::Server.target_in = stdin
+      Readapt::Server.target_pid = thr[:pid]
+      output = Backport::Server::Stdio.new(input: stdout, output: stdin, adapter: Readapt::Output)
+      error = Backport::Server::Stdio.new(input: stderr, output: stdin, adapter: Readapt::Error)
+      machine.prepare output
+      machine.prepare error
+      at_exit do
+        begin
+          Process.kill 'KILL', thr[:pid]
+        rescue Errno::ESRCH
+          # Ignore
+        end
+      end
+    end
+
+    # @param machine [Backport::Machine]
+    # @return [void]
+    def graceful_shutdown machine
+      machine.stop
+      exit
+    end
+  end
+end

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

@@ -1,39 +1,23 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-
-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 ||= []
-    end
-
-    class NullThread < Thread
-      def initialize
-        @id = 0
-        @name = 'Null Thread'
-        @frames = [].freeze
-      end
-    end
-    private_constant :NullThread
-
-    NULL_THREAD = NullThread.new
-  end
-end
+# frozen_string_literal: true
+
+require 'ostruct'
+
+module Readapt
+  class Thread
+    @@next_id = 0
+
+    # @return [Symbol]
+    attr_accessor :control
+
+    def name
+      @name ||= begin
+        @@next_id += 1
+        "Thread #{@@next_id}"
+      end
+    end
+
+    def object
+      ObjectSpace._id2ref(id)
+    end
+  end
+end

data/lib/readapt/variable.rb

@@ -16,7 +16,7 @@ module Readapt
 
     # @return [Integer]
     def reference
-      @reference ||= unstructured || object.object_id
+      @reference ||= unstructured || References.identify(object)
     end
 
     # @return [String]

data/lib/readapt/version.rb

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

data/readapt.gemspec

@@ -1,39 +1,39 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "readapt/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "readapt"
-  spec.version       = Readapt::VERSION
-  spec.authors       = ["Fred Snyder"]
-  spec.email         = ["fsnyder@castwide.com"]
-
-  spec.summary       = 'A Ruby debugger for the Debug Adapter Protocol'
-  spec.description   = 'Readapt is a Ruby debugger that natively supports the Debug Adapter Protocol. Features include next/step in/step out, local and global variable data, and individual thread control.'
-  spec.homepage      = "https://castwide.com"
-  spec.license       = "MIT"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/castwide/readapt"
-  spec.metadata["changelog_uri"] = "https://github.com/castwide/readapt/blob/master/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.extensions = ['ext/readapt/extconf.rb']
-
-  spec.required_ruby_version = '>= 2.2'
-
-  spec.add_dependency 'backport', '~> 1.1'
-  spec.add_dependency 'thor', '~> 0.20'
-
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'simplecov', '~> 0.14'
-end
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "readapt/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "readapt"
+  spec.version       = Readapt::VERSION
+  spec.authors       = ["Fred Snyder"]
+  spec.email         = ["fsnyder@castwide.com"]
+
+  spec.summary       = 'A Ruby debugger for the Debug Adapter Protocol'
+  spec.description   = 'Readapt is a Ruby debugger that natively supports the Debug Adapter Protocol. Features include next/step in/step out, local and global variable data, and individual thread control.'
+  spec.homepage      = "https://castwide.com"
+  spec.license       = "MIT"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/castwide/readapt"
+  spec.metadata["changelog_uri"] = "https://github.com/castwide/readapt/blob/master/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions = ['ext/readapt/extconf.rb']
+
+  spec.required_ruby_version = '>= 2.2'
+
+  spec.add_dependency 'backport', '~> 1.1'
+  spec.add_dependency 'thor', '~> 1.0'
+
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rake-compiler", "~> 1.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'simplecov', '~> 0.14'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -119,22 +119,30 @@ 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
 - lib/readapt/adapter.rb
 - lib/readapt/breakpoint.rb
+- lib/readapt/data_reader.rb
 - lib/readapt/debugger.rb
+- lib/readapt/error.rb
 - lib/readapt/finder.rb
 - lib/readapt/frame.rb
-- lib/readapt/location.rb
+- lib/readapt/input.rb
 - lib/readapt/message.rb
 - lib/readapt/message/attach.rb
 - lib/readapt/message/base.rb
@@ -155,6 +163,9 @@ files:
 - lib/readapt/message/threads.rb
 - lib/readapt/message/variables.rb
 - lib/readapt/monitor.rb
+- lib/readapt/output.rb
+- lib/readapt/references.rb
+- lib/readapt/server.rb
 - lib/readapt/shell.rb
 - lib/readapt/snapshot.rb
 - lib/readapt/thread.rb
@@ -183,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.0
 signing_key: 
 specification_version: 4
 summary: A Ruby debugger for the Debug Adapter Protocol