pry-shell 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 339b96b3477c3abfe68e09e2112a2c4d59a533466d2d800174fe1d255530e84f
-  data.tar.gz: 47cede13047e2c16cc427f75fe9333600620a6a7703f259fb8e0c378a77b183e
+  metadata.gz: 68f90c4cdfe746f83fe8d18649b1141a901b5ba38d1a200b74556c066dd6fa6f
+  data.tar.gz: a1849f725f15e7f639968d7145c5a48efb72b351118e745b3e804c0b0d37062d
 SHA512:
-  metadata.gz: e9e426725066c6653d8a5c14e5ff2df0ecfb56fcfa0368e96ea6ca7b1fccab3ba42be1b07cb67b4e705f26275e59af59c74a52e0fbf74b2bde6aec895fe4cec8
-  data.tar.gz: 46ec623b15d359d3d108c94697a088cb094bf27ae9885be6177f390baad36f5cd09c9be87561002e78ce43f05563c5aeee210bec24fa03cc044628682677f675
+  metadata.gz: 9e7468ba04ac804e48428f95cf9ac1ffc6301dfef9c28d1b76d83d1e9816b2159f39a512c18a139f1aba8b79ae48929cb7b14d4daf65143e5a87f645e80b1889
+  data.tar.gz: 2f96b7544443dc1f2699d6e6da2e8165243e3d5617bbcc27493fe3d5da9d65c9d86a840f000c3aa2ef277e904aab6b0eba595e11a34f7b5396ad8e712640ccd2

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/
 
 # rspec failure tracking
 .rspec_status

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in pry-shell.gemspec
 gemspec
 
+gem "pry-byebug"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.7"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pry-shell (0.3.0)
+    pry-shell (0.4.0)
       pry (~> 0.13.0)
       tty-markdown
       tty-prompt
@@ -10,6 +10,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    byebug (11.1.3)
     coderay (1.1.3)
     diff-lcs (1.4.4)
     kramdown (2.3.1)
@@ -23,6 +24,9 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
@@ -83,6 +87,7 @@ PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
+  pry-byebug
   pry-shell!
   rake (~> 13.0)
   rspec (~> 3.0)

data/bin/console

@@ -11,6 +11,20 @@ require "pry/shell"
 # require "pry"
 # Pry.start
 
-a = 1
+def foo1
+  binding.pry_shell(with_byebug: true)
 
-binding.pry_shell
+  foo2
+end
+
+def foo2
+  foo3
+end
+
+def foo3
+  5
+end
+
+a = 5 + foo1
+
+puts a

data/lib/pry/shell.rb

@@ -31,6 +31,8 @@ class Pry
       def run
         run_server
         draw_ui
+      rescue TTY::Reader::InputInterrupt, Interrupt
+        exit
       end
 
       def active_shell_options(thread: Thread.current)
@@ -41,6 +43,14 @@ class Pry
         Thread.current[:active_shell_options] = value
       end
 
+      def clear_shell_options!
+        self.active_shell_options = nil
+      end
+
+      def remove_active_connection!
+        active_shell_options&.fetch(:remove_connection)&.call
+      end
+
       def configuration
         @configuration ||= Configuration.new
       end

data/lib/pry/shell/logger.rb

@@ -7,7 +7,7 @@ require "fileutils"
 class Pry
   class Shell
     class Logger
-      LOG_FOLDER = "tmp"
+      LOG_FOLDER = "log"
 
       class << self
         extend Forwardable

data/lib/pry/shell/patches/object.rb

@@ -4,8 +4,8 @@ class Pry
   class Shell
     module Patches
       module Object
-        def pry_shell(host: DEFAULT_HOST, port: DEFAULT_PORT)
-          Session.run(self, host: host, port: port)
+        def pry_shell(host: DEFAULT_HOST, port: DEFAULT_PORT, with_byebug: false)
+          Session.run(self, host: host, port: port, with_byebug: with_byebug)
         end
       end
     end

data/lib/pry/shell/patches/pry_byebug.rb

@@ -1,22 +1,73 @@
 # frozen_string_literal: true
 
-class Pry
-  class Shell
-    module Patches
-      module PryByebug
-        def start_with_pry_byebug(target = nil, options = {})
-          return start_without_pry_byebug(target, options) if Shell.active_shell_options
-
-          super
+begin
+  require "pry-byebug"
+  require "pry-byebug/pry_ext"
+
+  module Byebug
+    class PryShellProcessor < PryProcessor
+      class << self
+        def start
+          Byebug.start
+          Setting[:autolist] = false
+          Context.processor = self
+          Byebug.current_context.step_out(7, true)
+          at_exit { teardown! }
+        end
+
+        private
+
+        def teardown!
+          Pry::Shell.remove_active_connection!
+          Pry::Shell.clear_shell_options!
         end
       end
+
+      def resume_pry
+        run do
+          pry_started? ? start_new_pry_repl : start_new_pry_session
+        end
+      rescue DRb::DRbConnError
+        puts "DRb connection failed!"
+      end
+
+      private
+
+      def pry_started?
+        defined?(@pry) && @pry
+      end
+
+      def start_new_pry_session
+        @pry = Pry.start_without_pry_byebug(frame._binding, Pry::Shell.active_shell_options)
+      end
+
+      def start_new_pry_repl
+        Pry::Shell::Repl.new(@pry, target: frame._binding).start
+      end
     end
   end
-end
 
-begin
-  require "pry-byebug"
-  require "pry-byebug/pry_ext"
+  class Pry
+    class Shell
+      module Patches
+        module PryByebug
+          def start_with_pry_byebug(target = nil, options = {})
+            return start_with_pry_shell(target) if Shell.active_shell_options
+
+            super
+          end
+
+          def start_with_pry_shell(target)
+            if Shell.active_shell_options[:with_byebug]
+              ::Byebug::PryShellProcessor.start
+            else
+              start_without_pry_byebug(target, Shell.active_shell_options)
+            end
+          end
+        end
+      end
+    end
+  end
 
   Pry.singleton_class.prepend(Pry::Shell::Patches::PryByebug)
   Pry.singleton_class.alias_method(:start, :start_with_pry_byebug)

data/lib/pry/shell/session.rb

@@ -13,15 +13,16 @@ class Pry
   class Shell
     class Session
       class << self
-        def run(object, host:, port:)
-          new(object, host, port).run
+        def run(object, host:, port:, with_byebug:)
+          new(object, host, port, with_byebug).run
         end
       end
 
-      def initialize(object, host, port)
+      def initialize(object, host, port, with_byebug)
         @object = object
         @host = host
         @port = port
+        @with_byebug = with_byebug
       end
 
       def run
@@ -31,15 +32,22 @@ class Pry
       rescue DRb::DRbConnError
         puts "DRb connection failed!"
       ensure
-        Shell.active_shell_options = nil
+        # Since we run `Byebug.current_context.step_out` this ensure
+        # block already runs and clears the options which are necessary
+        # to setup the Byebug.
+        # We are clearing this options in `PryShellProcessor` to ensure
+        # they do not leak.
+        Shell.clear_shell_options! unless with_byebug
       end
 
       private
 
-      attr_reader :object, :host, :port
+      attr_reader :object, :host, :port, :with_byebug
 
       def pry_options
         {
+          remove_connection: -> { registry.remove(client) },
+          with_byebug: with_byebug,
           driver: Pry::Shell::Repl,
           pager: false,
           input: client.input,

data/lib/pry/shell/ui/about.rb

@@ -9,7 +9,7 @@ class Pry
           pry-shell version "#{VERSION}"
 
           Pry-shell provides you a standalone shell for accessing multiple `pry` sessions running on different processes.
-          You can switch between sessions by using the "\\h" command.
+          You can switch between sessions by going back to the menu using the "\\m" command.
 
           Written by Mehmet Emin INAC.
         MARKDOWN

data/lib/pry/shell/version.rb

@@ -2,6 +2,6 @@
 
 class Pry
   class Shell
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-shell
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry