pry 0.9.12.2 → 0.14.2

data/lib/pry/commands/code_collector.rb

@@ -1,164 +1,181 @@
-class Pry
-  class Command::CodeCollector
-    include Helpers::CommandHelpers
-
-    attr_accessor :args
-    attr_accessor :opts
-    attr_accessor :_pry_
+# frozen_string_literal: true
 
-    # The name of the explicitly given file (if any).
-    attr_accessor :file
+class Pry
+  class Command
+    class CodeCollector
+      include Helpers::CommandHelpers
 
-    class << self
-      attr_accessor :input_expression_ranges
-      attr_accessor :output_result_ranges
-    end
+      attr_reader :args
+      attr_reader :opts
+      attr_reader :pry_instance
 
-    @input_expression_ranges = []
-    @output_result_ranges = []
+      # The name of the explicitly given file (if any).
+      attr_accessor :file
 
-    def initialize(args, opts, _pry_)
-      @args = args
-      @opts = opts
-      @_pry_ = _pry_
-    end
+      class << self
+        attr_accessor :input_expression_ranges
+        attr_accessor :output_result_ranges
+      end
 
-    # Add the `--lines`, `-o`, `-i`, `-s`, `-d` options.
-    def self.inject_options(opt)
       @input_expression_ranges = []
       @output_result_ranges = []
 
-      opt.on :l, :lines, "Restrict to a subset of lines. Takes a line number or range",
-                         :optional_argument => true, :as => Range, :default => 1..-1
-      opt.on :o, :out,   "Select lines from Pry's output result history. Takes an index or range",
-      :optional_argument => true, :as => Range, :default => -5..-1 do |r|
-        output_result_ranges << (r || (-5..-1))
+      def initialize(args, opts, pry_instance)
+        @args = args
+        @opts = opts
+        @pry_instance = pry_instance
       end
-      opt.on :i, :in,    "Select lines from Pry's input expression history. Takes an index or range",
-      :optional_argument => true, :as => Range, :default => -5..-1 do |r|
-        input_expression_ranges << (r || (-5..-1))
+
+      # Add the `--lines`, `-o`, `-i`, `-s`, `-d` options.
+      def self.inject_options(opt)
+        @input_expression_ranges = []
+        @output_result_ranges = []
+
+        opt.on :l, :lines, "Restrict to a subset of lines. Takes a line number " \
+                           "or range",
+               optional_argument: true, as: Range, default: 1..-1
+        opt.on :o, :out, "Select lines from Pry's output result history. " \
+                         "Takes an index or range",
+               optional_argument: true, as: Range, default: -5..-1 do |r|
+          output_result_ranges << (r || (-5..-1))
+        end
+        opt.on :i, :in, "Select lines from Pry's input expression history. " \
+                        "Takes an index or range",
+               optional_argument: true, as: Range, default: -5..-1 do |r|
+          input_expression_ranges << (r || (-5..-1))
+        end
+        opt.on :s, :super, "Select the 'super' method. Can be repeated to " \
+                           "traverse the ancestors",
+               as: :count
+        opt.on :d, :doc, "Select lines from the code object's documentation"
       end
-      opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors",
-                         :as => :count
-      opt.on :d, :doc,   "Select lines from the code object's documentation"
-    end
 
-    # The content (i.e code/docs) for the selected object.
-    # If the user provided a bare code object, it returns the source.
-    # If the user provided the `-i` or `-o` switches, it returns the
-    # selected input/output lines joined as a string. If the user used
-    # `-d CODE_OBJECT` it returns the docs for that code object.
-    #
-    # @return [String]
-    def content
-      return @content if @content
-      raise CommandError, "Only one of --out, --in, --doc and CODE_OBJECT may be specified." if bad_option_combination?
-
-      content = case
-                when opts.present?(:o)
-                  pry_output_content
-                when opts.present?(:i)
-                  pry_input_content
-                when opts.present?(:d)
-                  code_object_doc
-                else
-                  code_object_source_or_file
-                end
-
-      @content ||= restrict_to_lines(content, line_range)
-    end
+      # The content (i.e code/docs) for the selected object.
+      # If the user provided a bare code object, it returns the source.
+      # If the user provided the `-i` or `-o` switches, it returns the
+      # selected input/output lines joined as a string. If the user used
+      # `-d CODE_OBJECT` it returns the docs for that code object.
+      #
+      # @return [String]
+      def content
+        @content ||=
+          begin
+            if bad_option_combination?
+              raise CommandError,
+                    "Only one of --out, --in, --doc and CODE_OBJECT may " \
+                    "be specified."
+            end
+
+            content = if opts.present?(:o)
+                        pry_output_content
+                      elsif opts.present?(:i)
+                        pry_input_content
+                      elsif opts.present?(:d)
+                        code_object_doc
+                      else
+                        code_object_source_or_file
+                      end
+
+            restrict_to_lines(content, line_range)
+          end
+      end
 
-    # The code object
-    #
-    # @return [Pry::WrappedModule, Pry::Method, Pry::Command]
-    def code_object
-      Pry::CodeObject.lookup(obj_name, _pry_,  :super =>  opts[:super])
-    end
+      # The code object
+      #
+      # @return [Pry::WrappedModule, Pry::Method, Pry::Command]
+      def code_object
+        Pry::CodeObject.lookup(obj_name, pry_instance, super: opts[:super])
+      end
 
-    # Given a string and a range, return the `range` lines of that
-    # string.
-    #
-    # @param [String] content
-    # @param [Range, Fixnum] range
-    # @return [String] The string restricted to the given range
-    def restrict_to_lines(content, range)
-      Array(content.lines.to_a[range]).join
-    end
+      # Given a string and a range, return the `range` lines of that
+      # string.
+      #
+      # @param [String] content
+      # @param [Range, Fixnum] range
+      # @return [String] The string restricted to the given range
+      def restrict_to_lines(content, range)
+        Array(content.lines.to_a[range]).join
+      end
 
-    # The selected `_pry_.output_array` as a string, as specified by
-    # the `-o` switch.
-    #
-    # @return [String]
-    def pry_output_content
-      pry_array_content_as_string(_pry_.output_array, self.class.output_result_ranges) do |v|
-        Pry.config.gist.inspecter.call(v)
+      # The selected `pry_instance.output_ring` as a string, as specified by
+      # the `-o` switch.
+      #
+      # @return [String]
+      def pry_output_content
+        pry_array_content_as_string(
+          pry_instance.output_ring,
+          self.class.output_result_ranges,
+          &:pretty_inspect
+        )
       end
-    end
 
-    # The selected `_pry_.input_array` as a string, as specified by
-    # the `-i` switch.
-    #
-    # @return [String]
-    def pry_input_content
-      pry_array_content_as_string(_pry_.input_array, self.class.input_expression_ranges) { |v| v }
-    end
+      # The selected `pry_instance.input_ring` as a string, as specified by
+      # the `-i` switch.
+      #
+      # @return [String]
+      def pry_input_content
+        pry_array_content_as_string(
+          pry_instance.input_ring, self.class.input_expression_ranges
+        ) { |v| v }
+      end
 
-    # The line range passed to `--lines`, converted to a 0-indexed range.
-    def line_range
-      opts.present?(:lines) ? one_index_range_or_number(opts[:lines]) : 0..-1
-    end
+      # The line range passed to `--lines`, converted to a 0-indexed range.
+      def line_range
+        opts.present?(:lines) ? one_index_range_or_number(opts[:lines]) : 0..-1
+      end
 
-    # Name of the object argument
-    def obj_name
-      @obj_name ||= args.empty? ? "" : args.join(" ")
-    end
+      # Name of the object argument
+      def obj_name
+        @obj_name ||= args.empty? ? "" : args.join(" ")
+      end
 
-    private
+      private
 
-    def bad_option_combination?
-      [opts.present?(:in), opts.present?(:out),
-       !args.empty?].count(true) > 1
-    end
+      def bad_option_combination?
+        [opts.present?(:in), opts.present?(:out),
+         !args.empty?].count(true) > 1
+      end
+
+      def pry_array_content_as_string(array, ranges)
+        all = ''
+        ranges.each do |range|
+          if convert_to_range(range).first == 0
+            raise CommandError, "Minimum value for range is 1, not 0."
+          end
 
-    def pry_array_content_as_string(array, ranges, &block)
-      all = ''
-      ranges.each do |range|
-        raise CommandError, "Minimum value for range is 1, not 0." if convert_to_range(range).first == 0
+          ranged_array = Array(array[range]) || []
+          ranged_array.compact.each { |v| all += yield(v) }
+        end
 
-        ranged_array = Array(array[range]) || []
-        ranged_array.compact.each { |v| all << block.call(v) }
+        all
       end
 
-      all
-    end
+      def code_object_doc
+        (code_object && code_object.doc) || could_not_locate(obj_name)
+      end
 
-    def code_object_doc
-      (code_object && code_object.doc) or could_not_locate(obj_name)
-    end
+      def code_object_source_or_file
+        (code_object && code_object.source) || file_content
+      end
 
-    def code_object_source_or_file
-      (code_object && code_object.source) || file_content
-    end
+      def file_content
+        if File.exist?(obj_name)
+          # Set the file accessor.
+          self.file = obj_name
+          File.read(obj_name)
+        else
+          could_not_locate(obj_name)
+        end
+      end
 
-    def file_content
-      if File.exists?(obj_name)
-        # Set the file accessor.
-        self.file = obj_name
-        File.read(obj_name)
-      else
-        could_not_locate(obj_name)
+      def could_not_locate(name)
+        raise CommandError, "Cannot locate: #{name}!"
       end
-    end
 
-    def could_not_locate(name)
-      raise CommandError, "Cannot locate: #{name}!"
-    end
+      def convert_to_range(range)
+        return range if range.is_a?(Range)
 
-    def convert_to_range(n)
-      if !n.is_a?(Range)
-        (n..n)
-      else
-        n
+        (range..range)
       end
     end
   end

data/lib/pry/commands/disable_pry.rb

@@ -1,27 +1,31 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::DisablePry < Pry::ClassCommand
-    match 'disable-pry'
-    group 'Navigating Pry'
-    description 'Stops all future calls to pry and exits the current session.'
+  class Command
+    class DisablePry < Pry::ClassCommand
+      match 'disable-pry'
+      group 'Navigating Pry'
+      description 'Stops all future calls to pry and exits the current session.'
 
-    banner <<-'BANNER'
-      Usage: disable-pry
+      banner <<-'BANNER'
+        Usage: disable-pry
 
-      After this command is run any further calls to pry will immediately return `nil`
-      without interrupting the flow of your program. This is particularly useful when
-      you've debugged the problem you were having, and now wish the program to run to
-      the end.
+        After this command is run any further calls to pry will immediately return `nil`
+        without interrupting the flow of your program. This is particularly useful when
+        you've debugged the problem you were having, and now wish the program to run to
+        the end.
 
-      As alternatives, consider using `exit!` to force the current Ruby process
-      to quit immediately; or using `edit-method -p` to remove the `binding.pry`
-      from the code.
-    BANNER
+        As alternatives, consider using `exit!` to force the current Ruby process
+        to quit immediately; or using `edit -p` to remove the `binding.pry`
+        from the code.
+      BANNER
 
-    def process
-      ENV['DISABLE_PRY'] = 'true'
-      _pry_.run_command "exit"
+      def process
+        ENV['DISABLE_PRY'] = 'true'
+        pry_instance.run_command "exit"
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::DisablePry)
+    Pry::Commands.add_command(Pry::Command::DisablePry)
+  end
 end

data/lib/pry/commands/easter_eggs.rb

@@ -1,26 +1,14 @@
+# frozen_string_literal: true
+
 class Pry
   Pry::Commands.instance_eval do
-    command "nyan-cat", "", :requires_gem => ["nyancat"] do
-      run ".nyancat"
-    end
-
-    command(/!s\/(.*?)\/(.*?)/, "") do |source, dest|
+    command(%r{!s/(.*?)/(.*?)}, "") do |source, dest|
       eval_string.gsub!(/#{source}/) { dest }
       run "show-input"
     end
 
-    command "get-naked", "" do
-      text = %{
-  --
-  We dont have to take our clothes off to have a good time.
-  We could dance & party all night And drink some cherry wine.
-  -- Jermaine Stewart }
-      output.puts text
-      text
-    end
-
     command "east-coker", "" do
-      text = %{
+      txt = %(
   --
   Now the light falls
   Across the open field, leaving the deep lane
@@ -33,13 +21,13 @@ class Pry
   The dahlias sleep in the empty silence.
   Wait for the early owl.
                 -- T.S Eliot
-          }
-      output.puts text
-      text
+          )
+      output.puts txt
+      txt
     end
 
     command "cohen-poem", "" do
-      text = %{
+      txt = %(
   --
   When this American woman,
   whose thighs are bound in casual red cloth,
@@ -56,9 +44,9 @@ class Pry
   that if you turn your head
   they are lost for hours.
                 -- Leonard Cohen
-              }
-      output.puts text
-      text
+              )
+      output.puts txt
+      txt
     end
 
     command "pessoa-poem", "" do
@@ -79,34 +67,35 @@ class Pry
   O abstract hunger for things, impotent libido for moments,
   Intellectual orgy of feeling life!
                 -- Fernando Pessoa
-TEXT
+      TEXT
     end
 
     command "test-ansi", "" do
-      prev_color = Pry.color
-      Pry.color = true
+      prev_color = pry_instance.config.color
+      pry_instance.config.color = true
 
-      picture = unindent <<-'EOS'.gsub(/[[:alpha:]!]/) { |s| text.red(s) }
+      picture = unindent <<-'OUTPUT'.gsub(/[[:alpha:]!]/) { |s| red(s) }
          ____      _______________________
         /    \    |  A         W     G    |
        / O  O \   |   N    I    O   N !   |
       |        |  |    S    S    R I   !  |
        \ \__/ / __|     I         K     ! |
         \____/   \________________________|
-      EOS
+      OUTPUT
 
-      if windows_ansi?
-        move_up = proc { |n| "\e[#{n}F" }
-      else
-        move_up = proc { |n| "\e[#{n}A\e[0G" }
-      end
+      move_up =
+        if Helpers::Platform.windows_ansi?
+          proc { |n| "\e[#{n}F" }
+        else
+          proc { |n| "\e[#{n}A\e[0G" }
+        end
 
       output.puts "\n" * 6
       output.puts picture.lines.map(&:chomp).reverse.join(move_up[1])
       output.puts "\n" * 6
       output.puts "** ENV['TERM'] is #{ENV['TERM']} **\n\n"
 
-      Pry.color = prev_color
+      pry_instance.config.color = prev_color
     end
   end
 end

data/lib/pry/commands/edit/exception_patcher.rb

@@ -1,24 +1,28 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Edit
-    class ExceptionPatcher
-      attr_accessor :_pry_
-      attr_accessor :state
-      attr_accessor :file_and_line
+  class Command
+    class Edit
+      class ExceptionPatcher
+        attr_accessor :pry_instance
+        attr_accessor :state
+        attr_accessor :file_and_line
 
-      def initialize(_pry_, state, exception_file_and_line)
-        @_pry_ = _pry_
-        @state = state
-        @file_and_line = exception_file_and_line
-      end
+        def initialize(pry_instance, state, exception_file_and_line)
+          @pry_instance = pry_instance
+          @state = state
+          @file_and_line = exception_file_and_line
+        end
 
-      # perform the patch
-      def perform_patch
-        file_name, line = file_and_line
-        lines = state.dynamical_ex_file || File.read(file_name)
+        # perform the patch
+        def perform_patch
+          file_name, = file_and_line
+          lines = state.dynamical_ex_file || File.read(file_name)
 
-        source = Pry::Editor.edit_tempfile_with_content(lines)
-        _pry_.evaluate_ruby source
-        state.dynamical_ex_file = source.split("\n")
+          source = Pry::Editor.new(pry_instance).edit_tempfile_with_content(lines)
+          pry_instance.evaluate_ruby source
+          state.dynamical_ex_file = source.split("\n")
+        end
       end
     end
   end

data/lib/pry/commands/edit/file_and_line_locator.rb

@@ -1,36 +1,45 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Edit
-    module FileAndLineLocator
-      class << self
-        def from_binding(target)
-          [target.eval("__FILE__"), target.eval("__LINE__")]
-        end
+  class Command
+    class Edit
+      module FileAndLineLocator
+        class << self
+          def from_binding(target)
+            if target.respond_to?(:source_location)
+              target.source_location
+            else
+              target.eval("[__FILE__, __LINE__]")
+            end
+          end
+
+          def from_code_object(code_object, filename_argument)
+            unless File.exist?(code_object.source_file.to_s)
+              raise CommandError, "Cannot find a file for #{filename_argument}!"
+            end
 
-        def from_code_object(code_object, filename_argument)
-          if File.exists?(code_object.source_file.to_s)
             [code_object.source_file, code_object.source_line]
-          else
-            raise CommandError, "Cannot find a file for #{filename_argument}!"
           end
-        end
 
-        def from_exception(exception, backtrace_level)
-          raise CommandError, "No exception found." if exception.nil?
+          def from_exception(exception, backtrace_level)
+            raise CommandError, "No exception found." if exception.nil?
 
-          file_name, line = exception.bt_source_location_for(backtrace_level)
-          raise CommandError, "Exception has no associated file." if file_name.nil?
-          raise CommandError, "Cannot edit exceptions raised in REPL." if Pry.eval_path == file_name
+            file_name, line = exception.bt_source_location_for(backtrace_level)
+            raise CommandError, "Exception has no associated file." if file_name.nil?
 
-          file_name = RbxPath.convert_path_to_full(file_name) if RbxPath.is_core_path?(file_name)
+            if Pry.eval_path == file_name
+              raise CommandError, "Cannot edit exceptions raised in REPL."
+            end
 
-          [file_name, line]
-        end
+            [file_name, line]
+          end
 
-        # when file and line are passed as a single arg, e.g my_file.rb:30
-        def from_filename_argument(filename_argument)
-          f = File.expand_path(filename_argument)
-          l = f.sub!(/:(\d+)$/, "") ? $1.to_i : 1
-          [f, l]
+          # when file and line are passed as a single arg, e.g my_file.rb:30
+          def from_filename_argument(filename_argument)
+            f = File.expand_path(filename_argument)
+            l = f.sub!(/:(\d+)$/, "") ? Regexp.last_match(1).to_i : 1
+            [f, l]
+          end
         end
       end
     end