pry-byebug-reloaded 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac5c1a8ef056c4fda6d4517ee478ddbc804b1f1cf1fc85b2cd851bb7ec8696fb
-  data.tar.gz: eed33b1993ad70645eef3676c041022845c71fb2e3d61251a58bde53d3ce4de3
+  metadata.gz: cfffbb2ef748ad7fe06cd24a45ea92c8fa856fcfe721750dc8d04562b68dc7b8
+  data.tar.gz: 4d55be7aae55a7b229afa6ef511a984e7465c3ba6cb0608a0981ed507e8f6bac
 SHA512:
-  metadata.gz: cd49c629b3b8b8fed2583ccfd60f4e0989d951d322e0715de367318cdc1757afb00270477e726b090372962da2922fe3a80a17b9f05076f9a5bb1938b06dbfb3
-  data.tar.gz: 509840deca1bead6f397d8f737eceba6e3f6b3910a6dc7ce780f331fbcb00a605a9244c0a7d857b0b10b52a1618e667b40be8fe6eeea2949a35157c7f91bb678
+  metadata.gz: 30e84211d6818a52fa650c93ae52d487410932e633e45e2f2b75284cca9531f564d4649ed00643a55777a4dbbd4f9e85facae97d451b1520ef9d1de9cce64980
+  data.tar.gz: cfd11763708b7279ec12443d5bb016467f822480a6e8878b83820de5540ebfd7163337a373c40baf0f3edd44b8145753f154832a9ed9827a24d2211a0101313a

data/lib/byebug/processors/pry_remote_processor.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "byebug/core"
+
+module Byebug
+  #
+  # Extends the PryProcessor to make it work with Pry-Remote
+  #
+  class PryRemoteProcessor < PryProcessor
+    def self.start
+      super
+
+      Byebug.current_context.step_out(5, true)
+    end
+
+    def resume_pry
+      new_binding = frame._binding
+
+      run do
+        return unless server
+
+        if defined?(@pry) && @pry
+          @pry.repl(new_binding)
+        else
+          @pry = Pry::REPL.start_without_pry_byebug(target: new_binding,
+                                                    input: input,
+                                                    output: output)
+        end
+      end
+    rescue Errno::ECONNREFUSED
+      nil
+    end
+
+    private
+
+    def input
+      server.client.input_proxy
+    end
+
+    def output
+      server.client.output
+    end
+
+    def server
+      PryByebug.current_remote_server
+    end
+  end
+end

data/lib/pry-byebug/base.rb

@@ -7,7 +7,9 @@ require "pry-byebug/helpers/location"
 #
 module PryByebug
   # Reference to currently running pry-remote server. Used by the processor.
-  attr_accessor :current_remote_server
+  class << self
+    attr_accessor :current_remote_server
+  end
 
   module_function
 

data/lib/pry-byebug/commands/exit_all.rb

@@ -10,6 +10,7 @@ module PryByebug
     def process
       super
     ensure
+      PryByebug.current_remote_server&.teardown
       Byebug.stop if Byebug.stoppable?
     end
   end

data/lib/pry-byebug/commands/finish.rb

@@ -18,6 +18,7 @@ module PryByebug
     BANNER
 
     def process
+      PryByebug.current_remote_server&.teardown
       PryByebug.check_file_context(target)
 
       breakout_navigation :finish

data/lib/pry-byebug/pry_ext.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "byebug/processors/pry_processor"
+require "byebug/processors/pry_remote_processor"
 
 class << Pry::REPL
   alias start_without_pry_byebug start
@@ -8,8 +9,13 @@ class << Pry::REPL
   def start_with_pry_byebug(options = {})
     target = options[:target]
 
-    if target.is_a?(Binding) && PryByebug.file_context?(target)
-      Byebug::PryProcessor.start unless ENV["DISABLE_PRY"]
+    if target.is_a?(Binding) && PryByebug.file_context?(target) && !ENV["DISABLE_PRY"]
+      if run_remote?
+        Byebug::PryRemoteProcessor.start
+        return start_without_pry_byebug(options)
+      end
+
+      Byebug::PryProcessor.start
     else
       # No need for the tracer unless we have a file context to step through
       start_without_pry_byebug(options)
@@ -17,4 +23,8 @@ class << Pry::REPL
   end
 
   alias start start_with_pry_byebug
+
+  def run_remote?
+    PryByebug.current_remote_server
+  end
 end

data/lib/pry-byebug/pry_remote_ext.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "pry-remote"
+require "pry-remote-reloaded"
 
-module PryRemote
+module PryRemoteReloaded
   #
   # Overrides PryRemote::Server
   #
@@ -11,28 +11,27 @@ module PryRemote
     # Override the call to Pry.start to save off current Server, and not
     # teardown the server right after Pry.start finishes.
     #
+    alias original_run run
     def run
       raise("Already running a pry-remote session!") if
         PryByebug.current_remote_server
 
       PryByebug.current_remote_server = self
 
-      setup
-      Pry.start @object, input: client.input_proxy, output: client.output
+      catch(:breakout_nav) { original_run }
     end
 
     #
     # Override to reset our saved global current server session.
     #
-    alias teardown_without_pry_byebug teardown
-    def teardown_with_pry_byebug
-      return if @torn
+    alias original_teardown teardown
+    def teardown
+      original_teardown
 
-      teardown_without_pry_byebug
+      return if @torn
       PryByebug.current_remote_server = nil
       @torn = true
     end
-    alias teardown teardown_with_pry_byebug
   end
 end
 

data/lib/pry-byebug/version.rb

@@ -4,5 +4,5 @@
 # Main container module for Pry-Byebug functionality
 #
 module PryByebug
-  VERSION = "3.10.1"
+  VERSION = "3.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-byebug-reloaded
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - David Rodríguez
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -59,6 +59,7 @@ files:
 - LICENSE
 - README.md
 - lib/byebug/processors/pry_processor.rb
+- lib/byebug/processors/pry_remote_processor.rb
 - lib/pry-byebug.rb
 - lib/pry-byebug/base.rb
 - lib/pry-byebug/cli.rb