pry 0.13.1 → 0.15.2

data/lib/pry/pry_instance.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'method_source'
-require 'ostruct'
 
 ##
 # Pry is a powerful alternative to the standard IRB shell for Ruby. It
@@ -20,7 +19,7 @@ require 'ostruct'
 # This will show a list of available commands and their usage. For more
 # information about Pry you can refer to the following resources:
 #
-# * http://pryrepl.org/
+# * https://pry.github.io
 # * https://github.com/pry/pry
 # * the IRC channel, which is #pry on the Freenode network
 #
@@ -93,7 +92,6 @@ class Pry
     @input_ring << nil
     push_initial_binding(target)
     exec_hook(:when_started, target, options, self)
-    @prompt_warn = false
   end
 
   # This is the prompt at the top of the prompt stack.
@@ -388,7 +386,7 @@ class Pry
   # @param [*Object] args The arguments to pass to the hook
   # @return [Object, Exception] The return value of the hook or the exception raised
   #
-  # If executing a hook raises an exception, we log that and then continue sucessfully.
+  # If executing a hook raises an exception, we log that and then continue successfully.
   # To debug such errors, use the global variable $pry_hook_error, which is set as a
   # result.
   def exec_hook(name, *args, &block)
@@ -452,45 +450,17 @@ class Pry
   # @return [String] The prompt.
   def select_prompt
     object = current_binding.eval('self')
-    open_token = @indent.open_delimiters.last || @indent.stack.last
-
-    c = OpenStruct.new(
-      object: object,
-      nesting_level: binding_stack.size - 1,
-      open_token: open_token,
-      session_line: Pry.history.session_line_count + 1,
-      history_line: Pry.history.history_line_count + 1,
-      expr_number: input_ring.count,
-      pry_instance: self,
-      binding_stack: binding_stack,
-      input_ring: input_ring,
-      eval_string: @eval_string,
-      cont: !@eval_string.empty?
-    )
+    nesting_level = binding_stack.size - 1
+    pry_instance = self
 
     Pry.critical_section do
       # If input buffer is empty, then use normal prompt. Otherwise use the wait
       # prompt (indicating multi-line expression).
       if prompt.is_a?(Pry::Prompt)
         prompt_proc = eval_string.empty? ? prompt.wait_proc : prompt.incomplete_proc
-        return prompt_proc.call(c.object, c.nesting_level, c.pry_instance)
-      end
-
-      unless @prompt_warn
-        @prompt_warn = true
-        Kernel.warn(
-          "warning: setting prompt with help of " \
-          "`Pry.config.prompt = [proc {}, proc {}]` is deprecated. " \
-          "Use Pry::Prompt API instead"
-        )
-      end
-
-      # If input buffer is empty then use normal prompt
-      if eval_string.empty?
-        generate_prompt(Array(prompt).first, c)
-      # Otherwise use the wait prompt (indicating multi-line expression)
+        return prompt_proc.call(object, nesting_level, pry_instance)
       else
-        generate_prompt(Array(prompt).last, c)
+        output.puts "ERROR: Use Pry::Prompt API."
       end
     end
   end
@@ -549,7 +519,7 @@ class Pry
   # and a mistake in specifying that exception.
   #
   # (i.e. raise-up RunThymeError.new should not be the same as
-  #  raise-up NameError, "unititialized constant RunThymeError")
+  #  raise-up NameError, "uninitialized constant RunThymeError")
   #
   def raise_up_common(force, *args)
     exception = if args == []
@@ -685,14 +655,6 @@ class Pry
     end
   end
 
-  def generate_prompt(prompt_proc, conf)
-    if prompt_proc.arity == 1
-      prompt_proc.call(conf)
-    else
-      prompt_proc.call(conf.object, conf.nesting_level, conf.pry_instance)
-    end
-  end
-
   # the array that the prompt stack is stored in
   def prompt_stack
     @prompt_stack ||= []

data/lib/pry/repl.rb

@@ -100,7 +100,7 @@ class Pry
       # Return nil for EOF, :no_more_input for error, or :control_c for <Ctrl-C>
       return val unless val.is_a?(String)
 
-      if pry.config.auto_indent
+      if pry.config.auto_indent && !input_multiline?
         original_val = "#{indentation}#{val}"
         indented_val = @indent.indent(val)
 
@@ -141,8 +141,7 @@ class Pry
         retry
 
       # Handle <Ctrl+C> like Bash: empty the current input buffer, but don't
-      # quit.  This is only for MRI 1.9; other versions of Ruby don't let you
-      # send Interrupt from within Readline.
+      # quit.
       rescue Interrupt
         return :control_c
 
@@ -180,7 +179,31 @@ class Pry
           end
         end
 
-        if readline_available?
+        if reline_available?
+          Reline.output_modifier_proc = lambda do |text, _|
+            if pry.color
+              SyntaxHighlighter.highlight(text)
+            else
+              text
+            end
+          end
+
+          if pry.config.auto_indent
+            Reline.auto_indent_proc = lambda do |lines, line_index, _byte_ptr, _newline|
+              if line_index == 0
+                0
+              else
+                pry_indentation = Pry::Indent.new
+                pry_indentation.indent(lines.join("\n"))
+                pry_indentation.last_indent_level.length
+              end
+            end
+          end
+        end
+
+        if input_multiline?
+          input_readmultiline(current_prompt, false)
+        elsif readline_available?
           set_readline_output
           input_readline(current_prompt, false) # false since we'll add it manually
         elsif coolline_available?
@@ -193,12 +216,29 @@ class Pry
       end
     end
 
+    def input_readmultiline(*args)
+      Pry::InputLock.for(:all).interruptible_region do
+        input.readmultiline(*args) do |multiline_input|
+          Pry.commands.find_command(multiline_input) ||
+            (complete_expression?(multiline_input) && !Reline::IOGate.in_pasting?)
+        end
+      end
+    end
+
     def input_readline(*args)
       Pry::InputLock.for(:all).interruptible_region do
         input.readline(*args)
       end
     end
 
+    def input_multiline?
+      !!pry.config.multiline && reline_available?
+    end
+
+    def reline_available?
+      defined?(Reline) && input == Reline
+    end
+
     def readline_available?
       defined?(Readline) && input == Readline
     end
@@ -207,6 +247,20 @@ class Pry
       defined?(Coolline) && input.is_a?(Coolline)
     end
 
+    def prism_available?
+      @prism_available ||= begin
+        # rubocop:disable Lint/SuppressedException
+        begin
+          require 'prism'
+        rescue LoadError
+        end
+        # rubocop:enable Lint/SuppressedException
+
+        defined?(Prism::VERSION) &&
+          Gem::Version.new(Prism::VERSION) >= Gem::Version.new('0.25.0')
+      end
+    end
+
     # If `$stdout` is not a tty, it's probably a pipe.
     # @example
     #   # `piping?` returns `false`
@@ -228,6 +282,21 @@ class Pry
       @readline_output = (Readline.output = Pry.config.output) if piping?
     end
 
+    UNEXPECTED_TOKENS = %i[unexpected_token_ignore lambda_open].freeze
+
+    def complete_expression?(multiline_input)
+      if prism_available?
+        lex = Prism.lex(multiline_input)
+
+        errors = lex.errors
+        return true if errors.empty?
+
+        errors.any? { |error| UNEXPECTED_TOKENS.include?(error.type) }
+      else
+        Pry::Code.complete_expression?(multiline_input)
+      end
+    end
+
     # Calculates correct overhang for current line. Supports vi Readline
     # mode and its indicators such as "(ins)" or "(cmd)".
     #

data/lib/pry/ring.rb

@@ -3,7 +3,7 @@
 class Pry
   # A ring is a thread-safe fixed-capacity array to which you can only add
   # elements. Older entries are overwritten as you add new elements, so that the
-  # ring can never contain more than `max_size` elemens.
+  # ring can never contain more than `max_size` elements.
   #
   # @example
   #   ring = Pry::Ring.new(3)
@@ -56,8 +56,8 @@ class Pry
     #   exist
     def [](index)
       @mutex.synchronize do
-        return @buffer[(count + index) % max_size] if index.is_a?(Integer)
         return @buffer[index] if count <= max_size
+        return @buffer[(count + index) % max_size] if index.is_a?(Integer)
 
         transpose_buffer_tail[index]
       end

data/lib/pry/slop.rb

@@ -73,7 +73,7 @@ class Pry
       # Build a Slop object from a option specification.
       #
       # This allows you to design your options via a simple String rather
-      # than programatically. Do note though that with this method, you're
+      # than programmatically. Do note though that with this method, you're
       # unable to pass any advanced options to the on() method when creating
       # options.
       #

data/lib/pry/syntax_highlighter.rb

@@ -11,7 +11,7 @@ class Pry
     end
 
     def self.tokenize(code, language = :ruby)
-      CodeRay.scan(code, language)
+      CodeRay::Scanners[language].new(code).tokens
     end
 
     def self.keyword_token_color

data/lib/pry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Pry
-  VERSION = '0.13.1'.freeze
+  VERSION = '0.15.2'.freeze
 end

data/lib/pry/warning.rb

@@ -10,16 +10,9 @@ class Pry
     # @param [String] message
     # @return [void]
     def self.warn(message)
-      if Kernel.respond_to?(:caller_locations)
-        location = caller_locations(2..2).first
-        path = location.path
-        lineno = location.lineno
-      else
-        # Ruby 1.9.3 support.
-        frame = caller[1].split(':') # rubocop:disable Performance/Caller
-        path = frame.first
-        lineno = frame[1]
-      end
+      location = caller_locations(2..2).first
+      path = location.path
+      lineno = location.lineno
 
       Kernel.warn("#{path}:#{lineno}: warning: #{message}")
     end

data/lib/pry/wrapped_module/candidate.rb

@@ -20,9 +20,9 @@ class Pry
 
       # Methods to delegate to associated `Pry::WrappedModule
       # instance`.
-      private_delegates = [:lines_for_file, :method_candidates, :yard_docs?, :name]
-      public_delegates = [:wrapped, :module?, :class?, :nonblank_name,
-                          :number_of_candidates]
+      private_delegates = %i[lines_for_file method_candidates yard_docs? name]
+      public_delegates = %i[wrapped module? class? nonblank_name
+                            number_of_candidates]
 
       def_delegators :@wrapper, *public_delegates
       def_private_delegators :@wrapper, *private_delegates
@@ -98,14 +98,15 @@ class Pry
       #   line number is one-indexed.
       def first_line_of_module_definition(file, line)
         searchable_lines = lines_for_file(file)[0..(line - 2)]
-        searchable_lines.rindex { |v| class_regexes.any? { |r| r =~ v } } + 1
+        searchable_lines.rindex { |v| module_definition_first_line?(v) } + 1
       end
 
-      def class_regexes
+      def module_definition_first_line?(line)
         mod_type_string = wrapped.class.to_s.downcase
-        [/(^|=)\s*#{mod_type_string}\s+(?:(?:\w*)::)*?#{wrapped.name.split(/::/).last}/,
-         /^\s*(::)?#{wrapped.name.split(/::/).last}\s*?=\s*?#{wrapped.class}/,
-         /^\s*(::)?#{wrapped.name.split(/::/).last}\.(class|instance)_eval/]
+        wrapped_name_last = wrapped.name.split(/::/).last
+        /(^|=)\s*#{mod_type_string}\s+(?:(?:\w*)::)*?#{wrapped_name_last}/ =~ line ||
+          /^\s*(::)?#{wrapped_name_last}\s*?=\s*?#{wrapped.class}/ =~ line ||
+          /^\s*(::)?#{wrapped_name_last}\.(class|instance)_eval/ =~ line
       end
 
       # This method is used by `Candidate#source_location` as a

data/lib/pry/wrapped_module.rb

@@ -246,19 +246,14 @@ class Pry
       method_candidates.count
     end
 
-    # @note On JRuby 1.9 and higher, in certain conditions, this method chucks
-    #   away its ability to be quick (when there are lots of monkey patches,
-    #   like in Rails). However, it should be efficient enough on other rubies.
-    # @see https://github.com/jruby/jruby/issues/525
-    # @return [Enumerator, Array] on JRuby 1.9 and higher returns Array, on
-    #  other rubies returns Enumerator
+    # @return [Array]
     def candidates
       enum = Enumerator.new do |y|
         (0...number_of_candidates).each do |num|
           y.yield candidate(num)
         end
       end
-      Helpers::Platform.jruby_19? ? enum.to_a : enum
+      enum
     end
 
     # @return [Boolean] Whether YARD docs are available for this module.
@@ -291,7 +286,7 @@ class Pry
     #   highest rank, that is the 'monkey patch' of this module with the
     #   highest number of methods, which contains a source code line that
     #   defines the module. It is considered the 'canonical' definition
-    #   for the module. In the absense of a suitable candidate, the
+    #   for the module. In the absence of a suitable candidate, the
     #   candidate of rank 0 will be returned, or a CommandError raised if
     #   there are no candidates at all.
     def primary_candidate

data/lib/pry.rb

@@ -13,7 +13,6 @@ require 'pry/helpers'
 
 require 'pry/basic_object'
 require 'pry/prompt'
-require 'pry/plugins'
 require 'pry/code_object'
 require 'pry/exceptions'
 require 'pry/hooks'
@@ -35,6 +34,7 @@ require 'pry/env'
 
 Pry::Commands = Pry::CommandSet.new unless defined?(Pry::Commands)
 
+require 'pry/commands/ls/config'
 require 'pry/commands/ls/jruby_hacks'
 require 'pry/commands/ls/methods_helper'
 require 'pry/commands/ls/interrogatable'
@@ -58,6 +58,8 @@ require 'pry/config/memoized_value'
 require 'pry/config/lazy_value'
 require 'pry/config'
 
+require 'pry/input/simple_stdio'
+
 require 'pry/pry_class'
 require 'pry/pry_instance'
 require 'pry/inspector'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.15.2
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 - Conrad Irwin
 - Ryan Fitzgerald
 - Kyrylo Silin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -102,6 +102,7 @@ files:
 - lib/pry/commands/jump_to.rb
 - lib/pry/commands/list_inspectors.rb
 - lib/pry/commands/ls.rb
+- lib/pry/commands/ls/config.rb
 - lib/pry/commands/ls/constants.rb
 - lib/pry/commands/ls/formatter.rb
 - lib/pry/commands/ls/globals.rb
@@ -160,6 +161,7 @@ files:
 - lib/pry/history.rb
 - lib/pry/hooks.rb
 - lib/pry/indent.rb
+- lib/pry/input/simple_stdio.rb
 - lib/pry/input_completer.rb
 - lib/pry/input_lock.rb
 - lib/pry/inspector.rb
@@ -171,7 +173,6 @@ files:
 - lib/pry/object_path.rb
 - lib/pry/output.rb
 - lib/pry/pager.rb
-- lib/pry/plugins.rb
 - lib/pry/prompt.rb
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
@@ -201,7 +202,7 @@ metadata:
   changelog_uri: https://github.com/pry/pry/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/pry/pry
   bug_tracker_uri: https://github.com/pry/pry/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,15 +210,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: A runtime developer console and IRB alternative with powerful introspection
   capabilities.

data/lib/pry/plugins.rb

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-
-class Pry
-  class PluginManager
-    PRY_PLUGIN_PREFIX = /^pry-/.freeze
-
-    # Placeholder when no associated gem found, displays warning
-    class NoPlugin
-      def initialize(name)
-        @name = name
-      end
-
-      def method_missing(*)
-        warn "Warning: The plugin '#{@name}' was not found! (no gem found)"
-        super
-      end
-
-      def respond_to_missing?(*)
-        false
-      end
-    end
-
-    class Plugin
-      attr_accessor :name, :gem_name, :enabled, :spec, :active
-
-      def initialize(name, gem_name, spec, enabled)
-        @name = name
-        @gem_name = gem_name
-        @enabled = enabled
-        @spec = spec
-      end
-
-      # Disable a plugin. (prevents plugin from being loaded, cannot
-      # disable an already activated plugin)
-      def disable!
-        self.enabled = false
-      end
-
-      # Enable a plugin. (does not load it immediately but puts on
-      # 'white list' to be loaded)
-      def enable!
-        self.enabled = true
-      end
-
-      # Load the Command line options defined by this plugin (if they exist)
-      def load_cli_options
-        cli_options_file = File.join(spec.full_gem_path, "lib/#{spec.name}/cli.rb")
-        return unless File.exist?(cli_options_file)
-
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.4.4")
-          cli_options_file = File.realpath(cli_options_file)
-        end
-        require cli_options_file
-      end
-
-      # Activate the plugin (require the gem - enables/loads the
-      # plugin immediately at point of call, even if plugin is
-      # disabled)
-      # Does not reload plugin if it's already active.
-      def activate!
-        # Create the configuration object for the plugin.
-        Pry.config.send("#{gem_name.tr('-', '_')}=", OpenStruct.new)
-
-        begin
-          require gem_name unless active?
-        rescue LoadError => e
-          warn "Found plugin #{gem_name}, but could not require '#{gem_name}'"
-          warn e
-        rescue StandardError => e
-          warn "require '#{gem_name}' # Failed, saying: #{e}"
-        end
-
-        self.active = true
-        self.enabled = true
-      end
-
-      alias active? active
-      alias enabled? enabled
-
-      def supported?
-        pry_version = Gem::Version.new(VERSION)
-        spec.dependencies.each do |dependency|
-          if dependency.name == "pry"
-            return dependency.requirement.satisfied_by?(pry_version)
-          end
-        end
-        true
-      end
-    end
-
-    def initialize
-      @plugins = []
-    end
-
-    # Find all installed Pry plugins and store them in an internal array.
-    def locate_plugins
-      gem_list.each do |gem|
-        next if gem.name !~ PRY_PLUGIN_PREFIX
-
-        plugin_name = gem.name.split('-', 2).last
-        plugin = Plugin.new(plugin_name, gem.name, gem, false)
-        @plugins << plugin.tap(&:enable!) if plugin.supported? && !plugin_located?(plugin)
-      end
-      @plugins
-    end
-
-    # @return [Hash] A hash with all plugin names (minus the 'pry-') as
-    #   keys and Plugin objects as values.
-    def plugins
-      h = Hash.new { |_, key| NoPlugin.new(key) }
-      @plugins.each do |plugin|
-        h[plugin.name] = plugin
-      end
-      h
-    end
-
-    # Require all enabled plugins, disabled plugins are skipped.
-    def load_plugins
-      @plugins.each do |plugin|
-        plugin.activate! if plugin.enabled?
-      end
-    end
-
-    private
-
-    def plugin_located?(plugin)
-      @plugins.any? { |existing| existing.gem_name == plugin.gem_name }
-    end
-
-    def gem_list
-      Gem.refresh
-      return Gem::Specification if Gem::Specification.respond_to?(:each)
-
-      Gem.source_index.find_name('')
-    end
-  end
-end