pry-shell 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9174cd55c1ae7d73d49eca821fa5fedc1b39547c2cfad9437504694c5cca81
-  data.tar.gz: a57cda5282d83b3344277183b1cc3ed2893c413f6d0c18c0f36bf3649c9ef276
+  metadata.gz: 9f78367d80e34ffed27c18d3dfea89c22f3efc65fde39b043ac07628d6715b9c
+  data.tar.gz: 5b0e36dfdefe005810de67b5b41dcf4472b8e71744b325a2bdeab9be7bb42c6f
 SHA512:
-  metadata.gz: adfcbfe796953dccdb68c366722b82f0d8ba5115e7431f7583079c47774006ac88829d2bd8a3cda8a13b53ed0aa6aa50798d88e98bbaa9154c63c0ffe4603f8f
-  data.tar.gz: b1d14c0e9f591f955471979b1d96716021bded61885efb33cf3cb46e1d23346c3f779867366eb42bb3b5ae2b2281cd8c712df7546759ce5bd650dba8e2326dff
+  metadata.gz: d7d03a089b432e1e91c0a4210965d8faca9ef584d06d633fda07c8abace3e671962d38bff45b6d328fc3728075591a08c280659a5094714a66acaf42c5e4bd8e
+  data.tar.gz: 392014b4371beace17450468b5d2000ea1fb48419a5af4dc39c6d9ad346ff91ddf4ff38d20b3a259608463dabe4220d61cf181eaa566f78a2d7cbe3f6fe4c93a

data/.rubocop.yml

@@ -19,3 +19,6 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 120
+
+Layout/SpaceInLambdaLiteral:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pry-shell (0.1.0)
+    pry-shell (0.2.0)
       pry (~> 0.13.0)
       tty-markdown
       tty-prompt

data/lib/pry/shell.rb

@@ -8,10 +8,10 @@ require_relative "shell/registry"
 require_relative "shell/server"
 require_relative "shell/session"
 require_relative "shell/io/base"
+require_relative "shell/io/editor"
 require_relative "shell/io/input"
 require_relative "shell/io/output"
-require_relative "shell/patches/object"
-require_relative "shell/patches/repl"
+require_relative "shell/io/pager"
 require_relative "shell/ui"
 require_relative "shell/ui/base"
 require_relative "shell/ui/about"
@@ -22,7 +22,7 @@ require_relative "shell/ui/session"
 class Pry
   class Shell
     DEFAULT_HOST = "localhost"
-    DEFAULT_PORT = "8787"
+    DEFAULT_PORT = "1881"
 
     class << self
       attr_reader :registry
@@ -32,6 +32,14 @@ class Pry
 
         new(host, port, registry).run
       end
+
+      def active_shell_options(thread: Thread.current)
+        thread[:active_shell_options]
+      end
+
+      def active_shell_options=(value)
+        Thread.current[:active_shell_options] = value
+      end
     end
 
     def initialize(host, port, registry)

data/lib/pry/shell/client.rb

@@ -27,6 +27,14 @@ class Pry
         @output ||= IO::Output.new(self, Pry.config.output)
       end
 
+      def editor
+        @editor ||= proc { |file, line| IO::Editor.open(file, line) }
+      end
+
+      def pager_proxy
+        @pager_proxy ||= IO::Pager::Proxy.new(output)
+      end
+
       def to_s
         "#{process_name} @#{host} - #{full_location}"
       end

data/lib/pry/shell/io/editor.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    module IO
+      class Editor
+        DUMMY_RETURN = "true"
+
+        def self.open(file, line)
+          new(file, line).open && DUMMY_RETURN
+        end
+
+        def initialize(file, line)
+          @file = file
+          @line = line
+        end
+
+        def open
+          File.write(file, proxy_editor)
+        end
+
+        private
+
+        attr_reader :file, :line
+
+        def proxy_editor
+          Pry::Editor.new(Pry.new).edit_tempfile_with_content(content, line)
+        end
+
+        def content
+          File.read(file)
+        end
+      end
+    end
+  end
+end

data/lib/pry/shell/io/input.rb

@@ -13,6 +13,16 @@ class Pry
 
           Command.execute(client, string)
         end
+
+        # Assigns the `completion_proc` given by the
+        # pry instance from the client slide.
+        def completion_proc=(val)
+          object.completion_proc = val if object.respond_to?(:completion_proc=)
+        end
+
+        def completion_proc
+          object.completion_proc if object.respond_to?(:completion_proc)
+        end
       end
     end
   end

data/lib/pry/shell/io/pager.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    module IO
+      class Pager < Pry::Pager
+        class Output < Pry::Output
+          def initialize(output) # rubocop:disable Lint/MissingSuper
+            @output = output
+            @color = Pry.config.color
+          end
+        end
+
+        class Proxy < Base
+          attr_reader :pager
+
+          def initialize(output) # rubocop:disable Lint/MissingSuper
+            output_proxy = Output.new(output)
+            @pager = Pager.new(output_proxy)
+          end
+
+          def page(text)
+            pager.page(text)
+          end
+
+          def open(&block)
+            pager.open(&block)
+          end
+        end
+
+        attr_reader :output
+
+        def initialize(output) # rubocop:disable Lint/MissingSuper
+          @output = output
+        end
+
+        def best_available
+          if !Pry::Pager::SystemPager.available? || Pry::Helpers::Platform.jruby?
+            Pry::Pager::SimplePager.new(output)
+          else
+            Pry::Pager::SystemPager.new(output)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    module Patches
+      module Pager
+        def pager
+          config.pager_proxy || super
+        end
+      end
+    end
+  end
+end
+
+Pry.prepend(Pry::Shell::Patches::Pager)

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

@@ -0,0 +1,24 @@
+# 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
+        end
+      end
+    end
+  end
+end
+
+begin
+  require "pry-byebug"
+  require "pry-byebug/pry_ext"
+
+  Pry.singleton_class.prepend(Pry::Shell::Patches::PryByebug)
+  Pry.singleton_class.alias_method(:start, :start_with_pry_byebug)
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class Pry
+  class Shell
+    module Patches
+      module RackTimeout
+        def initialize(&on_timeout)
+          @on_timeout = -> (thread) { Shell.active_shell_options(thread: thread) || on_timeout || ON_TIMEOUT }
+          @scheduler  = Rack::Timeout::Scheduler.singleton
+        end
+      end
+    end
+  end
+end
+
+begin
+  require "rack-timeout"
+
+  Rack::Timeout::Scheduler::Timeout.prepend(Pry::Shell::Patches::RackTimeout)
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end

data/lib/pry/shell/registry.rb

@@ -7,11 +7,12 @@ class Pry
     class Registry
       include DRb::DRbUndumped
 
-      attr_reader :auto_connect, :clients, :current
+      attr_reader :auto_connect, :clients, :current, :mutex
 
       def initialize(auto_connect)
         @auto_connect = auto_connect
         @clients = {}
+        @mutex = Mutex.new
       end
 
       def register(id:, name:, host:, location:)
@@ -26,10 +27,14 @@ class Pry
       def connect_to(client)
         # This thread is necessary because `UI::Session.draw!`
         # puts the main thread into sleep!
-        Thread.start do
-          UI::Session.draw!
+        mutex.synchronize do
+          return if current
 
-          @current = client
+          Thread.start do
+            UI::Session.draw!
+
+            @current = client
+          end
         end
       end
 

data/lib/pry/shell/repl.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "pry"
+
+class Pry
+  class Shell
+    class Repl < Pry::REPL
+      def read_line(current_prompt)
+        handle_read_errors do
+          setup_auto_completion
+          read_command(current_prompt)
+        end
+      end
+
+      private
+
+      def setup_auto_completion
+        if coolline_available?
+          input.completion_proc = proc do |cool|
+            completions = @pry.complete cool.completed_word
+            completions.compact
+          end
+        elsif input.respond_to? :completion_proc=
+          input.completion_proc = proc do |inp|
+            @pry.complete inp
+          end
+        end
+      end
+
+      def read_command(current_prompt)
+        if readline_available?
+          set_readline_output
+          input_readline(current_prompt, false) # false since we'll add it manually
+        elsif coolline_available?
+          input_readline(current_prompt)
+        else
+          input_readline(current_prompt)
+        end
+      end
+    end
+  end
+end

data/lib/pry/shell/session.rb

@@ -3,6 +3,12 @@
 require "socket"
 require "securerandom"
 
+require_relative "patches/object"
+require_relative "patches/pager"
+require_relative "patches/pry_byebug"
+require_relative "patches/rack_timeout"
+require_relative "repl"
+
 class Pry
   class Shell
     class Session
@@ -19,17 +25,30 @@ class Pry
       end
 
       def run
-        setup
+        Shell.active_shell_options = pry_options
 
-        Pry.start(object)
+        Pry.start(object, pry_options)
       rescue DRb::DRbConnError
         puts "DRb connection failed!"
+      ensure
+        Shell.active_shell_options = nil
       end
 
       private
 
       attr_reader :object, :host, :port
 
+      def pry_options
+        {
+          driver: Pry::Shell::Repl,
+          pager: false,
+          input: client.input,
+          output: client.output,
+          editor: client.editor,
+          pager_proxy: client.pager_proxy # This is our own config
+        }
+      end
+
       def client
         @client ||= registry.register(id: id, **attributes)
       end
@@ -52,11 +71,6 @@ class Pry
       def uri
         "druby://#{host}:#{port}"
       end
-
-      def setup
-        Pry.config.input = client.input
-        Pry.config.output = client.output
-      end
     end
   end
 end

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

@@ -6,10 +6,10 @@ class Pry
       class About < Base
         HEADER = "PRY-SHELL About"
         CONTENT = <<~MARKDOWN
-          pry-shell version `0.0.1`
+          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 XXX command.
+          You can switch between sessions by using the "\\h" command.
 
           Written by Mehmet Emin INAC.
         MARKDOWN

data/lib/pry/shell/version.rb

@@ -2,6 +2,6 @@
 
 class Pry
   class Shell
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mehmet Emin INAC
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -76,12 +76,17 @@ files:
 - lib/pry/shell/client.rb
 - lib/pry/shell/command.rb
 - lib/pry/shell/io/base.rb
+- lib/pry/shell/io/editor.rb
 - lib/pry/shell/io/input.rb
 - lib/pry/shell/io/output.rb
+- lib/pry/shell/io/pager.rb
 - lib/pry/shell/logger.rb
 - lib/pry/shell/patches/object.rb
-- lib/pry/shell/patches/repl.rb
+- lib/pry/shell/patches/pager.rb
+- lib/pry/shell/patches/pry_byebug.rb
+- lib/pry/shell/patches/rack_timeout.rb
 - lib/pry/shell/registry.rb
+- lib/pry/shell/repl.rb
 - lib/pry/shell/server.rb
 - lib/pry/shell/session.rb
 - lib/pry/shell/ui.rb

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

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "pry"
-
-class Pry
-  class Shell
-    module Patches
-      module Repl
-        def read_line(current_prompt)
-          handle_read_errors do
-            setup_auto_completion
-            read_command(current_prompt)
-          end
-        end
-
-        private
-
-        def setup_auto_completion
-          if coolline_available?
-            input.completion_proc = proc do |cool|
-              completions = @pry.complete cool.completed_word
-              completions.compact
-            end
-          elsif input.respond_to? :completion_proc=
-            input.completion_proc = proc do |inp|
-              @pry.complete inp
-            end
-          end
-        end
-
-        def read_command(current_prompt)
-          if readline_available?
-            set_readline_output
-            input_readline(current_prompt, false) # false since we'll add it manually
-          elsif coolline_available?
-            input_readline(current_prompt)
-          else
-            input_readline(current_prompt)
-          end
-        end
-      end
-    end
-  end
-end
-
-Pry::REPL.prepend(Pry::Shell::Patches::Repl)