pry 0.8.4pre1 → 0.9.0pre1

data/.gitignore

@@ -2,6 +2,7 @@ Makefile
 *.so
 *.o
 *.def
+*.rbc
 doc/
 pkg/
 coverage/

data/README.markdown

@@ -1,4 +1,4 @@
-![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_shade.png)
+![Alt text](http://dl.dropbox.com/u/15761219/pry_horizontal_red.png)
 
 (C) John Mair (banisterfiend) 2011
 

data/Rakefile

@@ -5,7 +5,8 @@ $:.unshift 'lib'
 require 'pry/version'
 
 CLOBBER.include("**/*~", "**/*#*", "**/*.log")
-CLEAN.include("**/*#*", "**/*#*.*", "**/*_flymake*.*", "**/*_flymake", "**/*.rbc")
+CLEAN.include("**/*#*", "**/*#*.*", "**/*_flymake*.*", "**/*_flymake",
+              "**/*.rbc", "**/.#*.*")
 
 def apply_spec_defaults(s)
   s.name = "pry"
@@ -16,13 +17,12 @@ def apply_spec_defaults(s)
   s.email = 'jrmair@gmail.com'
   s.description = s.summary
   s.homepage = "http://banisterfiend.wordpress.com"
-  s.has_rdoc = 'yard'
   s.executables = ["pry"]
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- test/*`.split("\n")
   s.add_dependency("ruby_parser",">=2.0.5")
   s.add_dependency("coderay",">=0.9.8")
-  s.add_dependency("slop",">=1.5.3")
+  s.add_dependency("slop","~>1.6.0")
   s.add_dependency("method_source",">=0.4.0")
   s.add_development_dependency("bacon",">=1.1.0")
 end
@@ -33,8 +33,7 @@ end
 
 desc "run pry"
 task :pry do
-  require 'pry'
-  binding.pry
+  load 'bin/pry'
 end
 
 desc "show pry version"
@@ -52,6 +51,13 @@ namespace :ruby do
     pkg.need_zip = false
     pkg.need_tar = false
   end
+  
+  desc  "Generate gemspec file"
+  task :gemspec do
+    File.open("#{spec.name}-#{spec.version}.gemspec", "w") do |f|
+      f << spec.to_ruby
+    end
+  end
 end
 
 [:mingw32, :mswin32].each do |v|

data/TODO

@@ -1,13 +1,39 @@
 
+ROADMAP
+
 FUTURE
-* allows pipes (|) for commands
+--------
+* Pry server and Pry client for SLIME style remote repl connectinos.
+* i18n support
+
+0.9.0
+Major features
+--------------
+* Restructure command system and helpers (almost complete)
+* Delete unnecessary commands, add a couple of new ones (e.g amend-line)
+* Readline history
+* Plugin support
+* Support Rubinius core methods
+* in[] and out[] arrays
+* Improve test coverage (test some commands, etc)
+
+Minor changes
+-------------
+* improve edit-method support for various editors
+* ensure all commands have appropriate error handing and informative error messages
+* show-doc should include signature of method
+
+Optional
+--------
+* multi-line readline support
+
 
 0.8.0
 * allow #{} interpolation of all commands
 * update documentation! new commands and features and change in behaviour of `run`
 * add ; at end of line to suppress return value output
 * Remove message spam (before/after hooks)
-* stop commands returning a value 
+* stop commands returning a value
 * use `redo` in the r() method when encounter a command
 * shell functionality should just use system(), but redirect in and
    out to Pry.input and Pry.output by reassining $stdin and $stdout

data/bin/pry

@@ -22,7 +22,7 @@ See: `https://github.com/banister` for more information.
   on :e, :exec, "A line of code to execute in context before the session starts", true
   on :f, "Suppress loading of ~/.pryrc"
   on "no-color", "Disable syntax highlighting for session"
-
+  on "no-plugins", "Suppress loading of plugins."
   on "simple-prompt", "Enable simple prompt mode" do
     Pry.prompt = Pry::SIMPLE_PROMPT
   end
@@ -50,15 +50,11 @@ end
 # invoked via cli
 Pry.cli = true
 
-Pry::Commands.instance_eval do
-  command "reset", "Reset the REPL to a clean state." do
-    output.puts "Pry reset."
-    exec("pry")
-  end
-end
-
 # load ~/.pryrc, if not suppressed with -f option
-Pry.should_load_rc = !opts.f?
+Pry.config.should_load_rc = !opts.f?
+
+# suppress plugins if given --no-plugins optino
+Pry.config.plugins.enabled = false if opts["no-plugins"]
 
 # create the actual context
 context = Pry.binding_for(eval(opts[:context]))

data/examples/example_basic.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # define a local.
 a = "a local variable"
@@ -14,4 +11,5 @@ end
 # Start pry session at top-level.
 # The local variable `a` and the `hello` method will
 # be accessible.
+puts __LINE__
 binding.pry

data/examples/example_command_override.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # Inherit standard command set, but tweak them by importing some and
 # overriding others.
@@ -18,7 +15,7 @@ class MyCommands < Pry::CommandBase
 
   # analogy to Ruby's native alias_method idiom for decorating a method
   alias_command "old_status", "status", ""
-  
+
   # Invoke one command from within another using `run`
   command "status", "Modified status."  do |x|
     output.puts "About to show status, are you ready?"

data/examples/example_commands.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class MathCommands < Pry::CommandBase
   command "greet", "Greet a person, e.g: greet john" do |name|

data/examples/example_hooks.rb

@@ -1,12 +1,9 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 my_hooks = {
   :before_session => proc { |out, target| out.puts "Opening #{target.eval('self')}." },
   :after_session => proc { |out, target| out.puts "Closing #{target.eval('self')}." }
 }
-           
+
 # Start a Pry session using the hooks hash defined in my_hooks
 Pry.start(TOPLEVEL_BINDING, :hooks => my_hooks)

data/examples/example_image_edit.rb

@@ -1,7 +1,7 @@
 # Note: this requires you to have Gosu and TexPlay installed.
 # `gem install gosu`
 # `gem install texplay`
-# 
+#
 # Extra instructions for installing Gosu on Linux can be found here:
 # http://code.google.com/p/gosu/wiki/GettingStartedOnLinux
 #
@@ -10,11 +10,7 @@
 #
 # Have fun! :)
 
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "texplay"
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 WIDTH = 640
 HEIGHT = 480
@@ -42,12 +38,12 @@ class WinClass < Gosu::Window
     @img.rect 0, 0, @img.width - 1, @img.height - 1
 
     @binding = Pry.binding_for(@img)
-    
+
     @pry_instance = Pry.new(:commands => ImageCommands, :prompt => IMAGE_PROMPT)
   end
 
   def draw
-    @img.draw_rot(WIDTH / 2, HEIGHT / 2, 1, 0, 0.5, 0.5) 
+    @img.draw_rot(WIDTH / 2, HEIGHT / 2, 1, 0, 0.5, 0.5)
   end
 
   def update

data/examples/example_input.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # Create a StringIO that contains the input data
 str_input = StringIO.new("puts 'hello world!'\nputs \"I am in \#{self}\"\nexit")

data/examples/example_input2.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # Create a StringIO that contains the input data for all the Pry objects
 cmds = <<-CMDS

data/examples/example_output.rb

@@ -1,7 +1,4 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # Create a StringIO to contain the output data
 str_output = StringIO.new

data/examples/example_print.rb

@@ -1,9 +1,6 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 my_print = proc { |out, value| out.puts "Output is: #{value.inspect}" }
-           
+
 # Start a Pry session using the print object defined in my_print
 Pry.start(TOPLEVEL_BINDING, :print => my_print)

data/examples/example_prompt.rb

@@ -1,12 +1,9 @@
-direc = File.dirname(__FILE__)
-
-require 'rubygems'
-require "#{direc}/../lib/pry"
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 # Remember, first prompt in array is the main prompt, second is the wait
 # prompt (used for multiline input when more input is required)
 my_prompt = [ proc { |obj, *| "inside #{obj}> " },
            proc { |obj, *| "inside #{obj}* "} ]
-           
+
 # Start a Pry session using the prompt defined in my_prompt
 Pry.start(TOPLEVEL_BINDING, :prompt => my_prompt)

data/examples/helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+unless Object.const_defined? 'Pry'
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'pry'
+end
+

data/lib/pry.rb

@@ -1,6 +1,65 @@
 # (C) John Mair (banisterfiend) 2011
 # MIT License
 
+class Pry
+  # The default hooks - display messages when beginning and ending Pry sessions.
+  DEFAULT_HOOKS = {
+    :before_session => proc do |out, target|
+      # ensure we're actually in a method
+      meth_name = target.eval('__method__')
+      file = target.eval('__FILE__')
+
+      # /unknown/ for rbx
+      if file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e"
+        Pry.run_command "whereami 5", :output => out, :show_output => true, :context => target, :commands => Pry::Commands
+      end
+    end
+  }
+
+  # The default prints
+  DEFAULT_PRINT = proc do |output, value|
+    if Pry.color
+      output.puts "=> #{CodeRay.scan(Pry.view(value), :ruby).term}"
+    else
+      output.puts "=> #{Pry.view(value)}"
+    end
+  end
+
+  # Will only show the first line of the backtrace
+  DEFAULT_EXCEPTION_HANDLER = proc do |output, exception|
+    output.puts "#{exception.class}: #{exception.message}"
+    output.puts "from #{exception.backtrace.first}"
+  end
+
+  # The default prompt; includes the target and nesting level
+  DEFAULT_PROMPT = [
+    proc { |target_self, nest_level|
+      if nest_level == 0
+        "pry(#{Pry.view_clip(target_self)})> "
+      else
+        "pry(#{Pry.view_clip(target_self)}):#{Pry.view_clip(nest_level)}> "
+      end
+    },
+
+    proc { |target_self, nest_level|
+      if nest_level == 0
+        "pry(#{Pry.view_clip(target_self)})* "
+      else
+        "pry(#{Pry.view_clip(target_self)}):#{Pry.view_clip(nest_level)}* "
+      end
+    }
+  ]
+
+  # A simple prompt - doesn't display target or nesting level
+  SIMPLE_PROMPT = [proc { ">> " }, proc { ">* " }]
+
+  SHELL_PROMPT = [
+    proc { |target_self, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
+    proc { |target_self, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
+  ]
+
+end
+
 require "method_source"
 require 'shellwords'
 require "readline"
@@ -20,15 +79,13 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 end
 
 require "pry/version"
-require "pry/hooks"
-require "pry/print"
 require "pry/helpers"
 require "pry/command_set"
 require "pry/commands"
 require "pry/command_context"
-require "pry/prompts"
 require "pry/custom_completions"
 require "pry/completion"
+require "pry/plugins"
 require "pry/core_extensions"
 require "pry/pry_class"
-require "pry/pry_instance"
+require "pry/pry_instance"

data/lib/pry/command_context.rb

@@ -4,25 +4,26 @@ class Pry
   class CommandContext
     attr_accessor :output
     attr_accessor :target
+    attr_accessor :captures
+    attr_accessor :eval_string
+    attr_accessor :arg_string
     attr_accessor :opts
     attr_accessor :command_set
     attr_accessor :command_processor
 
-    def run(name, *args)
-      if name.start_with? "."
-        cmd = name[1..-1]
-        command_processor.
-          execute_system_command([name, Shellwords.join(args)].join(' '),
-                                 target)
-      else
-        command_set.run_command(self, name, *args)
-      end
+    def run(command_string, *args)
+      complete_string = "#{command_string} #{args.join(" ")}"
+      command_processor.process_commands(complete_string, eval_string, target)
     end
 
     def commands
       command_set.commands
     end
 
+    def text
+      Pry::Helpers::Text
+    end
+
     include Pry::Helpers::BaseHelpers
     include Pry::Helpers::CommandHelpers
   end

data/lib/pry/command_processor.rb

@@ -2,9 +2,6 @@ require 'forwardable'
 
 class Pry
   class CommandProcessor
-    SYSTEM_COMMAND_DELIMITER = "."
-    SYSTEM_COMMAND_REGEX = /^#{Regexp.escape(SYSTEM_COMMAND_DELIMITER)}(.*)/
-
     extend Forwardable
 
     attr_accessor :pry_instance
@@ -19,22 +16,16 @@ class Pry
     # @param [String] val The string passed in from the Pry prompt.
     # @return [Boolean] Whether the string is a valid command.
     def valid_command?(val)
-      system_command?(val) || pry_command?(val)
+      !!(command_matched(val)[0])
     end
 
-    # Is the string a valid system command?
-    # @param [String] val The string passed in from the Pry prompt.
-    # @return [Boolean] Whether the string is a valid system command.
-    def system_command?(val)
-      !!(SYSTEM_COMMAND_REGEX =~ val)
-    end
-
-    # Is the string a valid pry command?
-    # A Pry command is a command that is not a system command.
-    # @param [String] val The string passed in from the Pry prompt.
-    # @return [Boolean] Whether the string is a valid Pry command.
-    def pry_command?(val)
-      !!command_matched(val).first
+    def convert_to_regex(obj)
+      case obj
+      when String
+        Regexp.escape(obj)
+      else
+        obj
+      end
     end
 
     # Revaluate the string (str) and perform interpolation.
@@ -49,41 +40,6 @@ class Pry
       target.eval(dumped_str)
     end
 
-    # Execute a given system command.
-    # The commands first have interpolation applied against the
-    # `target` context.
-    # All system command are forwarded to a shell. Note that the `cd`
-    # command is special-cased and is converted internallly to a `Dir.chdir`
-    # @param [String] val The system command to execute.
-    # @param [Binding] target The context in which to perform string interpolation.
-    def execute_system_command(val, target)
-      SYSTEM_COMMAND_REGEX  =~ val
-      cmd = interpolate_string($1, target)
-
-      if cmd =~ /^cd\s+(.+)/i
-        begin
-          @@cd_history ||= []
-          if $1 == "-"
-            dest = @@cd_history.pop || Dir.pwd
-          else
-            dest = File.expand_path($1)
-          end
-
-          @@cd_history << Dir.pwd
-          Dir.chdir(dest)
-        rescue Errno::ENOENT
-          output.puts "No such directory: #{dest}"
-        end
-      else
-        if !system(cmd)
-          output.puts "Error: there was a problem executing system command: #{cmd}"
-        end
-      end
-
-      # Tick, tock, im getting rid of this shit soon.
-      val.replace("")
-    end
-
     # Determine whether a Pry command was matched and return command data
     # and argument string.
     # This method should not need to be invoked directly.
@@ -91,10 +47,10 @@ class Pry
     # @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
+        /^#{convert_to_regex(name)}(?!\S)/ =~ val
       end
 
-      [cmd_data, $1]
+      [cmd_data, (Regexp.last_match ? Regexp.last_match.captures : nil), (Regexp.last_match ? Regexp.last_match.end(0) : nil)]
     end
 
     # Process Pry commands. Pry commands are not Ruby methods and are evaluated
@@ -107,30 +63,32 @@ class Pry
     #   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
-
-      if system_command?(val)
-        execute_system_command(val, target)
-        return
-      end
 
       # no command was matched, so return to caller
-      return if !pry_command?(val)
+      return if !valid_command?(val)
+      command, captures, pos = command_matched(val)
 
-      val.replace interpolate_string(val, target)
-      command, args_string = command_matched(val)
 
-      args = args_string ? Shellwords.shellwords(args_string) : []
+      # perform ruby interpolation for commands
+      if command.options[:interpolate]
+        val.replace interpolate_string(val, target)
+ #       command, captures, pos = command_matched(val)
+#        captures = captures.map { |v| interpolate_string(v, target) if v }
+      end
+
+      arg_string = val[pos..-1].strip
+      args = arg_string ? Shellwords.shellwords(arg_string) : []
 
       options = {
         :val => val,
+        :arg_string => arg_string,
         :eval_string => eval_string,
         :nesting => nesting,
-        :commands => commands.commands
+        :commands => commands.commands,
+        :captures => captures
       }
 
-      execute_command(target, command.name, options, *args)
+      execute_command(target, command.name, options, *(captures + args))
     end
 
     # Execute a Pry command.
@@ -146,6 +104,9 @@ class Pry
       context.opts        = options
       context.target      = target
       context.output      = output
+      context.captures    = options[:captures]
+      context.eval_string = options[:eval_string]
+      context.arg_string  = options[:arg_string]
       context.command_set = commands
 
       context.command_processor = self
@@ -153,7 +114,7 @@ class Pry
       ret = commands.run_command(context, command, *args)
 
       # Tick, tock, im getting rid of this shit soon.
-      options[:val].clear
+      options[:val].replace("")
 
       ret
     end