pry 0.9.12.2 → 0.14.2

data/lib/pry/commands/amend_line.rb

@@ -1,99 +1,103 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::AmendLine < Pry::ClassCommand
-    match /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/
-    group 'Editing'
-    description 'Amend a line of input in multi-line mode.'
-    command_options :interpolate => false, :listing => 'amend-line'
-
-    banner <<-'BANNER'
-      Amend a line of input in multi-line mode. `amend-line N`, where the N represents
-      line to replace. Can also specify a range of lines using `amend-line N..M`
-      syntax. Passing "!" as replacement content deletes the line(s) instead.
-
-      amend-line 1 puts 'new'    # replace line 1
-      amend-line 1..4 !          # delete lines 1..4
-      amend-line 3 >puts 'bye'   # insert before line 3
-      amend-line puts 'appended' # no line number modifies immediately preceding line
-    BANNER
-
-    def process
-      raise CommandError, "No input to amend." if eval_string.empty?
-
-      eval_string.replace amended_input(eval_string)
-      run "fix-indent"
-      run "show-input"
-    end
+  class Command
+    class AmendLine < Pry::ClassCommand
+      match(/amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/)
+      group 'Editing'
+      description 'Amend a line of input in multi-line mode.'
+      command_options interpolate: false, listing: 'amend-line'
+
+      banner <<-'BANNER'
+        Amend a line of input in multi-line mode. `amend-line N`, where the N represents
+        line to replace. Can also specify a range of lines using `amend-line N..M`
+        syntax. Passing "!" as replacement content deletes the line(s) instead.
+
+        amend-line 1 puts 'new'    # replace line 1
+        amend-line 1..4 !          # delete lines 1..4
+        amend-line 3 >puts 'bye'   # insert before line 3
+        amend-line puts 'appended' # no line number modifies immediately preceding line
+      BANNER
+
+      def process
+        raise CommandError, "No input to amend." if eval_string.empty?
+
+        eval_string.replace(amend_input)
+        run "fix-indent"
+        run "show-input"
+      end
 
-    private
+      private
 
-    # @param [String] string The string to amend.
-    # @return [String] A new string with the amendments applied to it.
-    def amended_input(string)
-      input_array = eval_string.each_line.to_a
+      # @return [String] A new string with the amendments applied to it.
+      def amend_input
+        input_array = eval_string.each_line.to_a
 
-      if arg_string == "!"
-        delete_from_array(input_array, line_range)
-      elsif arg_string.start_with?(">")
-        insert_into_array(input_array, line_range)
-      else
-        replace_in_array(input_array, line_range)
-      end
+        if arg_string == "!"
+          delete_from_array(input_array, line_range)
+        elsif arg_string.start_with?(">")
+          insert_into_array(input_array, line_range)
+        else
+          replace_in_array(input_array, line_range)
+        end
 
-      input_array.join
-    end
+        input_array.join
+      end
 
-    def delete_from_array(array, range)
-      array.slice!(range)
-    end
+      def delete_from_array(array, range)
+        array.slice!(range)
+      end
 
-    def insert_into_array(array, range)
-      insert_slot = Array(range).first
-      array.insert(insert_slot, arg_string[1..-1] + "\n")
-    end
+      def insert_into_array(array, range)
+        insert_slot = Array(range).first
+        array.insert(insert_slot, arg_string[1..-1] << "\n")
+      end
 
-    def replace_in_array(array, range)
-      array[range] = arg_string + "\n"
-    end
+      def replace_in_array(array, range)
+        array[range] = arg_string + "\n"
+      end
 
-    # @return [Fixnum] The number of lines currently in `eval_string` (the input buffer).
-    def line_count
-      eval_string.lines.count
-    end
+      # @return [Fixnum] The number of lines currently in `eval_string` (the
+      #   input buffer)
+      def line_count
+        eval_string.lines.count
+      end
 
-    # Returns the (one-indexed) start and end lines given by the user.
-    # The lines in this range will be affected by the `amend-line`.
-    # Returns `nil` if no lines were specified by the user.
-    # @return [Array<Fixnum>, nil]
-    def start_and_end_line_number
-      start_line_number, end_line_number = args
-      end_line_number ||= start_line_number.to_i
+      # Returns the (one-indexed) start and end lines given by the user.
+      # The lines in this range will be affected by the `amend-line`.
+      # Returns `nil` if no lines were specified by the user.
+      # @return [Array<Fixnum>, nil]
+      def start_and_end_line_number
+        start_line_number, end_line_number = args
+        end_line_number ||= start_line_number.to_i
 
-      [start_line_number.to_i, end_line_number.to_i] if start_line_number
-    end
+        [start_line_number.to_i, end_line_number.to_i] if start_line_number
+      end
 
-    # 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).
-    # @param [Fixnum] start_line_number One-indexed number.
-    # @param [Fixnum] end_line_number One-indexed number.
-    # @return [Range] The zero-indexed range.
-    def zero_indexed_range_from_one_indexed_numbers(start_line_number, end_line_number)
-      # FIXME: one_index_number is a horrible name for this method
-      one_index_number(start_line_number)..one_index_number(end_line_number)
-    end
+      # 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).
+      # @param [Fixnum] start_line_number One-indexed number.
+      # @param [Fixnum] end_line_number One-indexed number.
+      # @return [Range] The zero-indexed range.
+      def zero_indexed_range_from_one_indexed_numbers(start_line_number, end_line_number)
+        # FIXME: one_index_number is a horrible name for this method
+        one_index_number(start_line_number)..one_index_number(end_line_number)
+      end
 
-    # The lines (or line) that will be modified by the `amend-line`.
-    # @return [Range, Fixnum] The lines or line.
-    def line_range
-      start_line_number, end_line_number = start_and_end_line_number
-      if start_line_number
-        zero_indexed_range_from_one_indexed_numbers(start_line_number,
-                                                    end_line_number)
-      else
-        line_count - 1
+      # The lines (or line) that will be modified by the `amend-line`.
+      # @return [Range, Fixnum] The lines or line.
+      def line_range
+        start_line_number, end_line_number = start_and_end_line_number
+        if start_line_number
+          zero_indexed_range_from_one_indexed_numbers(start_line_number,
+                                                      end_line_number)
+        else
+          line_count - 1
+        end
       end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::AmendLine)
+    Pry::Commands.add_command(Pry::Command::AmendLine)
+  end
 end

data/lib/pry/commands/bang.rb

@@ -1,20 +1,24 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Bang < Pry::ClassCommand
-    match '!'
-    group 'Editing'
-    description 'Clear the input buffer.'
-    command_options :use_prefix => false
+  class Command
+    class Bang < Pry::ClassCommand
+      match(/^\s*!\s*$/)
+      group 'Editing'
+      description 'Clear the input buffer.'
+      command_options use_prefix: false, listing: '!'
 
-    banner <<-'BANNER'
-      Clear the input buffer. Useful if the parsing process goes wrong and you get
-      stuck in the read loop.
-    BANNER
+      banner <<-'BANNER'
+        Clear the input buffer. Useful if the parsing process goes wrong and you get
+        stuck in the read loop.
+      BANNER
 
-    def process
-      output.puts 'Input buffer cleared!'
-      eval_string.replace('')
+      def process
+        output.puts 'Input buffer cleared!'
+        eval_string.replace('')
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::Bang)
+    Pry::Commands.add_command(Pry::Command::Bang)
+  end
 end

data/lib/pry/commands/bang_pry.rb

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::BangPry < Pry::ClassCommand
-    match '!pry'
-    group 'Navigating Pry'
-    description 'Start a Pry session on current self.'
+  class Command
+    class BangPry < Pry::ClassCommand
+      match '!pry'
+      group 'Navigating Pry'
+      description 'Start a Pry session on current self.'
 
-    banner <<-'BANNER'
-      Start a Pry session on current self. Also works mid multi-line expression.
-    BANNER
+      banner <<-'BANNER'
+        Start a Pry session on current self. Also works mid multi-line expression.
+      BANNER
 
-    def process
-      target.pry
+      def process
+        target.pry
+      end
     end
-  end
 
-  Pry::Commands.add_command(Pry::Command::BangPry)
+    Pry::Commands.add_command(Pry::Command::BangPry)
+  end
 end

data/lib/pry/commands/cat/abstract_formatter.rb

@@ -1,26 +1,31 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Cat
-    class AbstractFormatter
-      include Pry::Helpers::CommandHelpers
-      include Pry::Helpers::BaseHelpers
+  class Command
+    class Cat
+      class AbstractFormatter
+        include Pry::Helpers::CommandHelpers
+        include Pry::Helpers::BaseHelpers
 
-      private
-      def decorate(content)
-        content.code_type = code_type
-        content.between(*between_lines).
-          with_line_numbers(use_line_numbers?)
-      end
+        private
 
-      def code_type
-        opts[:type] || :ruby
-      end
+        def decorate(content)
+          content.code_type = code_type
+          content.between(*between_lines)
+            .with_line_numbers(use_line_numbers?).highlighted
+        end
 
-      def use_line_numbers?
-        opts.present?(:'line-numbers') || opts.present?(:ex)
-      end
+        def code_type
+          opts[:type] || :ruby
+        end
+
+        def use_line_numbers?
+          opts.present?(:'line-numbers') || opts.present?(:ex)
+        end
 
-      def between_lines
-        [opts[:start] || 1, opts[:end] || -1]
+        def between_lines
+          [opts[:start] || 1, opts[:end] || -1]
+        end
       end
     end
   end

data/lib/pry/commands/cat/exception_formatter.rb

@@ -1,78 +1,90 @@
-class Pry
-  class Command::Cat
-    class ExceptionFormatter < AbstractFormatter
-      attr_accessor :ex
-      attr_accessor :opts
-      attr_accessor :_pry_
-
-      def initialize(exception, _pry_, opts)
-        @ex = exception
-        @opts = opts
-        @_pry_ = _pry_
-      end
-
-      def format
-        check_for_errors
-        set_file_and_dir_locals(backtrace_file, _pry_, _pry_.current_context)
-        code = decorate(Pry::Code.from_file(backtrace_file).
-                                    between(*start_and_end_line_for_code_window).
-                                    with_marker(backtrace_line)).to_s
-        "#{header}#{code}"
-      end
-
-      private
-
-      def code_window_size
-        Pry.config.default_window_size || 5
-      end
-
-      def backtrace_level
-        return @backtrace_level if @backtrace_level
-
-        bl =  if opts[:ex].nil?
-                ex.bt_index
-              else
-                ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
-              end
-
-        increment_backtrace_level
-        @backtrace_level = bl
-      end
-
-      def increment_backtrace_level
-        ex.inc_bt_index
-      end
-
-      def backtrace_file
-        file = Array(ex.bt_source_location_for(backtrace_level)).first
-        (file && RbxPath.is_core_path?(file)) ? RbxPath.convert_path_to_full(file) : file
-      end
-
-      def backtrace_line
-        Array(ex.bt_source_location_for(backtrace_level)).last
-      end
-
-      def check_for_errors
-        raise CommandError, "No exception found." unless ex
-        raise CommandError, "The given backtrace level is out of bounds." unless backtrace_file
-      end
+# frozen_string_literal: true
 
-      def start_and_end_line_for_code_window
-        start_line = backtrace_line - code_window_size
-        start_line = 1 if start_line < 1
-
-        [start_line, backtrace_line + code_window_size]
-      end
-
-      def header
-        unindent %{
-        #{Helpers::Text.bold 'Exception:'} #{ex.class}: #{ex.message}
-        --
-        #{Helpers::Text.bold('From:')} #{backtrace_file} @ line #{backtrace_line} @ #{Helpers::Text.bold("level: #{backtrace_level}")} of backtrace (of #{ex.backtrace.size - 1}).
-
-      }
+class Pry
+  class Command
+    class Cat
+      class ExceptionFormatter < AbstractFormatter
+        attr_reader :ex
+        attr_reader :opts
+        attr_reader :pry_instance
+        include Pry::Helpers::Text
+
+        def initialize(exception, pry_instance, opts)
+          @ex = exception
+          @opts = opts
+          @pry_instance = pry_instance
+        end
+
+        def format
+          check_for_errors
+          set_file_and_dir_locals(
+            backtrace_file, pry_instance, pry_instance.current_context
+          )
+          code = decorate(
+            Pry::Code.from_file(backtrace_file)
+              .between(*start_and_end_line_for_code_window)
+              .with_marker(backtrace_line)
+          )
+          "#{header}#{code}"
+        end
+
+        private
+
+        def code_window_size
+          pry_instance.config.default_window_size || 5
+        end
+
+        def backtrace_level
+          @backtrace_level ||=
+            begin
+              bl =
+                if opts[:ex].nil?
+                  ex.bt_index
+                else
+                  ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
+                end
+
+              increment_backtrace_level
+              bl
+            end
+        end
+
+        def increment_backtrace_level
+          ex.inc_bt_index
+        end
+
+        def backtrace_file
+          Array(ex.bt_source_location_for(backtrace_level)).first
+        end
+
+        def backtrace_line
+          Array(ex.bt_source_location_for(backtrace_level)).last
+        end
+
+        def check_for_errors
+          raise CommandError, "No exception found." unless ex
+          return if backtrace_file
+
+          raise CommandError, "The given backtrace level is out of bounds."
+        end
+
+        def start_and_end_line_for_code_window
+          start_line = backtrace_line - code_window_size
+          start_line = 1 if start_line < 1
+
+          [start_line, backtrace_line + code_window_size]
+        end
+
+        def header
+          unindent(
+            "#{bold 'Exception:'} #{ex.class}: #{ex.message}\n" \
+            "--\n" \
+            "#{bold('From:')} #{backtrace_file}:#{backtrace_line} @ " \
+            "#{bold("level: #{backtrace_level}")} of backtrace " \
+            "(of #{ex.backtrace.size - 1}).\n\n"
+          )
+        end
       end
-
     end
   end
 end

data/lib/pry/commands/cat/file_formatter.rb

@@ -1,81 +1,74 @@
+# frozen_string_literal: true
+
 class Pry
-  class Command::Cat
-    class FileFormatter < AbstractFormatter
-      attr_accessor :file_with_embedded_line
-      attr_accessor :opts
-      attr_accessor :_pry_
+  class Command
+    class Cat
+      class FileFormatter < AbstractFormatter
+        attr_reader :file_with_embedded_line
+        attr_reader :opts
+        attr_reader :pry_instance
 
-      def initialize(file_with_embedded_line, _pry_, opts)
-        @file_with_embedded_line = file_with_embedded_line
-        @opts = opts
-        @_pry_ = _pry_
-      end
+        def initialize(file_with_embedded_line, pry_instance, opts)
+          unless file_with_embedded_line
+            raise CommandError, "Must provide a filename, --in, or --ex."
+          end
 
-      def format
-        raise CommandError, "Must provide a filename, --in, or --ex." if !file_with_embedded_line
+          @file_with_embedded_line = file_with_embedded_line
+          @opts = opts
+          @pry_instance = pry_instance
+          @code_from_file = Pry::Code.from_file(file_name)
+        end
 
-        set_file_and_dir_locals(file_name, _pry_, _pry_.current_context)
-        decorate(Pry::Code.from_file(file_name))
-      end
+        def format
+          set_file_and_dir_locals(file_name, pry_instance, pry_instance.current_context)
+          decorate(@code_from_file)
+        end
 
-      private
+        def file_and_line
+          file_name, line_num = file_with_embedded_line.split(%r{:(?!/|\\)})
 
-      def file_and_line
-        file_name, line_num = file_with_embedded_line.split(':')
+          [file_name, line_num ? line_num.to_i : nil]
+        end
 
-        [File.expand_path(file_name), line_num ? line_num.to_i : nil]
-      end
+        private
 
-      def file_name
-        file_and_line.first
-      end
+        def file_name
+          file_and_line.first
+        end
 
-      def line_number
-        file_and_line.last
-      end
+        def line_number
+          file_and_line.last
+        end
 
-      def code_window_size
-        Pry.config.default_window_size || 7
-      end
+        def code_window_size
+          pry_instance.config.default_window_size || 7
+        end
 
-      def decorate(content)
-        line_number ? super.around(line_number, code_window_size) : super
-      end
+        def decorate(content)
+          if line_number
+            super(content.around(line_number, code_window_size))
+          else
+            super
+          end
+        end
 
-      def code_type
-        opts[:type] || detect_code_type_from_file(file_name)
-      end
+        def code_type
+          opts[:type] || detect_code_type_from_file(file_name)
+        end
 
-      def detect_code_type_from_file(file_name)
-        name, ext = File.basename(file_name).split('.', 2)
+        def detect_code_type_from_file(file_name)
+          code_type = @code_from_file.code_type
 
-        if ext
-          case ext
-          when "py"
-            :python
-          when "rb", "gemspec", "rakefile", "ru", "pryrc", "irbrc"
-            :ruby
-          when "js"
-            return :javascript
-          when "yml", "prytheme"
-            :yaml
-          when "groovy"
-            :groovy
-          when "c"
-            :c
-          when "cpp"
-            :cpp
-          when "java"
-            :java
-          else
-            :text
-          end
-        else
-          case name
-          when "Rakefile", "Gemfile"
-            :ruby
+          if code_type == :unknown
+            name = File.basename(file_name).split('.', 2).first
+            case name
+            when "Rakefile", "Gemfile"
+              :ruby
+            else
+              :text
+            end
           else
-            :text
+            code_type
           end
         end
       end