pry 0.9.12.6 → 0.10.0.pre2

data/lib/pry/color_printer.rb

@@ -0,0 +1,55 @@
+# PP subclass for streaming inspect output in color.
+class Pry
+  class ColorPrinter < ::PP
+    OBJ_COLOR = begin
+      code = CodeRay::Encoders::Terminal::TOKEN_COLORS[:keyword]
+      if code.start_with? "\e"
+        code
+      else
+        "\e[0m\e[0;#{code}m"
+      end
+    end
+
+    CodeRay::Encoders::Terminal::TOKEN_COLORS[:comment][:self] = "\e[1;34m"
+
+    def self.pp(obj, out = $>, width = 79)
+      q = ColorPrinter.new(out, width)
+      q.guard_inspect_key { q.pp obj }
+      q.flush
+      out << "\n"
+    end
+
+    def text(str, width = str.length)
+      # Don't recolorize output with color [Issue #751]
+      if str.include?("\e[")
+        super "#{str}\e[0m", width
+      elsif str.start_with?('#<') || str == '=' || str == '>'
+        super highlight_object_literal(str), width
+      else
+        super CodeRay.scan(str, :ruby).term, width
+      end
+    end
+
+    def pp(obj)
+      super
+    rescue => e
+      raise if e.is_a? Pry::Pager::StopPaging
+
+      # Read the class name off of the singleton class to provide a default
+      # inspect.
+      singleton = class << obj; self; end
+      ancestors = Pry::Method.safe_send(singleton, :ancestors)
+      klass  = ancestors.reject { |k| k == singleton }.first
+      obj_id = obj.__id__.to_s(16) rescue 0
+      str    = "#<#{klass}:0x#{obj_id}>"
+
+      text highlight_object_literal(str)
+    end
+
+    private
+
+    def highlight_object_literal(object_literal)
+      "#{OBJ_COLOR}#{object_literal}\e[0m"
+    end
+  end
+end

data/lib/pry/command.rb

@@ -30,13 +30,13 @@ class Pry
           @command_options[:listing] = arg.is_a?(String) ? arg : arg.inspect
           @match = arg
         end
-        @match
+        @match ||= nil
       end
 
       # Define or get the command's description
       def description(arg=nil)
         @description = arg if arg
-        @description
+        @description ||= nil
       end
 
       # Define or get the command's options
@@ -175,7 +175,7 @@ class Pry
       end
 
       def command_regex
-        pr = defined?(Pry.config.command_prefix) ? Pry.config.command_prefix : ""
+        pr = Pry.respond_to?(:config) ? Pry.config.command_prefix : ""
         prefix = convert_to_regex(pr)
         prefix = "(?:#{prefix})?" unless options[:use_prefix]
 
@@ -194,6 +194,7 @@ class Pry
       # The group in which the command should be displayed in "help" output.
       # This is usually auto-generated from directory naming, but it can be
       # manually overridden if necessary.
+      # Group should not be changed once it is initialized.
       def group(name=nil)
         @group ||= if name
                      name
@@ -201,7 +202,7 @@ class Pry
                      case Pry::Method(block).source_file
                      when %r{/pry/.*_commands/(.*).rb}
                        $1.capitalize.gsub(/_/, " ")
-                     when %r{(pry-\w+)-([\d\.]+([\w\d\.]+)?)}
+                     when %r{(pry-\w+)-([\d\.]+([\w\.]+)?)}
                        name, version = $1, $2
                        "#{name.to_s} (v#{version.to_s})"
                      when /pryrc/
@@ -242,12 +243,13 @@ class Pry
     # @example
     #   run "amend-line",  "5", 'puts "hello world"'
     def run(command_string, *args)
+      command_string = _pry_.config.command_prefix.to_s + command_string
       complete_string = "#{command_string} #{args.join(" ")}".rstrip
       command_set.process_line(complete_string, context)
     end
 
     def commands
-      command_set.commands
+      command_set.to_hash
     end
 
     def text
@@ -283,7 +285,7 @@ class Pry
     #   state.my_state = "my state"  # this will not conflict with any
     #                                # `state.my_state` used in another command.
     def state
-      _pry_.command_state[match] ||= OpenStruct.new
+      _pry_.command_state[match] ||= Pry::Config.from_hash({})
     end
 
     # Revaluate the string (str) and perform interpolation.
@@ -307,8 +309,7 @@ class Pry
       collision_type ||= 'local-variable' if arg_string.match(%r{\A\s*[-+*/%&|^]*=})
 
       if collision_type
-        output.puts "#{text.bold('WARNING:')} Calling Pry command '#{command_match}'," +
-                                                          "which conflicts with a #{collision_type}.\n\n"
+        output.puts "#{text.bold('WARNING:')} Calling Pry command '#{command_match}', which conflicts with a #{collision_type}.\n\n"
       end
     rescue Pry::RescuableException
     end
@@ -438,7 +439,9 @@ class Pry
     #
     # @param [String] search  The line typed so far
     # @return [Array<String>]  Completion words
-    def complete(search); Bond::DefaultMission.completions; end
+    def complete(search)
+      []
+    end
 
     private
 

data/lib/pry/command_set.rb

@@ -10,19 +10,15 @@ class Pry
   class CommandSet
     include Enumerable
     include Pry::Helpers::BaseHelpers
-
-    attr_reader :commands
     attr_reader :helper_module
 
-    # @param [Array<CommandSet>] imported_sets Sets which will be imported
-    #   automatically
+    # @param [Array<Commandset>] imported_sets
+    #   Sets which will be imported automatically
     # @yield Optional block run to define commands
     def initialize(*imported_sets, &block)
       @commands      = {}
       @helper_module = Module.new
-
       import(*imported_sets)
-
       instance_eval(&block) if block
     end
 
@@ -83,7 +79,7 @@ class Pry
       description, options = ["No description.", description] if description.is_a?(Hash)
       options = Pry::Command.default_options(match).merge!(options)
 
-      commands[match] = Pry::BlockCommand.subclass(match, description, options, helper_module, &block)
+      @commands[match] = Pry::BlockCommand.subclass(match, description, options, helper_module, &block)
     end
     alias_method :command, :block_command
 
@@ -115,9 +111,9 @@ class Pry
       description, options = ["No description.", description] if description.is_a?(Hash)
       options = Pry::Command.default_options(match).merge!(options)
 
-      commands[match] = Pry::ClassCommand.subclass(match, description, options, helper_module, &block)
-      commands[match].class_eval(&block)
-      commands[match]
+      @commands[match] = Pry::ClassCommand.subclass(match, description, options, helper_module, &block)
+      @commands[match].class_eval(&block)
+      @commands[match]
     end
 
     # Execute a block of code before a command is invoked. The block also
@@ -126,7 +122,7 @@ class Pry
     # @param [String, Regexp] search The match or listing of the command.
     # @yield The block to be run before the command.
     # @example Display parameter before invoking command
-    #   Pry.commands.before_command("whereami") do |n|
+    #   Pry.config.commands.before_command("whereami") do |n|
     #     output.puts "parameter passed was #{n}"
     #   end
     def before_command(search, &block)
@@ -140,7 +136,7 @@ class Pry
     # @param [String, Regexp] search The match or listing of the command.
     # @yield The block to be run after the command.
     # @example Display text 'command complete' after invoking command
-    #   Pry.commands.after_command("whereami") do |n|
+    #   Pry.config.commands.after_command("whereami") do |n|
     #     output.puts "command complete!"
     #   end
     def after_command(search, &block)
@@ -152,18 +148,12 @@ class Pry
       @commands.each(&block)
     end
 
-    # Add a given command object to this set.
-    # @param [Command] command The subclass of Pry::Command you wish to add.
-    def add_command(command)
-      commands[command.match] = command
-    end
-
     # Removes some commands from the set
     # @param [Array<String>] searches the matches or listings of the commands to remove
     def delete(*searches)
       searches.each do |search|
         cmd = find_command_by_match_or_listing(search)
-        commands.delete cmd.match
+        @commands.delete cmd.match
       end
     end
 
@@ -173,7 +163,7 @@ class Pry
     # @return [Pry::CommandSet] Returns the reciever (a command set).
     def import(*sets)
       sets.each do |set|
-        commands.merge! set.commands
+        @commands.merge! set.to_hash
         helper_module.send :include, set.helper_module
       end
       self
@@ -187,7 +177,7 @@ class Pry
       helper_module.send :include, set.helper_module
       matches.each do |match|
         cmd = set.find_command_by_match_or_listing(match)
-        commands[cmd.match] = cmd
+        @commands[cmd.match] = cmd
       end
       self
     end
@@ -196,8 +186,8 @@ class Pry
     #   of the command to retrieve.
     # @return [Command] The command object matched.
     def find_command_by_match_or_listing(match_or_listing)
-      cmd = (commands[match_or_listing] ||
-        Pry::Helpers::BaseHelpers.find_command(match_or_listing, commands))
+      cmd = (@commands[match_or_listing] ||
+        Pry::Helpers::BaseHelpers.find_command(match_or_listing, @commands))
       cmd or raise ArgumentError, "Cannot find a command: '#{match_or_listing}'!"
     end
 
@@ -256,11 +246,11 @@ class Pry
         :description => cmd.description
       }.merge!(options)
 
-      commands[new_match] = cmd.dup
-      commands[new_match].match = new_match
-      commands[new_match].description = options.delete(:description)
-      commands[new_match].options.merge!(options)
-      commands.delete(cmd.match)
+      @commands[new_match] = cmd.dup
+      @commands[new_match].match = new_match
+      @commands[new_match].description = options.delete(:description)
+      @commands[new_match].options.merge!(options)
+      @commands.delete(cmd.match)
     end
 
     def disabled_command(name_of_disabled_command, message, matcher=name_of_disabled_command)
@@ -309,18 +299,71 @@ class Pry
     end
 
 
-    # @return [Array] The list of commands provided by the command set.
+    # @return [Array]
+    #   The list of commands provided by the command set.
     def list_commands
-      commands.keys
+      @commands.keys
+    end
+    alias_method :keys, :list_commands
+
+    def to_hash
+      @commands.dup
     end
+    alias_method :to_h, :to_hash
 
     # Find a command that matches the given line
-    # @param [String] val The line that might be a command invocation
+    # @param [String] pattern The line that might be a command invocation
     # @return [Pry::Command, nil]
-    def find_command(val)
-      commands.values.select{ |c| c.matches?(val) }.sort_by{ |c| c.match_score(val) }.last
+    def [](pattern)
+      @commands.values.select do |command|
+        command.matches?(pattern)
+      end.sort_by do |command|
+        command.match_score(pattern)
+      end.last
+    end
+    alias_method :find_command, :[]
+
+    #
+    # Re-assign the command found at _pattern_ with _command_.
+    #
+    # @param [Regexp, String] pattern
+    #   The command to add or replace(found at _pattern_).
+    #
+    # @param [Pry::Command] command
+    #   The command to add.
+    #
+    # @return [Pry::Command]
+    #   Returns the new command (matched with "pattern".)
+    #
+    # @example
+    #   Pry.config.commands["help"] = MyHelpCommand
+    #
+    def []=(pattern, command)
+      if command.equal?(nil)
+        return @commands.delete(pattern)
+      end
+      unless Class === command && command < Pry::Command
+        raise TypeError, "command is not a subclass of Pry::Command"
+      end
+      bind_command_to_pattern = pattern != command.match
+      if bind_command_to_pattern
+        command_copy = command.dup
+        command_copy.match = pattern
+        @commands[pattern] = command_copy
+      else
+        @commands[pattern] = command
+      end
+    end
+
+    #
+    # Add a command to set.
+    #
+    # @param [Command] command
+    #   a subclass of Pry::Command.
+    #
+    def add_command(command)
+      self[command.match] = command
     end
-    alias_method :[], :find_command
 
     # Find the command that the user might be trying to refer to.
     # @param [String] search The user's search.
@@ -356,7 +399,7 @@ class Pry
 
     # @private (used for testing)
     def run_command(context, match, *args)
-      command = commands[match] or raise NoCommandError.new(match, self)
+      command = @commands[match] or raise NoCommandError.new(match, self)
       command.new(context).call_safely(*args)
     end
 
@@ -368,9 +411,9 @@ class Pry
       if command = find_command(search)
         command.new(context).complete(search)
       else
-        commands.keys.select do |x|
-          String === x && x.start_with?(search)
-        end.map{ |command| command + " " } + Bond::DefaultMission.completions
+        @commands.keys.select do |key|
+          String === key && key.start_with?(search)
+        end.map{ |key| key + " " }
       end
     end
   end

data/lib/pry/commands.rb

@@ -1,6 +1,6 @@
 # Default commands used by Pry.
 Pry::Commands = Pry::CommandSet.new
 
-Dir[File.expand_path('../commands', __FILE__) + '/*.rb'].each do |file|
+Dir[File.expand_path('../commands', __FILE__) << '/*.rb'].each do |file|
   require file
 end

data/lib/pry/commands/amend_line.rb

@@ -1,6 +1,6 @@
 class Pry
   class Command::AmendLine < Pry::ClassCommand
-    match /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/
+    match(/amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/)
     group 'Editing'
     description 'Amend a line of input in multi-line mode.'
     command_options :interpolate => false, :listing => 'amend-line'
@@ -48,7 +48,7 @@ class Pry
 
     def insert_into_array(array, range)
       insert_slot = Array(range).first
-      array.insert(insert_slot, arg_string[1..-1] + "\n")
+      array.insert(insert_slot, arg_string[1..-1] << "\n")
     end
 
     def replace_in_array(array, range)

data/lib/pry/commands/bang.rb

@@ -1,6 +1,6 @@
 class Pry
   class Command::Bang < Pry::ClassCommand
-    match '!'
+    match /^\s*!\s*$/
     group 'Editing'
     description 'Clear the input buffer.'
     command_options :use_prefix => false

data/lib/pry/commands/cat.rb

@@ -41,11 +41,20 @@ class Pry
                  FileFormatter.new(args.first, _pry_, opts).format
                end
 
-      stagger_output(output)
+      _pry_.pager.page output
     end
 
     def complete(search)
-      super + Bond::Rc.files(search.split(" ").last || '')
+      super | load_path_completions
+    end
+
+    def load_path_completions
+      $LOAD_PATH.flat_map do |path|
+        Dir[path + '/**/*'].map { |f|
+          next if File.directory?(f)
+          f.sub!(path + '/', '')
+        }
+      end
     end
   end
 

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

@@ -1,9 +1,9 @@
 class Pry
   class Command::Cat
     class ExceptionFormatter < AbstractFormatter
-      attr_accessor :ex
-      attr_accessor :opts
-      attr_accessor :_pry_
+      attr_reader :ex
+      attr_reader :opts
+      attr_reader :_pry_
 
       def initialize(exception, _pry_, opts)
         @ex = exception
@@ -23,7 +23,7 @@ class Pry
       private
 
       def code_window_size
-        Pry.config.default_window_size || 5
+        _pry_.config.default_window_size || 5
       end
 
       def backtrace_level
@@ -44,8 +44,7 @@ class Pry
       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
+        Array(ex.bt_source_location_for(backtrace_level)).first
       end
 
       def backtrace_line