break 0.9.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef06d9ad6c7511104925c2b1d6f9e5a61b8dc2e1cb1f9b982701e927b7b7610
-  data.tar.gz: 7e5909e5fd6673e8a209c34763946816ed1304fd82d86340e7c998a5ba472994
+  metadata.gz: 8847ce453f4b00d664fec2f77e2f553f1a25d95847fad8e44aeb849bcc696dd6
+  data.tar.gz: 3d0f52bba812f6dac645936822721ad60246ad79c379f1475154d9c53c45cbc2
 SHA512:
-  metadata.gz: a2c4c328b86982034c6113067c1f117d273d12a882c262713d2997d0e3d430c96964b60f46dc25ebe28eb8172188157841ca6fdbf737ea2f36e9aeb64139b882
-  data.tar.gz: 84f61f9b4c78e735b459b8f5b79a49ff9857e5f9b3fc28eb360f2dd2775b83b848d7c161267fb6008258018c38a8cd62cd1b0c62dcaf5003097a10082c5c1bd4
+  metadata.gz: f52722f40b4ce06b009bfa2a18dd53c547c3e93d4735bd53dcc38318fbcac65449f87a4672f0dbff6f25473a41f2ff5a81e27e99b60872a5ca2b365da49c1f0d
+  data.tar.gz: e3fe4853aa0c51e7d33368b176e101ffaaaa9309dcf3c23577720e71877278636f98476dc974e7b321c75fa62355b4ad303ba1d5cf9c53dc02c3baca5d2cffdf

data/lib/break.rb

@@ -9,6 +9,6 @@ require_relative "break/filter"
 require_relative "break/binding_ext"
 
 require_relative "break/irb"
-require_relative "break/pry" if defined?(Pry)
+require_relative "break/pry"
 
 Break::Filter.register_internal __dir__

data/lib/break/commands.rb

@@ -1,8 +1,6 @@
 require_relative "commands/tracepoint_command"
-require_relative "commands/continue_command"
-require_relative "commands/list_command"
 require_relative "commands/next_command"
 require_relative "commands/step_command"
 require_relative "commands/up_command"
 require_relative "commands/down_command"
-
+require_relative "commands/where_command"

data/lib/break/commands/tracepoint_command.rb

@@ -40,6 +40,8 @@ module Break
 
     def context!(*args)
       @delayed_context.resume(*args)
+    rescue FiberError
+      session.context!(*args)
     end
 
     def trace_events

data/lib/break/commands/{list_command.rb → where_command.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Break
-  class ListCommand < Command
+  class WhereCommand < Command
     def execute(*)
       frontend.where
     end

data/lib/break/irb.rb

@@ -4,7 +4,10 @@ require_relative "irb/frontend"
 require_relative "irb/commands"
 require_relative "irb/overrides"
 
+require "open-uri"
+
 Break::Filter.register_internal IRB.method(:start).source_location.first.chomp(".rb")
+Break::Filter.register_internal URI.method(:open).source_location.first.chomp(".rb")
 Break::Filter.register_internal "(irb)"
 
 Binding.prepend Break::IRB::Overrides

data/lib/break/irb/commands.rb

@@ -9,22 +9,14 @@ module Break::IRB
       define_command session, :step,     Break::StepCommand
       define_command session, :up,       Break::UpCommand
       define_command session, :down,     Break::DownCommand
-      define_command session, :list,     Break::ListCommand
-      define_command session, :continue, Break::ContinueCommand, preserve: false
+      define_command session, :whereami, Break::WhereCommand
     end
 
     private
 
-    def define_command(session, name, cls, preserve: true)
+    def define_command(session, name, cls)
       define_method(name) do |*args|
         cls.new(session).execute(*args)
-      ensure
-        # We don't have a clear guideline of when an IRB session starts and
-        # when it ends. If we're executing commands, we have to quit the IRB
-        # session which naturally marks it as stopped. If we're executing a
-        # `break` command we actually want to keep marking it as started
-        # so we don't step over `binding.irb` calls.
-        Break::Session.start! if preserve
       end
     end
   end

data/lib/break/irb/frontend.rb

@@ -43,9 +43,9 @@ module Break::IRB
     # commands support in the lexer level, we need to call the `next` command
     # in syntactically correct way.
     def special_case_next_eval(irb_context)
-      def irb_context.evaluate(line, line_no, *args)
+      def irb_context.evaluate(line, line_no, *args, **kwargs)
         line = "self.next\n" if line == "next\n"
-        super(line, line_no, *args)
+        super(line, line_no, *args, **kwargs)
       end
 
       irb_context

data/lib/break/irb/overrides.rb

@@ -3,16 +3,8 @@
 module Break::IRB
   module Overrides
     def irb
-      return if Break::Session.active?
-
-      Break::Session.start!
-
-      begin
-        session = Break::Session.new(self, frontend: Frontend.new)
-        session.enter
-      ensure
-        Break::Session.stop!
-      end
+      session = Break::Session.new(self, frontend: Frontend.new)
+      session.enter
     end
   end
 end

data/lib/break/pry.rb

@@ -1,18 +1,38 @@
 # frozen_string_literal: true
 
-require "pry"
-require "break"
+begin
+  require "pry"
+  require "break"
 
-require_relative "pry/frontend"
-require_relative "pry/commands"
-require_relative "pry/overrides"
+  require_relative "pry/frontend"
+  require_relative "pry/commands"
+  require_relative "pry/extensions"
 
-Break::Filter.register_internal MethodSource.method(:source_helper).source_location.first.chomp(".rb")
-Break::Filter.register_internal CodeRay.method(:scan).source_location.first.chomp(".rb")
-Break::Filter.register_internal Pry.method(:start).source_location.first.chomp("/pry_class.rb")
-Break::Filter.register_internal "(pry)"
-Break::Filter.register_internal __dir__
+  Break::Filter.register_internal MethodSource.method(:source_helper).source_location.first.chomp(".rb")
+  Break::Filter.register_internal CodeRay.method(:scan).source_location.first.chomp(".rb")
+  Break::Filter.register_internal Pry.method(:start).source_location.first.chomp("/pry_class.rb")
+  Break::Filter.register_internal Forwardable.instance_method(:def_delegator).source_location.first.chomp(".rb")
+  Break::Filter.register_internal "(pry)"
+  Break::Filter.register_internal __dir__
 
-Object.prepend Break::Pry::Overrides
+  Pry.config.hooks.add_hook :before_session, :start_initial_break_session do |_, _, pry|
+    pry.__break_session__ ||= Break::Session.new(pry.current_binding, frontend: Break::Pry::Frontend.new)
+  end
 
-Pry.config.commands.import Break::Pry::Commands
+  Pry.config.commands.import Break::Pry::Commands
+
+  begin
+    require "pry-remote"
+
+    Break::Filter.register_internal binding.method(:remote_pry).source_location.first.chomp('.rb')
+    Break::Filter.register_internal DRb.method(:start_service).source_location.first.chomp('/drb.rb')
+
+    at_exit do
+      Break::Pry.current_remote_server&.teardown
+    end
+  rescue LoadError
+    # Do nothing if we cannot require pry-remote.
+  end
+rescue LoadError
+  # Do nothing if we cannot require pry.
+end

data/lib/break/pry/commands.rb

@@ -15,12 +15,12 @@ module Break::Pry
       BANNER
 
       def process
-        session = Break::Session.new(_pry_.binding_stack.first, frontend: Frontend.new(_pry_))
+        pry = defined?(pry_instance) ? pry_instance : _pry_
+        pry.__break_session__[:pry_instance] = pry
 
-        command = Break::NextCommand.new(session)
+
+        command = Break::NextCommand.new(pry.__break_session__)
         command.execute
-      ensure
-        Break::Session.start!
       end
     end
 
@@ -37,12 +37,11 @@ module Break::Pry
       BANNER
 
       def process
-        session = Break::Session.new(_pry_.binding_stack.first, frontend: Frontend.new(_pry_))
+        pry = defined?(pry_instance) ? pry_instance : _pry_
+        pry.__break_session__[:pry_instance] = pry
 
-        command = Break::StepCommand.new(session)
+        command = Break::StepCommand.new(pry.__break_session__)
         command.execute
-      ensure
-        Break::Session.start!
       end
     end
 
@@ -60,12 +59,11 @@ module Break::Pry
       BANNER
 
       def process
-        session = Break::Session.new(_pry_.binding_stack.first, frontend: Frontend.new(_pry_))
+        pry = defined?(pry_instance) ? pry_instance : _pry_
+        pry.__break_session__[:pry_instance] = pry
 
-        command = Break::UpCommand.new(session)
+        command = Break::UpCommand.new(pry.__break_session__)
         command.execute
-      ensure
-        Break::Session.start!
       end
     end
 
@@ -83,12 +81,11 @@ module Break::Pry
       BANNER
 
       def process
-        session = Break::Session.new(_pry_.binding_stack.first, frontend: Frontend.new(_pry_))
+        pry = defined?(pry_instance) ? pry_instance : _pry_
+        pry.__break_session__[:pry_instance] = pry
 
-        command = Break::DownCommand.new(session)
+        command = Break::DownCommand.new(pry.__break_session__)
         command.execute
-      ensure
-        Break::Session.start!
       end
     end
   end

data/lib/break/pry/extensions.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Break::Pry
+  module PryExtensions
+    attr_accessor :__break_session__
+
+    def initialize(options)
+      super(options)
+
+      @__break_session__ = options[:__break_session__]
+    end
+  end
+end
+
+Pry.prepend Break::Pry::PryExtensions
+
+begin
+  require "pry-remote"
+
+  module Break::Pry
+    class << self
+      attr_accessor :current_remote_server
+    end
+
+    module PryRemoteServerExtensions
+      def initialize(*)
+        Break::Pry.current_remote_server&.teardown
+
+        super
+      end
+
+      def run
+        return if Break::Pry.current_remote_server
+        Break::Pry.current_remote_server = self
+
+        setup
+
+        Pry.start @object, @options.merge(input: client.input_proxy, output: client.output)
+      end
+
+      def teardown
+        super
+      ensure
+        Break::Pry.current_remote_server = nil
+      end
+    end
+  end
+
+  PryRemote::Server.prepend Break::Pry::PryRemoteServerExtensions
+rescue LoadError
+  # Do nothing if we cannot require pry-remote.
+end

data/lib/break/pry/frontend.rb

@@ -2,12 +2,12 @@
 
 module Break::Pry
   class Frontend
-    def initialize(pry)
-      @pry = pry
-    end
-
     def attach(session)
-      @pry = Pry.start(session.context.binding)
+      previous_pry = session[:pry_instance]
+
+      @pry = Pry.start session.context.binding, __break_session__: session,
+                                                input: previous_pry.input,
+                                                output: previous_pry.output
       where
     end
 

data/lib/break/session.rb

@@ -2,26 +2,13 @@
 
 module Break
   class Session
-    class << self
-      def start!
-        Thread.current[:__break_active_session__] = true
-      end
-
-      def stop!
-        Thread.current[:__break_active_session__] = nil
-      end
-
-      def active?
-        Thread.current[:__break_active_session__]
-      end
-    end
-
     attr_reader :contexts
     attr_reader :frontend
 
     def initialize(binding, frontend:)
       @contexts = [Context.new(binding)]
       @frontend = frontend
+      @metadata = {}
     end
 
     def enter
@@ -40,5 +27,13 @@ module Break
       contexts << Context.new(*bindings, depth: depth)
       enter
     end
+
+    def [](key)
+      @metadata[key]
+    end
+
+    def []=(key, value)
+      @metadata[key] = value
+    end
   end
 end

data/lib/break/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Break
-  VERSION = "0.9.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: break
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Genadi Samokovarov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,17 +42,18 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: Experimental debugger in plain Ruby using the TracePoint API
+        version: 12.3.3
+description: Lightweight Ruby debugger written in plain Ruby using the TracePoint
+  API
 email:
 - gsamokovarov@gmail.com
 executables: []
@@ -63,13 +64,12 @@ files:
 - lib/break/binding_ext.rb
 - lib/break/command.rb
 - lib/break/commands.rb
-- lib/break/commands/continue_command.rb
 - lib/break/commands/down_command.rb
-- lib/break/commands/list_command.rb
 - lib/break/commands/next_command.rb
 - lib/break/commands/step_command.rb
 - lib/break/commands/tracepoint_command.rb
 - lib/break/commands/up_command.rb
+- lib/break/commands/where_command.rb
 - lib/break/context.rb
 - lib/break/filter.rb
 - lib/break/irb.rb
@@ -78,8 +78,8 @@ files:
 - lib/break/irb/overrides.rb
 - lib/break/pry.rb
 - lib/break/pry/commands.rb
+- lib/break/pry/extensions.rb
 - lib/break/pry/frontend.rb
-- lib/break/pry/overrides.rb
 - lib/break/session.rb
 - lib/break/testing.rb
 - lib/break/version.rb
@@ -87,7 +87,7 @@ homepage: https://github.com/gsamokovarov/break
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
-summary: Experimental debugger in plain Ruby
+summary: Lightweight Ruby debugger
 test_files: []

data/lib/break/commands/continue_command.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Break
-  class ContinueCommand < Command
-    def execute(*)
-      session.leave
-    end
-  end
-end

data/lib/break/pry/overrides.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Break::Pry
-  # Overrides is a module that is supposed to be prepended into ::Object's
-  # ancestor chain and hook into the #pry method and prevent double break
-  # sessions.
-  module Overrides
-    def pry(*)
-      return if Break::Session.active?
-
-      Break::Session.start!
-
-      begin
-        super
-      ensure
-        Break::Session.stop!
-      end
-    end
-  end
-end