pry 0.12.2 → 0.13.0

data/lib/pry/commands/stat.rb

@@ -1,40 +1,44 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Stat < Pry::ClassCommand
-    match 'stat'
-    group 'Introspection'
-    description 'View method information and set _file_ and _dir_ locals.'
-    command_options shellwords: false
+  class Command
+    class Stat < Pry::ClassCommand
+      match 'stat'
+      group 'Introspection'
+      description 'View method information and set _file_ and _dir_ locals.'
+      command_options shellwords: false
 
-    banner <<-'BANNER'
-        Usage: stat [OPTIONS] [METH]
+      banner <<-'BANNER'
+          Usage: stat [OPTIONS] [METH]
 
-        Show method information for method METH and set _file_ and _dir_ locals.
+          Show method information for method METH and set _file_ and _dir_ locals.
 
-        stat hello_method
-    BANNER
+          stat hello_method
+      BANNER
 
-    def options(opt)
-      method_options(opt)
-    end
+      def options(opt)
+        method_options(opt)
+      end
+
+      def process
+        meth = method_object
+        aliases = meth.aliases
 
-    def process
-      meth = method_object
-      aliases = meth.aliases
-
-      output.puts unindent <<-EOS
-        Method Information:
-        --
-        Name: #{meth.name}
-        Alias#{ "es" if aliases.length > 1 }: #{ aliases.any? ? aliases.join(", ") : "None." }
-        Owner: #{meth.owner ? meth.owner : "Unknown"}
-        Visibility: #{meth.visibility}
-        Type: #{meth.is_a?(::Method) ? "Bound" : "Unbound"}
-        Arity: #{meth.arity}
-        Method Signature: #{meth.signature}
-        Source Location: #{meth.source_location ? meth.source_location.join(":") : "Not found."}
-      EOS
+        output.puts(unindent(<<-OUTPUT))
+          Method Information:
+          --
+          Name: #{meth.name}
+          Alias#{'es' if aliases.length > 1}: #{aliases.any? ? aliases.join(', ') : 'None.'}
+          Owner: #{meth.owner || 'Unknown'}
+          Visibility: #{meth.visibility}
+          Type: #{meth.is_a?(::Method) ? 'Bound' : 'Unbound'}
+          Arity: #{meth.arity}
+          Method Signature: #{meth.signature}
+          Source Location: #{meth.source_location ? meth.source_location.join(':') : 'Not found.'}
+        OUTPUT
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Stat)
+    Pry::Commands.add_command(Pry::Command::Stat)
+  end
 end

data/lib/pry/commands/switch_to.rb

@@ -1,23 +1,29 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::SwitchTo < Pry::ClassCommand
-    match 'switch-to'
-    group 'Navigating Pry'
-    description 'Start a new subsession on a binding in the current stack.'
+  class Command
+    class SwitchTo < Pry::ClassCommand
+      match 'switch-to'
+      group 'Navigating Pry'
+      description 'Start a new subsession on a binding in the current stack.'
 
-    banner <<-'BANNER'
-      Start a new subsession on a binding in the current stack (numbered by nesting).
-    BANNER
+      banner <<-'BANNER'
+        Start a new subsession on a binding in the current stack (numbered by nesting).
+      BANNER
 
-    def process(selection)
-      selection = selection.to_i
+      def process(selection)
+        selection = selection.to_i
 
-      if selection < 0 || selection > _pry_.binding_stack.size - 1
-        raise CommandError, "Invalid binding index #{selection} - use `nesting` command to view valid indices."
-      else
-        Pry.start(_pry_.binding_stack[selection])
+        if selection < 0 || selection > pry_instance.binding_stack.size - 1
+          raise CommandError,
+                "Invalid binding index #{selection} - use `nesting` command " \
+                "to view valid indices."
+        else
+          Pry.start(pry_instance.binding_stack[selection])
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::SwitchTo)
+    Pry::Commands.add_command(Pry::Command::SwitchTo)
+  end
 end

data/lib/pry/commands/toggle_color.rb

@@ -1,24 +1,28 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::ToggleColor < Pry::ClassCommand
-    match 'toggle-color'
-    group 'Misc'
-    description 'Toggle syntax highlighting.'
+  class Command
+    class ToggleColor < Pry::ClassCommand
+      match 'toggle-color'
+      group 'Misc'
+      description 'Toggle syntax highlighting.'
 
-    banner <<-'BANNER'
-      Usage: toggle-color
+      banner <<-'BANNER'
+        Usage: toggle-color
 
-      Toggle syntax highlighting.
-    BANNER
+        Toggle syntax highlighting.
+      BANNER
 
-    def process
-      _pry_.color = color_toggle
-      output.puts "Syntax highlighting #{_pry_.color ? "on" : "off"}"
-    end
+      def process
+        pry_instance.color = color_toggle
+        output.puts "Syntax highlighting #{pry_instance.color ? 'on' : 'off'}"
+      end
 
-    def color_toggle
-      !_pry_.color
-    end
+      def color_toggle
+        !pry_instance.color
+      end
 
-    Pry::Commands.add_command(self)
+      Pry::Commands.add_command(self)
+    end
   end
 end

data/lib/pry/commands/watch_expression.rb

@@ -1,107 +1,110 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::WatchExpression < Pry::ClassCommand
-    require 'pry/commands/watch_expression/expression.rb'
-
-    match 'watch'
-    group 'Context'
-    description 'Watch the value of an expression and print a notification whenever it changes.'
-    command_options use_prefix: false
-
-    banner <<-'BANNER'
-      Usage: watch [EXPRESSION]
-             watch
-             watch --delete [INDEX]
-
-      watch [EXPRESSION] adds an expression to the list of those being watched.
-      It will be re-evaluated every time you hit enter in pry. If its value has
-      changed, the new value will be printed to the console.
-
-      This is useful if you are step-through debugging and want to see how
-      something changes over time.  It's also useful if you're trying to write
-      a method inside pry and want to check that it gives the right answers
-      every time you redefine it.
-
-      watch on its own displays all the currently watched expressions and their
-      values, and watch --delete [INDEX] allows you to delete expressions from
-      the list being watched.
-    BANNER
-
-    def options(opt)
-      opt.on :d, :delete,
-        "Delete the watch expression with the given index. If no index is given; clear all watch expressions.",
-        optional_argument: true, as: Integer
-      opt.on :l, :list,
-        "Show all current watch expressions and their values.  Calling watch with no expressions or options will also show the watch expressions."
-    end
+  class Command
+    class WatchExpression < Pry::ClassCommand
+      match 'watch'
+      group 'Context'
+      description 'Watch the value of an expression and print a notification ' \
+                  'whenever it changes.'
+      command_options use_prefix: false
+
+      banner <<-'BANNER'
+        Usage: watch [EXPRESSION]
+               watch
+               watch --delete [INDEX]
+
+        watch [EXPRESSION] adds an expression to the list of those being watched.
+        It will be re-evaluated every time you hit enter in pry. If its value has
+        changed, the new value will be printed to the console.
+
+        This is useful if you are step-through debugging and want to see how
+        something changes over time.  It's also useful if you're trying to write
+        a method inside pry and want to check that it gives the right answers
+        every time you redefine it.
+
+        watch on its own displays all the currently watched expressions and their
+        values, and watch --delete [INDEX] allows you to delete expressions from
+        the list being watched.
+      BANNER
 
-    def process
-      case
-      when opts.present?(:delete)
-        delete opts[:delete]
-      when opts.present?(:list) || args.empty?
-        list
-      else
-        add_hook
-        add_expression(args)
+      def options(opt)
+        opt.on :d, :delete,
+               "Delete the watch expression with the given index. If no index " \
+               "is given; clear all watch expressions.",
+               optional_argument: true, as: Integer
+        opt.on :l, :list,
+               "Show all current watch expressions and their values. Calling " \
+               "watch with no expressions or options will also show the watch " \
+               "expressions."
       end
-    end
 
-    private
+      def process
+        if opts.present?(:delete)
+          delete opts[:delete]
+        elsif opts.present?(:list) || args.empty?
+          list
+        else
+          add_hook
+          add_expression(args)
+        end
+      end
 
-    def expressions
-      _pry_.config.watch_expressions ||= []
-    end
+      private
 
-    def delete(index)
-      if index
-        output.puts "Deleting watch expression ##{index}: #{expressions[index - 1]}"
-        expressions.delete_at(index - 1)
-      else
-        output.puts "Deleting all watched expressions"
-        expressions.clear
+      def expressions
+        state.watch_expressions ||= []
       end
-    end
 
-    def list
-      if expressions.empty?
-        output.puts "No watched expressions"
-      else
-        _pry_.pager.open do |pager|
-          pager.puts "Listing all watched expressions:"
-          pager.puts ""
-          expressions.each_with_index do |expr, index|
-            pager.print with_line_numbers(expr.to_s, index + 1)
+      def delete(index)
+        if index
+          output.puts "Deleting watch expression ##{index}: #{expressions[index - 1]}"
+          expressions.delete_at(index - 1)
+        else
+          output.puts "Deleting all watched expressions"
+          expressions.clear
+        end
+      end
+
+      def list
+        if expressions.empty?
+          output.puts "No watched expressions"
+        else
+          pry_instance.pager.open do |pager|
+            pager.puts "Listing all watched expressions:"
+            pager.puts ""
+            expressions.each_with_index do |expr, index|
+              pager.print with_line_numbers(expr.to_s, index + 1)
+            end
+            pager.puts ""
           end
-          pager.puts ""
         end
       end
-    end
 
-    def eval_and_print_changed(output)
-      expressions.each do |expr|
-        expr.eval!
-        if expr.changed?
-          output.puts "#{blue "watch"}: #{expr}"
+      def eval_and_print_changed(output)
+        expressions.each do |expr|
+          expr.eval!
+          output.puts "#{blue 'watch'}: #{expr}" if expr.changed?
         end
       end
-    end
 
-    # TODO: fix arguments.
-    # https://github.com/pry/pry/commit/b031df2f2f5850ee6e9018f33d35f3485a9b0423
-    def add_expression(_arguments)
-      expressions << Expression.new(_pry_, target, arg_string)
-      output.puts "Watching #{Code.new(arg_string).highlighted}"
-    end
+      # TODO: fix arguments.
+      # https://github.com/pry/pry/commit/b031df2f2f5850ee6e9018f33d35f3485a9b0423
+      def add_expression(_arguments)
+        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]
+        return if pry_instance.hooks.hook_exists?(*hook)
 
-    def add_hook
-      hook = [:after_eval, :watch_expression]
-      unless _pry_.hooks.hook_exists?(*hook)
-        _pry_.hooks.add_hook(*hook) do |_, _pry_|
-          eval_and_print_changed _pry_.output
+        pry_instance.hooks.add_hook(*hook) do |_, pry_instance|
+          eval_and_print_changed pry_instance.output
         end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::WatchExpression)
+    Pry::Commands.add_command(Pry::Command::WatchExpression)
+  end
 end

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

@@ -1,37 +1,42 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::WatchExpression
-    class Expression
-      attr_reader :target, :source, :value, :previous_value, :_pry_
+  class Command
+    class WatchExpression
+      class Expression
+        attr_reader :target, :source, :value, :previous_value, :pry_instance
 
-      def initialize(_pry_, target, source)
-        @_pry_ = _pry_
-        @target = target
-        @source = Code.new(source).strip
-      end
+        def initialize(pry_instance, target, source)
+          @pry_instance = pry_instance
+          @target = target
+          @source = Code.new(source).strip
+        end
 
-      def eval!
-        @previous_value = value
-        @value = Pry::ColorPrinter.pp(target_eval(target, source), "")
-      end
+        def eval!
+          @previous_value = value
+          @value = Pry::ColorPrinter.pp(target_eval(target, source), ''.dup)
+        end
 
-      def to_s
-        "#{Code.new(source).highlighted.strip} => #{value}"
-      end
+        def to_s
+          "#{Code.new(source).highlighted.strip} => #{value}"
+        end
 
-      # Has the value of the expression changed?
-      #
-      # We use the pretty-printed string represenation to detect differences
-      # as this avoids problems with dup (causes too many differences) and == (causes too few)
-      def changed?
-        (value != previous_value)
-      end
+        # Has the value of the expression changed?
+        #
+        # We use the pretty-printed string represenation to detect differences
+        # as this avoids problems with dup (causes too many differences) and ==
+        # (causes too few)
+        def changed?
+          (value != previous_value)
+        end
 
-      private
+        private
 
-      def target_eval(target, source)
-        target.eval(source)
-      rescue => e
-        e
+        def target_eval(target, source)
+          target.eval(source)
+        rescue StandardError => e
+          e
+        end
       end
     end
   end

data/lib/pry/commands/whereami.rb

@@ -1,197 +1,205 @@
-class Pry
-  class Command::Whereami < Pry::ClassCommand
-    def initialize(*)
-      super
+# frozen_string_literal: true
 
-      @method_code = nil
-    end
+require 'method_source'
 
-    class << self
-      attr_accessor :method_size_cutoff
-    end
+class Pry
+  class Command
+    class Whereami < Pry::ClassCommand
+      def initialize(*)
+        super
 
-    @method_size_cutoff = 30
+        @method_code = nil
+      end
 
-    match 'whereami'
-    description 'Show code surrounding the current context.'
-    group 'Context'
+      class << self
+        attr_accessor :method_size_cutoff
+      end
 
-    banner <<-'BANNER'
-      Usage: whereami [-qn] [LINES]
+      @method_size_cutoff = 30
 
-      Describe the current location. If you use `binding.pry` inside a method then
-      whereami will print out the source for that method.
+      match 'whereami'
+      description 'Show code surrounding the current context.'
+      group 'Context'
 
-      If a number is passed, then LINES lines before and after the current line will be
-      shown instead of the method itself.
+      banner <<-'BANNER'
+        Usage: whereami [-qn] [LINES]
 
-      The `-q` flag can be used to suppress error messages in the case that there's
-      no code to show. This is used by pry in the default before_session hook to show
-      you when you arrive at a `binding.pry`.
+        Describe the current location. If you use `binding.pry` inside a method then
+        whereami will print out the source for that method.
 
-      The `-n` flag can be used to hide line numbers so that code can be copy/pasted
-      effectively.
+        If a number is passed, then LINES lines before and after the current line will be
+        shown instead of the method itself.
 
-      When pry was started on an Object and there is no associated method, whereami
-      will instead output a brief description of the current object.
-    BANNER
+        The `-q` flag can be used to suppress error messages in the case that there's
+        no code to show. This is used by pry in the default before_session hook to show
+        you when you arrive at a `binding.pry`.
 
-    def setup
-      @file = expand_path(target.eval('__FILE__'))
-      @line = target.eval('__LINE__')
-      @method = Pry::Method.from_binding(target)
-    end
+        The `-n` flag can be used to hide line numbers so that code can be copy/pasted
+        effectively.
 
-    def options(opt)
-      opt.on :q, :quiet,             "Don't display anything in case of an error"
-      opt.on :n, :"no-line-numbers", "Do not display line numbers"
-      opt.on :m, :"method", "Show the complete source for the current method."
-      opt.on :c, :"class", "Show the complete source for the current class or module."
-      opt.on :f, :"file", "Show the complete source for the current file."
-    end
+        When pry was started on an Object and there is no associated method, whereami
+        will instead output a brief description of the current object.
+      BANNER
 
-    def code
-      @code ||= if opts.present?(:m)
-                  method_code or raise CommandError, "Cannot find method code."
-                elsif opts.present?(:c)
-                  class_code or raise CommandError, "Cannot find class code."
-                elsif opts.present?(:f)
-                  Pry::Code.from_file(@file)
-                elsif args.any?
-                  code_window
-                else
-                  default_code
-                end
-    end
+      def setup
+        if target.respond_to?(:source_location)
+          file, @line = target.source_location
+          @file = expand_path(file)
+        else
+          @file = expand_path(target.eval('__FILE__'))
+          @line = target.eval('__LINE__')
+        end
+        @method = Pry::Method.from_binding(target)
+      end
 
-    def code?
-      !!code
-    rescue MethodSource::SourceNotFoundError
-      false
-    end
+      def options(opt)
+        opt.on :q, :quiet, "Don't display anything in case of an error"
+        opt.on :n, :"no-line-numbers", "Do not display line numbers"
+        opt.on :m, :method, "Show the complete source for the current method."
+        opt.on :c, :class, "Show the complete source for the current class or module."
+        opt.on :f, :file, "Show the complete source for the current file."
+      end
 
-    def bad_option_combination?
-      [opts.present?(:m), opts.present?(:f),
-       opts.present?(:c), args.any?].count(true) > 1
-    end
+      def code
+        @code ||= if opts.present?(:m)
+                    method_code || raise(CommandError, "Cannot find method code.")
+                  elsif opts.present?(:c)
+                    class_code || raise(CommandError, "Cannot find class code.")
+                  elsif opts.present?(:f)
+                    Pry::Code.from_file(@file)
+                  elsif args.any?
+                    code_window
+                  else
+                    default_code
+                  end
+      end
 
-    def location
-      "#{@file} @ line #{@line} #{@method && @method.name_with_owner}"
-    end
+      def code?
+        !!code
+      rescue MethodSource::SourceNotFoundError
+        false
+      end
 
-    def process
-      if bad_option_combination?
-        raise CommandError, "Only one of -m, -c, -f, and  LINES may be specified."
+      def bad_option_combination?
+        [opts.present?(:m), opts.present?(:f),
+         opts.present?(:c), args.any?].count(true) > 1
       end
 
-      if nothing_to_do?
-        return
-      elsif internal_binding?(target)
-        handle_internal_binding
-        return
+      def location
+        "#{@file}:#{@line} #{@method && @method.name_with_owner}"
       end
 
-      set_file_and_dir_locals(@file)
+      def process
+        if bad_option_combination?
+          raise CommandError, "Only one of -m, -c, -f, and  LINES may be specified."
+        end
 
-      out = "\n#{bold('From:')} #{location}:\n\n" <<
-        code.with_line_numbers(use_line_numbers?).with_marker(marker).highlighted << "\n"
+        return if nothing_to_do?
 
-      _pry_.pager.page out
-    end
+        if internal_binding?(target)
+          handle_internal_binding
+          return
+        end
 
-    private
+        set_file_and_dir_locals(@file)
 
-    def nothing_to_do?
-      opts.quiet? && (internal_binding?(target) || !code?)
-    end
+        pretty_code = code.with_line_numbers(use_line_numbers?)
+          .with_marker(marker)
+          .highlighted
+        pry_instance.pager.page(
+          "\n#{bold('From:')} #{location}:\n\n" + pretty_code + "\n"
+        )
+      end
 
-    def use_line_numbers?
-      !opts.present?(:n)
-    end
+      private
 
-    def marker
-      !opts.present?(:n) && @line
-    end
+      def nothing_to_do?
+        opts.quiet? && (internal_binding?(target) || !code?)
+      end
 
-    def top_level?
-      target_self == Pry.main
-    end
+      def use_line_numbers?
+        !opts.present?(:n)
+      end
 
-    def handle_internal_binding
-      if top_level?
-        output.puts "At the top level."
-      else
-        output.puts "Inside #{Pry.view_clip(target_self)}."
+      def marker
+        !opts.present?(:n) && @line
       end
-    end
 
-    def small_method?
-      @method.source_range.count < self.class.method_size_cutoff
-    end
+      def top_level?
+        target_self == Pry.main
+      end
 
-    def default_code
-      if method_code && small_method?
-        method_code
-      else
-        code_window
+      def handle_internal_binding
+        if top_level?
+          output.puts "At the top level."
+        else
+          output.puts "Inside #{Pry.view_clip(target_self)}."
+        end
       end
-    end
 
-    def code_window
-      Pry::Code.from_file(@file).around(@line, window_size)
-    end
+      def small_method?
+        @method.source_range.count < self.class.method_size_cutoff
+      end
 
-    def method_code
-      return @method_code if @method_code
+      def default_code
+        if method_code && small_method?
+          method_code
+        else
+          code_window
+        end
+      end
 
-      if valid_method?
-        @method_code = Pry::Code.from_method(@method)
+      def code_window
+        Pry::Code.from_file(@file).around(@line, window_size)
       end
-    end
 
-    # This either returns the `target_self`
-    # or it returns the class of `target_self` if `target_self` is not a class.
-    # @return [Pry::WrappedModule]
-    def target_class
-      return Pry::WrappedModule(target_self) if target_self.is_a?(Module)
+      def method_code
+        return @method_code if @method_code
 
-      Pry::WrappedModule(target_self.class)
-    end
+        @method_code = Pry::Code.from_method(@method) if valid_method?
+      end
 
-    def class_code
-      @class_code ||=
-        begin
-          mod = @method ? Pry::WrappedModule(@method.owner) : target_class
-          idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
-          idx && Pry::Code.from_module(mod, idx)
-        end
-    end
+      # This either returns the `target_self`
+      # or it returns the class of `target_self` if `target_self` is not a class.
+      # @return [Pry::WrappedModule]
+      def target_class
+        return Pry::WrappedModule(target_self) if target_self.is_a?(Module)
 
-    def valid_method?
-      @method && @method.source? && expand_path(@method.source_file) == @file &&
-        @method.source_range.include?(@line)
-    end
+        Pry::WrappedModule(target_self.class)
+      end
 
-    def expand_path(f)
-      return if !f
+      def class_code
+        @class_code ||=
+          begin
+            mod = @method ? Pry::WrappedModule(@method.owner) : target_class
+            idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
+            idx && Pry::Code.from_module(mod, idx)
+          end
+      end
 
-      if Pry.eval_path == f
-        f
-      else
-        File.expand_path(f)
+      def valid_method?
+        @method && @method.source? && expand_path(@method.source_file) == @file &&
+          @method.source_range.include?(@line)
       end
-    end
 
-    def window_size
-      if args.empty?
-        _pry_.config.default_window_size
-      else
-        args.first.to_i
+      def expand_path(filename)
+        return unless filename
+        return filename if Pry.eval_path == filename
+
+        File.expand_path(filename)
+      end
+
+      def window_size
+        if args.empty?
+          pry_instance.config.default_window_size
+        else
+          args.first.to_i
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Whereami)
-  Pry::Commands.alias_command '@', 'whereami'
-  Pry::Commands.alias_command(/whereami[!?]+/, 'whereami')
+    Pry::Commands.add_command(Pry::Command::Whereami)
+    Pry::Commands.alias_command '@', 'whereami'
+    Pry::Commands.alias_command(/whereami[!?]+/, 'whereami')
+  end
 end