pry 0.14.2-java → 0.15.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c806cb1e0347c6396c3b6e2e3fc7252b085693333b773efe798dfe41526a7b8c
-  data.tar.gz: 90b46a979aaac6d01ddf589217baca57bc2d7ce8197c8f27bc22f823eeaffcdd
+  metadata.gz: 0d7510fb7f25427c63713eb5fa7e06a2e6237c61963fce651fd9f0624c49c0a2
+  data.tar.gz: a3956d43c1d5733f4e09362e0e251d3b2182cd4237bd132243d4479dbdf38efd
 SHA512:
-  metadata.gz: a877e6636ba7840c0b433c79d72c8652a7d5b8f7c33e3273bdb78f1eb37eef6979e326d5d0fd31d6e978fb34642daf0d73b6c3d9b6dcbf91c5a8c4791182cf7c
-  data.tar.gz: f4c80ad6f3187823c18e1fff35306fc1e0a0ee4045a06b190f4742c92099b89d7ef5bafcb1c1dd68c8ae09b251a9a9b64bfd33179c2a7778f3122c90d636afa5
+  metadata.gz: be8c495d8f79e3e4b5fb894688e39180bb5c9a32e7b088e98b31c5443ab65605d8a65e407ddbaabdbb202322d29d04d1c802d8f838f6079b83ec9422ca693329
+  data.tar.gz: ce971fc59838f97522e4653772199e46ae7b3ef9b9bacb86e40e8975a6b07652af1b7b3a76c396de2f574903041c86d9c657f847a9f194892378318717da4def

data/CHANGELOG.md

@@ -1,4 +1,48 @@
-### master
+### [v0.15.1](v0.15.1) (December 24, 2024)
+
+#### Bug Fixes
+
+* Restore Pry.config.ls compatibility
+  ([#2335](https://github.com/pry/pry/pull/2335))
+* Avoid breaking reading inputs if Prism is not available
+  ([#2338](https://github.com/pry/pry/pull/2338))
+
+### [v0.15.0][v0.15.0] (November 15, 2024)
+
+#### Features
+
+* Added support for Reline
+  ([#2298](https://github.com/pry/pry/pull/2298))
+* Added support for Ruby 3.3
+  ([#2295](https://github.com/pry/pry/pull/2295))
+* Added Pry::Input::SimpleStdio for dumb terminals when Reline is in use
+  ([#2304](https://github.com/pry/pry/pull/2304))
+* Remove OpenStruct usage
+  ([#2307](https://github.com/pry/pry/pull/2307))
+  ([#2309](https://github.com/pry/pry/pull/2309))
+* Disable coloring of output when NO_COLOR is set.
+  ([#2323])(https://github.com/pry/pry/pull/2323))
+* Add `pry --no-multiline` flag to keep single line prompt.
+  ([#2327](https://github.com/pry/pry/pull/2327))
+
+#### Bug Fixes
+
+* Fix typos on docs and and comments
+  ([#2300](https://github.com/pry/pry/pull/2300))
+  ([#2301](https://github.com/pry/pry/pull/2301))
+* Fix 'calling clear method' on user code when defined in pry context.
+  ([#2291](https://github.com/pry/pry/pull/2291))
+* Fix arguments WatchExpression#add_expression
+  ([#2278](https://github.com/pry/pry/pull/2278))
+
+### Breaking changes
+
+* Remove support for deprecated `Pry.config.prompt = [proc {}, proc {}]`
+  Use Pry::Prompt API instead
+  ([#2308](https://github.com/pry/pry/pull/2308))
+* Remove deprecated `Pry.config.exception_whitelist`.
+  Use `Pry.config.unrescued_exceptions` instead.
+  ([#2326](https://github.com/pry/pry/pull/2326))
 
 ### [v0.14.2][v0.14.2] (January 9, 2023)
 
@@ -977,7 +1021,7 @@ complete CHANGELOG:
 * _pry_ now passed as 3rd parameter to :before_session hook
 * ls colors now configurable via Pry.config.ls.local_var_color = :bright_red etc
 * ls separator configurable via, e.g Pry.config.ls.separator = "  "
-* Pry.view_clip() now only calls inspect on a few immediates, otherwise uses the #<> syntax, which has been truncated further to exclude teh mem address, again related to #245
+* Pry.view_clip() now only calls inspect on a few immediates, otherwise uses the #<> syntax, which has been truncated further to exclude the mem address, again related to #245
 
 ### 0.9.3 (2011/7/27)
 * cat --ex (cats 5 lines above and below line in file where exception was raised)

data/README.md

@@ -81,7 +81,7 @@ Installation
 ### Bundler
 
 ```ruby
-gem 'pry', '~> 0.13.1'
+gem 'pry', '~> 0.15.0'
 ```
 
 ### Manual
@@ -413,18 +413,21 @@ description if the `--help` option is available.
 
 ### Use Pry as your Rails Console
 
-The recommended way to use Pry as your Rails console is to add [the `pry-rails`
-gem](https://github.com/rweng/pry-rails) to your Gemfile. This replaces the
-default console with Pry, in addition to loading the Rails console helpers and
-adding some useful Rails-specific commands.
-
-If you don't want to change your Gemfile, you can still run a Pry console in
-your app's environment using Pry's `-r` flag:
+You can run a Pry console in your app's environment using Pry's `-r` flag:
 
 ```sh
 pry -r ./config/environment
 ```
 
+Or start the rails console (`bin/rails console`) and then type `pry`.
+
+It's also possible to use Pry as your Rails console by adding [the pry-rails
+gem](https://github.com/pry/pry-rails) to your Gemfile. This replaces the
+default console with Pry, in addition to loading the Rails console helpers and
+adding some useful Rails-specific commands.
+
+**Note that `pry-rails` is not currently maintained.**
+
 Also check out the
 [wiki](https://github.com/pry/pry/wiki/Setting-up-Rails-or-Heroku-to-use-Pry)
 for more information about integrating Pry with Rails.

data/lib/pry/class_command.rb

@@ -137,7 +137,7 @@ class Pry
     #     end
     #   end
     #
-    # @example Define the invokation block anywhere you want
+    # @example Define the invocation block anywhere you want
     #   def subcommands(cmd)
     #     cmd.command :download do |opt|
     #       description 'Downloads a content from a server'
@@ -172,7 +172,7 @@ class Pry
 
     # The actual body of your command should go here.
     #
-    # The `opts` mehod can be called to get the options that Pry::Slop has passed,
+    # The `opts` method can be called to get the options that Pry::Slop has passed,
     # and `args` gives the remaining, unparsed arguments.
     #
     # The return value of this method is discarded unless the command was

data/lib/pry/cli.rb

@@ -145,6 +145,10 @@ Pry::CLI.add_options do
     Pry.config.color = false
   end
 
+  on "no-multiline", "Disables multiline (defaults to true with Reline)" do
+    Pry.config.multiline = false
+  end
+
   on :f, "Suppress loading of pryrc" do
     Pry.config.should_load_rc = false
     Pry.config.should_load_local_rc = false

data/lib/pry/code_object.rb

@@ -11,7 +11,7 @@ class Pry
   # object the user wants (applying precedence rules in doing so -- i.e methods
   # get precedence over commands with the same name) and 2. Returning
   # the appropriate object. If the user fails to provide a string
-  # identifer for the object (i.e they pass in `nil` or "") then the
+  # identifier for the object (i.e they pass in `nil` or "") then the
   # object looked up will be the 'current method' or 'current class'
   # associated with the Binding.
   #
@@ -97,7 +97,7 @@ class Pry
       nil
     end
 
-    # when no paramter is given (i.e CodeObject.lookup(nil)), then we
+    # when no parameter is given (i.e CodeObject.lookup(nil)), then we
     # lookup the 'current object' from the binding.
     def empty_lookup
       return nil if str && !str.empty?

data/lib/pry/command.rb

@@ -200,7 +200,7 @@ class Pry
       end
 
       def state
-        Pry::CommandState.default.state_for(match)
+        Pry::CommandState.default.state_for(self)
       end
     end
 

data/lib/pry/command_set.rb

@@ -145,7 +145,7 @@ class Pry
     # Imports all the commands from one or more sets.
     # @param [Array<CommandSet>] sets Command sets, all of the commands of which
     #   will be imported.
-    # @return [Pry::CommandSet] Returns the reciever (a command set).
+    # @return [Pry::CommandSet] Returns the receiver (a command set).
     def import(*sets)
       sets.each do |set|
         @commands.merge! set.to_hash
@@ -157,7 +157,7 @@ class Pry
     # Imports some commands from a set
     # @param [CommandSet] set Set to import commands from
     # @param [Array<String>] matches Commands to import
-    # @return [Pry::CommandSet] Returns the reciever (a command set).
+    # @return [Pry::CommandSet] Returns the receiver (a command set).
     def import_from(set, *matches)
       helper_module.send :include, set.helper_module
       matches.each do |match|

data/lib/pry/command_state.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 class Pry
   # CommandState is a data structure to hold per-command state.
   #
@@ -20,12 +18,19 @@ class Pry
       @command_state = {}
     end
 
-    def state_for(command_name)
-      @command_state[command_name] ||= OpenStruct.new
+    def state_for(command_class)
+      @command_state[command_class] ||= command_struct(command_class)
+    end
+
+    def reset(command_class)
+      @command_state[command_class] = command_struct(command_class)
     end
 
-    def reset(command_name)
-      @command_state[command_name] = OpenStruct.new
+    private
+
+    def command_struct(command_class)
+      Struct.new(:command, *command_class.command_options[:state])
+        .new(command: command_class)
     end
   end
 end

data/lib/pry/commands/amend_line.rb

@@ -76,7 +76,7 @@ class Pry
 
       # Takes two numbers that are 1-indexed, and returns a range (or
       # number) that is 0-indexed. 1-indexed means the first element is
-      # indentified by 1 rather than by 0 (as is the case for Ruby arrays).
+      # identified by 1 rather than by 0 (as is the case for Ruby arrays).
       # @param [Fixnum] start_line_number One-indexed number.
       # @param [Fixnum] end_line_number One-indexed number.
       # @return [Range] The zero-indexed range.

data/lib/pry/commands/cd.rb

@@ -22,6 +22,8 @@ class Pry
         https://github.com/pry/pry/wiki/State-navigation#wiki-Changing_scope
       BANNER
 
+      command_options state: %i[old_stack]
+
       def process
         state.old_stack ||= []
 

data/lib/pry/commands/edit.rb

@@ -22,6 +22,8 @@ class Pry
         https://github.com/pry/pry/wiki/Editor-integration#wiki-Edit_command
       BANNER
 
+      command_options state: %i[dynamical_ex_file]
+
       def options(opt)
         opt.on :e, :ex, "Open the file that raised the most recent exception " \
                         "(_ex_.file)",

data/lib/pry/commands/find_method.rb

@@ -128,7 +128,7 @@ class Pry
           next if klass.autoload?(name)
 
           begin
-            const = klass.const_get(name)
+            const = Pry::Method.singleton_class_of(klass.const_get(name))
           rescue RescuableException # rubocop:disable Lint/HandleExceptions
             # constant loading is an inexact science at the best of times,
             # this often happens when a constant was .autoload? but someone

data/lib/pry/commands/ls/config.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+class Pry
+  class Command
+    class Ls < Pry::ClassCommand
+      class Config
+        extend Forwardable
+
+        DEFAULT_OPTIONS = {
+          heading_color: :bright_blue,
+          public_method_color: :default,
+          private_method_color: :blue,
+          protected_method_color: :blue,
+          method_missing_color: :bright_red,
+          local_var_color: :yellow,
+          pry_var_color: :default,            # e.g. _, pry_instance, _file_
+          instance_var_color: :blue,          # e.g. @foo
+          class_var_color: :bright_blue,      # e.g. @@foo
+          global_var_color: :default,         # e.g. $CODERAY_DEBUG, $eventmachine_library
+          builtin_global_color: :cyan,        # e.g. $stdin, $-w, $PID
+          pseudo_global_color: :cyan,         # e.g. $~, $1..$9, $LAST_MATCH_INFO
+          constant_color: :default,           # e.g. VERSION, ARGF
+          class_constant_color: :blue,        # e.g. Object, Kernel
+          exception_constant_color: :magenta, # e.g. Exception, RuntimeError
+          unloaded_constant_color: :yellow,   # Constant still in .autoload? state
+          separator: "  ",
+          ceiling: [Object, Module, Class]
+        }.freeze
+
+        DEFAULT_OPTIONS.each_key do |key|
+          define_method key do
+            @config[key]
+          end
+
+          define_method "#{key}=" do |value|
+            @config[key] = value
+          end
+        end
+
+        def_delegators :@config, :[], :[]=, :each, :each_pair, :values, :keys, :to_a
+
+        def initialize(config)
+          @config = config
+        end
+
+        def self.default
+          new(DEFAULT_OPTIONS.dup)
+        end
+      end
+    end
+  end
+end

data/lib/pry/commands/ls.rb

@@ -3,27 +3,6 @@
 class Pry
   class Command
     class Ls < Pry::ClassCommand
-      DEFAULT_OPTIONS = {
-        heading_color: :bright_blue,
-        public_method_color: :default,
-        private_method_color: :blue,
-        protected_method_color: :blue,
-        method_missing_color: :bright_red,
-        local_var_color: :yellow,
-        pry_var_color: :default, # e.g. _, pry_instance, _file_
-        instance_var_color: :blue, # e.g. @foo
-        class_var_color: :bright_blue, # e.g. @@foo
-        global_var_color: :default, # e.g. $CODERAY_DEBUG, $eventmachine_library
-        builtin_global_color: :cyan, # e.g. $stdin, $-w, $PID
-        pseudo_global_color: :cyan, # e.g. $~, $1..$9, $LAST_MATCH_INFO
-        constant_color: :default, # e.g. VERSION, ARGF
-        class_constant_color: :blue, # e.g. Object, Kernel
-        exception_constant_color: :magenta, # e.g. Exception, RuntimeError
-        unloaded_constant_color: :yellow, # Any constant that is still in .autoload? state
-        separator: "  ",
-        ceiling: [Object, Module, Class]
-      }.freeze
-
       match 'ls'
       group 'Context'
       description 'Show the list of vars and methods in the current scope.'

data/lib/pry/commands/raise_up.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Pry
-  # N.B. using a regular expresion here so that "raise-up 'foo'" does the right thing.
+  # N.B. using a regular expression here so that "raise-up 'foo'" does the right thing.
   class Command
     class RaiseUp < Pry::ClassCommand
       match(/raise-up(!?\b.*)/)

data/lib/pry/commands/ri.rb

@@ -57,7 +57,7 @@ class Pry
           RDoc::RI.const_set :PryDriver, subclass # hook it up!
         end
 
-        # Spin-up an RI insance.
+        # Spin-up an RI instance.
         ri = RDoc::RI::PryDriver.new(
           pry_instance.pager, use_stdout: true, interactive: false
         )

data/lib/pry/commands/shell_command.rb

@@ -7,7 +7,7 @@ class Pry
       group 'Input and Output'
       description "All text following a '.' is forwarded to the shell."
       command_options listing: '.<shell command>', use_prefix: false,
-                      takes_block: true
+                      takes_block: true, state: %i[old_pwd]
 
       banner <<-'BANNER'
         Usage: .COMMAND_NAME

data/lib/pry/commands/shell_mode.rb

@@ -6,6 +6,7 @@ class Pry
       match 'shell-mode'
       group 'Input and Output'
       description 'Toggle shell mode. Bring in pwd prompt and file completion.'
+      command_options state: %i[disabled prev_prompt]
 
       banner <<-'BANNER'
         Toggle shell mode. Bring in pwd prompt and file completion.

data/lib/pry/commands/watch_expression/expression.rb

@@ -23,7 +23,7 @@ class Pry
 
         # Has the value of the expression changed?
         #
-        # We use the pretty-printed string represenation to detect differences
+        # We use the pretty-printed string representation to detect differences
         # as this avoids problems with dup (causes too many differences) and ==
         # (causes too few)
         def changed?

data/lib/pry/commands/watch_expression.rb

@@ -7,7 +7,7 @@ class Pry
       group 'Context'
       description 'Watch the value of an expression and print a notification ' \
                   'whenever it changes.'
-      command_options use_prefix: false
+      command_options use_prefix: false, state: %i[watch_expressions]
 
       banner <<-'BANNER'
         Usage: watch [EXPRESSION]
@@ -46,7 +46,7 @@ class Pry
           list
         else
           add_hook
-          add_expression(args)
+          add_expression
         end
       end
 
@@ -88,9 +88,7 @@ class Pry
         end
       end
 
-      # TODO: fix arguments.
-      # https://github.com/pry/pry/commit/b031df2f2f5850ee6e9018f33d35f3485a9b0423
-      def add_expression(_arguments)
+      def add_expression
         expressions << Expression.new(pry_instance, target, arg_string)
         output.puts "Watching #{Code.new(arg_string).highlighted}"
       end

data/lib/pry/config.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 class Pry
   # @api private
   class Config
     extend Attributable
 
-    # @return [IO, #readline] he object from which Pry retrieves its lines of
+    # @return [IO, #readline] the object from which Pry retrieves its lines of
     #   input
     attribute :input
 
@@ -26,10 +24,6 @@ class Pry
     # @return [Array] Exception that Pry shouldn't rescue
     attribute :unrescued_exceptions
 
-    # @deprecated
-    # @return [Array] Exception that Pry shouldn't rescue
-    attribute :exception_whitelist
-
     # @return [Integer] The number of lines of context to show before and after
     #   exceptions
     attribute :default_window_size
@@ -67,6 +61,9 @@ class Pry
     # @return [Boolean]
     attribute :pager
 
+    # @return [Boolean]
+    attribute :multiline
+
     # @return [Boolean] whether the global ~/.pryrc should be loaded
     attribute :should_load_rc
 
@@ -153,7 +150,7 @@ class Pry
 
     def initialize
       merge!(
-        input: MemoizedValue.new { lazy_readline },
+        input: MemoizedValue.new { choose_input },
         output: $stdout.tap { |out| out.sync = true },
         commands: Pry::Commands,
         prompt_name: 'pry',
@@ -167,17 +164,10 @@ class Pry
           ::SystemExit, ::SignalException, Pry::TooSafeException
         ],
 
-        exception_whitelist: MemoizedValue.new do
-          output.puts(
-            '[warning] Pry.config.exception_whitelist is deprecated, ' \
-            'please use Pry.config.unrescued_exceptions instead.'
-          )
-          unrescued_exceptions
-        end,
-
         hooks: Pry::Hooks.default,
         pager: true,
         system: Pry::SystemCommandHandler.method(:default),
+        multiline: true,
         color: Pry::Helpers::BaseHelpers.use_ansi_codes?,
         default_window_size: 5,
         editor: Pry::Editor.default,
@@ -199,7 +189,7 @@ class Pry
         extra_sticky_locals: {},
         command_completions: proc { commands.keys },
         file_completions: proc { Dir['.'] },
-        ls: OpenStruct.new(Pry::Command::Ls::DEFAULT_OPTIONS),
+        ls: Pry::Command::Ls::Config.default,
         completer: Pry::InputCompleter,
         history_save: true,
         history_load: true,
@@ -286,7 +276,17 @@ class Pry
 
     private
 
-    def lazy_readline
+    def choose_input
+      input = load_readline
+
+      if Pry::Env['TERM'] == 'dumb' && (defined?(Reline) && input == Reline)
+        input = Pry::Input::SimpleStdio
+      end
+
+      input
+    end
+
+    def load_readline
       require 'readline'
       ::Readline
     rescue LoadError

data/lib/pry/control_d_handler.rb

@@ -19,7 +19,7 @@ class Pry
       else
         # Otherwise, saves current binding stack as old stack and pops last
         # binding out of binding stack (the old stack still has that binding).
-        cd_state = Pry::CommandState.default.state_for('cd')
+        cd_state = Pry::CommandState.default.state_for(Pry::Command::Cd)
         cd_state.old_stack = pry_instance.binding_stack.dup
         pry_instance.binding_stack.pop
       end

data/lib/pry/exception_handler.rb

@@ -30,8 +30,13 @@ class Pry
       end
 
       def exception_text(exception)
-        "#{exception.class}: #{exception.message}\n" \
-        "from #{exception.backtrace.first}\n"
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2')
+          "#{exception.class}: #{exception.message}\n" \
+          "from #{exception.backtrace.first}\n"
+        else
+          "#{exception.class}: #{exception.detailed_message}\n" \
+          "from #{exception.backtrace.first}\n"
+        end
       end
 
       def cause_text(cause)

data/lib/pry/helpers/command_helpers.rb

@@ -70,7 +70,7 @@ class Pry
 
         # Find the longest common whitespace to all indented lines. Ignore lines
         # containing just -- or ++ as these seem to be used by comment authors
-        # as delimeters.
+        # as delimiters.
         scanned_text = text.scan(/^[ \t]*(?!--\n|\+\+\n)(?=[^ \t\n])/)
         margin = scanned_text.inject do |current_margin, next_indent|
           if next_indent.start_with?(current_margin)

data/lib/pry/indent.rb

@@ -17,6 +17,9 @@ class Pry
     # @return [String] String containing the spaces to be inserted before the next line.
     attr_reader :indent_level
 
+    # @return [String] String containing the spaces for the current line.
+    attr_reader :last_indent_level
+
     # @return [Array<String>] The stack of open tokens.
     attr_reader :stack
 
@@ -110,6 +113,7 @@ class Pry
     def reset
       @stack = []
       @indent_level = String.new # rubocop:disable Style/EmptyLiteral
+      @last_indent_level = @indent_level
       @heredoc_queue = []
       @close_heredocs = {}
       @string_start = nil
@@ -164,11 +168,11 @@ class Pry
 
         output += line
 
+        @last_indent_level = prefix
         prefix = new_prefix
       end
 
       @indent_level = prefix
-
       output
     end
 
@@ -281,9 +285,7 @@ class Pry
     # @param [String] string The Ruby to lex
     # @return [Array] An Array of pairs of [token_value, token_type]
     def tokenize(string)
-      tokens = SyntaxHighlighter.tokenize(string)
-      tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens) # Coderay 1.0.0
-      tokens.to_a
+      SyntaxHighlighter.tokenize(string).each_slice(2).to_a
     end
 
     # Update the internal state about what kind of strings are open.

data/lib/pry/input/simple_stdio.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Pry
+  module Input
+    # Readline replacement for low-capability terminals.
+    class SimpleStdio
+      def self.readline(prompt)
+        Pry.config.output.print(prompt)
+        $stdin.gets
+      end
+    end
+  end
+end

data/lib/pry/input_completer.rb

@@ -234,7 +234,7 @@ class Pry
       end.compact
     end
 
-    # build_path seperates the input into two parts: path and input.
+    # build_path separates the input into two parts: path and input.
     # input is the partial string that should be completed
     # path is a proc that takes an input and builds a full path.
     def build_path(input)

data/lib/pry/method/patcher.rb

@@ -43,7 +43,7 @@ class Pry
       #
       # When we're redefining aliased methods we will overwrite the method at the
       # unaliased name (so that super continues to work). By wrapping that code in a
-      # transation we make that not happen, which means that alias_method_chains, etc.
+      # translation we make that not happen, which means that alias_method_chains, etc.
       # continue to work.
       #
       def with_method_transaction
@@ -95,7 +95,7 @@ class Pry
       # Update the source code so that when it has the right owner when eval'd.
       #
       # This (combined with definition_for_owner) is backup for the case that
-      # wrap_for_nesting fails, to ensure that the method will stil be defined in
+      # wrap_for_nesting fails, to ensure that the method will still be defined in
       # the correct place.
       #
       # @param [String] source  The source to wrap

data/lib/pry/method/weird_method_locator.rb

@@ -123,7 +123,7 @@ class Pry
       # know which __FILE__ and __LINE__ the binding is at, we can hope to
       # disambiguate these cases.
       #
-      # This obviously won't work if the source is unavaiable for some reason,
+      # This obviously won't work if the source is unavailable for some reason,
       # or if both methods have the same __FILE__ and __LINE__.
       #
       # @return [Pry::Method, nil] The Pry::Method representing the

data/lib/pry/method.rb

@@ -564,8 +564,7 @@ class Pry
     def method_name_from_first_line(first_ln)
       return nil if first_ln.strip !~ /^def /
 
-      tokens = SyntaxHighlighter.tokenize(first_ln)
-      tokens = tokens.tokens.each_slice(2) if tokens.respond_to?(:tokens)
+      tokens = SyntaxHighlighter.tokenize(first_ln).each_slice(2)
       tokens.each_cons(2) do |t1, t2|
         if t2.last == :method || t2.last == :ident && t1 == [".", :operator]
           return t2.first

data/lib/pry/pry_class.rb

@@ -161,6 +161,8 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc.
 
     options = options.to_hash
 
+    options[:color] = false if Pry::Env['NO_COLOR']
+
     if in_critical_section?
       output.puts "ERROR: Pry started inside Pry."
       output.puts "This can happen if you have a binding.pry inside a #to_s " \
@@ -215,7 +217,7 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc.
   #   The maximum number of chars before clipping occurs.
   #
   # @option options [Boolean] :id (false)
-  #   Boolean to indicate whether or not a hex reprsentation of the object ID
+  #   Boolean to indicate whether or not a hex representation of the object ID
   #   is attached to the return value when the length of inspect is greater than
   #   value of `:max_length`.
   #

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
@@ -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)
 
@@ -179,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?
@@ -192,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
@@ -206,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) &&
+          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`
@@ -227,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)

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.14.2'.freeze
+  VERSION = '0.15.1'.freeze
 end

data/lib/pry/wrapped_module.rb

@@ -286,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

@@ -34,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'
@@ -57,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: java
 authors:
 - John Mair (banisterfiend)
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -116,6 +116,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
@@ -174,6 +175,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
@@ -229,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: A runtime developer console and IRB alternative with powerful introspection