pry 0.13.1 → 0.15.2

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/show_doc.rb

@@ -89,6 +89,5 @@ class Pry
     end
 
     Pry::Commands.add_command(Pry::Command::ShowDoc)
-    Pry::Commands.alias_command '?', 'show-doc'
   end
 end

data/lib/pry/commands/show_source.rb

@@ -113,5 +113,6 @@ class Pry
     Pry::Commands.add_command(Pry::Command::ShowSource)
     Pry::Commands.alias_command 'show-method', 'show-source'
     Pry::Commands.alias_command '$', 'show-source'
+    Pry::Commands.alias_command '?', 'show-source -d'
   end
 end

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,15 +88,13 @@ 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
 
       def add_hook
-        hook = [:after_eval, :watch_expression]
+        hook = %i[after_eval watch_expression]
         return if pry_instance.hooks.hook_exists?(*hook)
 
         pry_instance.hooks.add_hook(*hook) do |_, pry_instance|

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,15 +61,15 @@ class Pry
     # @return [Boolean]
     attribute :pager
 
+    # @return [Boolean]
+    attribute :multiline
+
     # @return [Boolean] whether the global ~/.pryrc should be loaded
     attribute :should_load_rc
 
     # @return [Boolean] whether the local ./.pryrc should be loaded
     attribute :should_load_local_rc
 
-    # @return [Boolean]
-    attribute :should_load_plugins
-
     # @return [Boolean] whether to load files specified with the -r flag
     attribute :should_load_requires
 
@@ -156,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',
@@ -170,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,
@@ -196,14 +183,13 @@ class Pry
         output_prefix: '=> ',
         requires: [],
         should_load_requires: true,
-        should_load_plugins: true,
         windows_console_warning: true,
         control_d_handler: Pry::ControlDHandler.method(:default),
         memory_size: 100,
         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,
@@ -290,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
@@ -305,17 +301,14 @@ class Pry
     end
 
     def default_rc_file
-      if (pryrc = Pry::Env['PRYRC'])
-        pryrc
-      elsif (xdg_home = Pry::Env['XDG_CONFIG_HOME'])
-        # See XDG Base Directory Specification at
-        # https://standards.freedesktop.org/basedir-spec/basedir-spec-0.8.html
-        xdg_home + '/pry/pryrc'
-      elsif File.exist?(File.expand_path('~/.pryrc'))
-        '~/.pryrc'
-      else
-        '~/.config/pry/pryrc'
-      end
+      [Pry::Env['PRYRC'],
+       # See XDG Base Directory Specification at
+       # https://specifications.freedesktop.org/basedir-spec/latest/
+       "#{Pry::Env['XDG_CONFIG_HOME']}/pry/pryrc",
+       File.expand_path('~/.pryrc'),
+       File.expand_path('~/.config/pry/pryrc')]
+        .compact
+        .find { |file| File.exist?(file) }
     end
   end
 end

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/core_extensions.rb

@@ -78,7 +78,7 @@ class Object
       # Module.new.class_eval("binding") has different behaviour than CRuby,
       # where this is not needed: class_eval("binding") vs class_eval{binding}.
       # Using a block works around the difference of behaviour on JRuby.
-      # The scope is clear of local variabless. Don't add any.
+      # The scope is clear of local variables. Don't add any.
       #
       # This fixes the following two spec failures, at https://travis-ci.org/pry/pry/jobs/274470002
       # 1) ./spec/pry_spec.rb:360:in `block in (root)'

data/lib/pry/editor.rb

@@ -105,7 +105,7 @@ class Pry
         '--nofork' if blocking
       when /^jedit/
         '-wait' if blocking
-      when /^mate/, /^subl/, /^redcar/
+      when /^mate/, /^subl/, /^redcar/, /^code/
         '-w' if blocking
       end
     end
@@ -121,6 +121,8 @@ class Pry
         "+#{line_number} #{file_name}"
       when /^mate/, /^geany/
         "-l #{line_number} #{file_name}"
+      when /^code/
+        "-g #{file_name}:#{line_number}"
       when /^subl/
         "#{file_name}:#{line_number}"
       when /^uedit32/

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/helpers/documentation_helpers.rb

@@ -17,12 +17,13 @@ class Pry
         last_match_ruby = proc do
           SyntaxHighlighter.highlight(Regexp.last_match(1))
         end
+
         comment.gsub(%r{<code>(?:\s*\n)?(.*?)\s*</code>}m, &last_match_ruby)
           .gsub(%r{<em>(?:\s*\n)?(.*?)\s*</em>}m) { "\e[1m#{Regexp.last_match(1)}\e[0m" }
           .gsub(%r{<i>(?:\s*\n)?(.*?)\s*</i>}m) { "\e[1m#{Regexp.last_match(1)}\e[0m" }
           .gsub(%r{<tt>(?:\s*\n)?(.*?)\s*</tt>}m, &last_match_ruby)
           .gsub(/\B\+(\w+?)\+\B/) { "\e[32m#{Regexp.last_match(1)}\e[0m" }
-          .gsub(/((?:^[ \t]+.+(?:\n+|\Z))+)/, &last_match_ruby)
+          .gsub(/((?:^[ \t]+(?:(?!.+\e\[)).+(?:\n+|\Z))+)/, &last_match_ruby)
           .gsub(/`(?:\s*\n)?([^\e]*?)\s*`/) { "`#{last_match_ruby.call}`" }
       end
 

data/lib/pry/helpers/platform.rb

@@ -28,7 +28,7 @@ class Pry
       def self.windows_ansi?
         return false unless windows?
 
-        !!(defined?(Win32::Console) || Pry::Env['ANSICON'] || mri_2?)
+        !!(defined?(Win32::Console) || Pry::Env['ANSICON'] || mri?)
       end
 
       # @return [Boolean]
@@ -46,11 +46,6 @@ class Pry
         RbConfig::CONFIG['ruby_install_name'] == 'ruby'
       end
 
-      # @return [Boolean]
-      def self.mri_19?
-        mri? && RUBY_VERSION.start_with?('1.9')
-      end
-
       # @return [Boolean]
       def self.mri_2?
         mri? && RUBY_VERSION.start_with?('2')

data/lib/pry/helpers/text.rb

@@ -44,7 +44,7 @@ class Pry
       # @param  [String, #to_s] text
       # @return [String] _text_ stripped of any color codes.
       def strip_color(text)
-        text.to_s.gsub(/(\001)?\e\[.*?(\d)+m(\002)?/, '')
+        text.to_s.gsub(/(\001)?(\e\[(\d[;\d]?)*m)(\002)?/, '')
       end
 
       # Returns _text_ as bold text for use on a terminal.

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
 
@@ -57,8 +60,8 @@ class Pry
     #
     # :pre_constant and :preserved_constant are the CodeRay 0.9.8 and 1.0.0
     # classifications of "true", "false", and "nil".
-    IGNORE_TOKENS = [:space, :content, :string, :method, :ident,
-                     :constant, :pre_constant, :predefined_constant].freeze
+    IGNORE_TOKENS = %i[space content string method ident
+                       constant pre_constant predefined_constant].freeze
 
     # Tokens that indicate the end of a statement (i.e. that, if they appear
     # directly before an "if" indicates that that if applies to the same line,
@@ -66,10 +69,10 @@ class Pry
     #
     # :reserved and :keywords are the CodeRay 0.9.8 and 1.0.0 respectively
     # classifications of "super", "next", "return", etc.
-    STATEMENT_END_TOKENS = IGNORE_TOKENS + [:regexp, :integer, :float,
-                                            :keyword, :delimiter, :reserved,
-                                            :instance_variable,
-                                            :class_variable, :global_variable]
+    STATEMENT_END_TOKENS = IGNORE_TOKENS + %i[regexp integer float
+                                              keyword delimiter reserved
+                                              instance_variable
+                                              class_variable global_variable]
 
     # Collection of tokens that should appear dedented even though they
     # don't affect the surrounding code.
@@ -109,7 +112,8 @@ class Pry
     # reset internal state
     def reset
       @stack = []
-      @indent_level = ''
+      @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)
@@ -270,7 +270,7 @@ class Pry
       end
 
       # FIXME: Add Pry here as well?
-      [:IRB, :SLex, :RubyLex, :RubyToken].each do |module_name|
+      %i[IRB SLex RubyLex RubyToken].each do |module_name|
         next unless Object.const_defined?(module_name)
 
         scanner.call(Object.const_get(module_name))

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
@@ -158,7 +158,7 @@ class Pry
 
         alias_name = all_methods_for(target_self).find do |v|
           location = target_self.method(v).source_location
-          expanded_source_location(location) == renamed_method_source_location
+          location && expanded_source_location(location) == renamed_method_source_location
         end
 
         alias_name && Pry::Method(target_self.method(alias_name))

data/lib/pry/method.rb

@@ -530,8 +530,9 @@ class Pry
       else
         fail_msg = "Cannot locate this method: #{name}."
         if Helpers::Platform.mri?
-          fail_msg += " Invoke the 'gem-install pry-doc' Pry command to get " \
-                      "access to Ruby Core documentation.\n"
+          fail_msg += " Run `gem install pry-doc` to install" \
+                      " Ruby Core documentation," \
+                      " and `require 'pry-doc'` to load it.\n"
         end
         raise CommandError, fail_msg
       end
@@ -563,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

@@ -24,8 +24,6 @@ class Pry
     attr_accessor :last_internal_error
     attr_accessor :config
 
-    def_delegators :@plugin_manager, :plugins, :load_plugins, :locate_plugins
-
     def_delegators(
       :@config, :input, :input=, :output, :output=, :commands,
       :commands=, :print, :print=, :exception_handler, :exception_handler=,
@@ -87,7 +85,7 @@ class Pry
   # Load the local RC file (./.pryrc)
   def self.rc_files_to_load
     files = []
-    files << Pry.config.rc_file if Pry.config.should_load_rc
+    files << Pry.config.rc_file if Pry.config.rc_file && Pry.config.should_load_rc
     files << LOCAL_RC_FILE if Pry.config.should_load_local_rc
     files.map { |file| real_path_to(file) }.compact.uniq
   end
@@ -142,7 +140,6 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc.
     return if @session_finalized
 
     @session_finalized = true
-    load_plugins if Pry.config.should_load_plugins
     load_requires if Pry.config.should_load_requires
     load_history if Pry.config.history_load
     load_traps if Pry.config.should_trap_interrupts
@@ -164,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 " \
@@ -171,6 +170,12 @@ you can add "Pry.config.windows_console_warning = false" to your pryrc.
       return
     end
 
+    unless mutex_available?
+      output.puts "ERROR: Unable to obtain mutex lock."
+      output.puts "This can happen if binding.pry is called from a signal handler"
+      return
+    end
+
     options[:target] = Pry.binding_for(target || toplevel_binding)
     initial_session_setup
     final_session_setup
@@ -212,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`.
   #
@@ -333,9 +338,7 @@ Readline version #{Readline::VERSION} detected - will not auto_resize! correctly
 
   # Basic initialization.
   def self.init
-    @plugin_manager ||= PluginManager.new
     reset_defaults
-    locate_plugins
   end
 
   # Return a `Binding` object for `target` or return `target` if it is
@@ -383,6 +386,13 @@ Readline version #{Readline::VERSION} detected - will not auto_resize! correctly
   ensure
     Thread.current[:pry_critical_section] -= 1
   end
+
+  def self.mutex_available?
+    Mutex.new.synchronize { true }
+  rescue ThreadError
+    false
+  end
+  private_class_method :mutex_available?
 end
 
 Pry.init