pry 0.8.0pre1 → 0.8.0pre2

data/lib/pry/TAGS

@@ -0,0 +1,62 @@
+
+command_base.rb,124
+      attr_accessor :opts,opts
8,206
+      attr_accessor :opts, :output,output
8,206
+          commands[commands
48,1817
+
+command_processor.rb,25
+      ret_value 78,2169
+
+commands.rb,488
+direc 1,0
+      target 239,7098
+      target_self 326,9884
+                                 target.eval("self.class.constants(constants
368,12413
+      new_constants 541,17465
+    process_yardoc_tag 586,19091
+    process_yardoc 602,19553
+        gsub(/^@(@
606,19822
+    process_comment_markup 609,19917
+    strip_leading_hash_and_whitespace_from_ruby_comments 620,20291
+      target 629,20656
+      target 692,22513
+          options[options
702,22857
+      text 848,27140
+
+completion.rb,139
+          receiver 139,4449
+          lv 143,4577
+          cv 144,4642
+              candidates 152,5008
+          receiver 175,5682
+
+core_extensions.rb,52
+          self.class.class_eval class_eval
39,1245
+
+custom_completions.rb,61
+  DEFAULT_CUSTOM_COMPLETIONS 4,81
+  FILE_COMPLETIONS 5,144
+
+hooks.rb,22
+  DEFAULT_HOOKS 4,92
+
+print.rb,23
+  DEFAULT_PRINT 5,109
+
+prompts.rb,23
+  DEFAULT_PROMPT 5,76
+
+pry_class.rb,116
+  RC_FILES 5,74
+    name,164,5591
+    name, arg_string 164,5591
+    null_output 174,5850
+    commands 176,5932
+
+pry_instance.rb,77
+direc 1,0
+    default_options 29,1134
+      instance_variable_set(34,1294
+
+version.rb,16
+  VERSION 2,10

data/lib/pry/command_processor.rb

@@ -0,0 +1,116 @@
+require 'forwardable'
+
+class Pry
+  class CommandProcessor
+    extend Forwardable
+    
+    attr_reader :pry_instance
+    
+    def initialize(pry_instance)
+      @pry_instance = pry_instance
+    end
+
+    def_delegators :@pry_instance, :commands, :nesting, :output
+    
+    def system_command(val)
+      if val =~ /^\.(.*)/
+        execute_system_command($1)
+        val.clear
+      else
+        return false
+      end
+      true
+    end
+
+    def execute_system_command(cmd)
+      if cmd =~ /^cd\s+(.+)/i
+        Dir.chdir(File.expand_path($1))
+        system(cmd)
+      else
+        system(cmd)
+      end
+    end
+    
+    # Determine whether a Pry command was matched and return command data
+    # and argument string.
+    # This method should not need to be invoked directly.
+    # @param [String] val The line of input.
+    # @return [Array] The command data and arg string pair
+    def command_matched(val)
+      _, cmd_data = commands.commands.find do |name, cmd_data|
+        /^#{Regexp.escape(name)}(?!\S)(?:\s+(.+))?/ =~ val
+      end
+
+      [cmd_data, $1]
+    end
+
+    # Process Pry commands. Pry commands are not Ruby methods and are evaluated
+    # prior to Ruby expressions.
+    # Commands can be modified/configured by the user: see `Pry::Commands`
+    # This method should not need to be invoked directly - it is called
+    # by `Pry#r`.
+    # @param [String] val The current line of input.
+    # @param [String] eval_string The cumulative lines of input for
+    #   multi-line input.
+    # @param [Binding] target The receiver of the commands.
+    def process_commands(val, eval_string, target)
+      def val.clear() replace("") end
+      def eval_string.clear() replace("") end
+
+      return if system_command(val)
+
+      cmd_data, args_string = command_matched(val)
+
+      # no command was matched, so return to caller
+      return if !cmd_data
+      
+      args = args_string ? Shellwords.shellwords(args_string) : []
+      action = cmd_data[:action]
+      keep_retval = cmd_data[:keep_retval]
+      
+      options = {
+        :val => val,
+        :eval_string => eval_string,
+        :nesting => nesting,
+        :commands => commands.commands
+      }
+
+      ret_value = execute_command(target, action, options, *args)
+
+      # return value of block only if :keep_retval is true
+      ret_value if keep_retval
+    end
+
+    # Execute a Pry command.
+    # This method should not need to be invoked directly.
+    # @param [Binding] target The target of the Pry session.
+    # @param [Proc] action The proc that implements the command.
+    # @param [Hash] options The options to set on the Commands object.
+    # @param [Array] args The command arguments.
+    def execute_command(target, action, options, *args)
+
+      # set some useful methods to be used by the action blocks
+      commands.opts = options
+      commands.target = target
+      commands.output = output
+
+      case action.arity <=> 0
+      when -1
+
+        # Use instance_exec() to make the `opts` method, etc available
+        ret_val = commands.instance_exec(*args, &action)
+      when 1, 0
+
+        # ensure that we get the right number of parameters
+        # since 1.8.7 complains about incorrect arity (1.9.2
+        # doesn't care)
+        args_with_corrected_arity = args.values_at *0..(action.arity - 1)
+        ret_val = commands.instance_exec(*args_with_corrected_arity, &action)
+      end
+
+      options[:val].clear
+      
+      ret_val
+    end
+  end
+end

data/lib/pry/commands.rb

@@ -681,6 +681,8 @@ e.g show-doc hello_method
       doc
     end
 
+    alias_command "?", "show-doc", ""
+
     strip_comments_from_c_code = lambda do |code|
       code.sub /\A\s*\/\*.*?\*\/\s*/m, ''
     end

data/lib/pry/pry_instance.rb

@@ -1,3 +1,7 @@
+direc = File.dirname(__FILE__)
+
+require "#{direc}/command_processor.rb"
+
 class Pry
 
   # The list of configuration options.
@@ -29,6 +33,8 @@ class Pry
     CONFIG_OPTIONS.each do |key|
       instance_variable_set("@#{key}", default_options[key])
     end
+
+    @command_processor = CommandProcessor.new(self)
   end
 
   # Get nesting data.
@@ -213,7 +219,7 @@ class Pry
   # @target [Binding] target The target of the Pry session.
   def process_line(val, eval_string, target)
     val.chomp!
-    Pry.cmd_ret_value = process_commands(val, eval_string, target)
+    Pry.cmd_ret_value = @command_processor.process_commands(val, eval_string, target)
     
     if Pry.cmd_ret_value
       eval_string << "Pry.cmd_ret_value\n"
@@ -240,108 +246,6 @@ class Pry
     target.eval("_ex_ = ::Pry.last_exception")
   end
 
-  # FIXME
-  def system_command(val)
-    if val =~ /^:(.*)/
-      execute_system_command($1)
-      val.clear
-    else
-      return false
-    end
-    true
-  end
-
-  def execute_system_command(cmd)
-    if cmd =~ /^cd\s+(.+)/i
-      Dir.chdir(File.expand_path($1))
-      system(cmd)
-    else
-      system(cmd)
-    end
-  end
-  
-  # Determine whether a Pry command was matched and return command data
-  # and argument string.
-  # This method should not need to be invoked directly.
-  # @param [String] val The line of input.
-  # @return [Array] The command data and arg string pair
-  def command_matched(val)
-    _, cmd_data = commands.commands.find do |name, cmd_data|
-      /^#{name}(?!\S)(?:\s+(.+))?/ =~ val
-    end
-
-    [cmd_data, $1]
-  end
-
-  # Process Pry commands. Pry commands are not Ruby methods and are evaluated
-  # prior to Ruby expressions.
-  # Commands can be modified/configured by the user: see `Pry::Commands`
-  # This method should not need to be invoked directly - it is called
-  # by `Pry#r`.
-  # @param [String] val The current line of input.
-  # @param [String] eval_string The cumulative lines of input for
-  #   multi-line input.
-  # @param [Binding] target The receiver of the commands.
-  def process_commands(val, eval_string, target)
-    def val.clear() replace("") end
-    def eval_string.clear() replace("") end
-
-    return if system_command(val)
-
-    cmd_data, args_string = command_matched(val)
-
-    # no command was matched, so return to caller
-    return if !cmd_data
-    
-    args = args_string ? Shellwords.shellwords(args_string) : []
-    action = cmd_data[:action]
-    keep_retval = cmd_data[:keep_retval]
-    
-    options = {
-      :val => val,
-      :eval_string => eval_string,
-      :nesting => nesting,
-      :commands => commands.commands
-    }
-
-    ret_value = execute_command(target, action, options, *args)
-
-    # return value of block only if :keep_retval is true
-    ret_value if keep_retval
-  end
-
-  # Execute a Pry command.
-  # This method should not need to be invoked directly.
-  # @param [Binding] target The target of the Pry session.
-  # @param [Proc] action The proc that implements the command.
-  # @param [Hash] options The options to set on the Commands object.
-  # @param [Array] args The command arguments.
-  def execute_command(target, action, options, *args)
-
-    # set some useful methods to be used by the action blocks
-    commands.opts = options
-    commands.target = target
-    commands.output = output
-
-    case action.arity <=> 0
-    when -1
-
-      # Use instance_exec() to make the `opts` method, etc available
-      ret_val = commands.instance_exec(*args, &action)
-    when 1, 0
-
-      # ensure that we get the right number of parameters
-      # since 1.8.7 complains about incorrect arity (1.9.2
-      # doesn't care)
-      args_with_corrected_arity = args.values_at *0..(action.arity - 1)
-      ret_val = commands.instance_exec(*args_with_corrected_arity, &action)
-    end
-
-    options[:val].clear
-    
-    ret_val
-  end
-
   # Returns the next line of input to be used by the pry instance.
   # This method should not need to be invoked directly.
   # @param [String] current_prompt The prompt to use for input.

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.8.0pre1"
+  VERSION = "0.8.0pre2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0pre1
-  version: 0.8.0pre1
+  - 0pre2
+  version: 0.8.0pre2
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -88,11 +88,13 @@ extra_rdoc_files: []
 files: 
 - lib/pry/commands.rb
 - lib/pry/version.rb
+- lib/pry/TAGS
 - lib/pry/command_base.rb
 - lib/pry/prompts.rb
 - lib/pry/hooks.rb
 - lib/pry/custom_completions.rb
 - lib/pry/core_extensions.rb
+- lib/pry/command_processor.rb
 - lib/pry/completion.rb
 - lib/pry/print.rb
 - lib/pry/pry_class.rb