pry 0.9.6.2 → 0.9.7

data/.gitignore

@@ -8,3 +8,9 @@ pkg/
 coverage/
 .yardoc/
 /tags
+*.gem
+
+# Not sure if Pry devs use RVM or want the Gemfile.lock in the repo, thus I'm
+# ignoring them for now.
+.rvmrc
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,21 @@
+25/10/2011 version 0.9.7
+
+MAJOR NEW FEATURES:
+- upgraded ls command to have a more intuitive interface
+- added automatic indentation (thanks YorickPeterse!)
+- added Pry::Method wrapper class to encapsulate method-related functionality
+
+complete CHANGELOG:
+* fixed syntax highlighting for object literals
+* fixed ActiveSupport method-naming conflict with "in?"
+* started using JRuby parser for input validation in JRuby (thanks pangloss!)
+* fixed bug where ~/.pryrc could be loaded more than once (thanks kelseyjudson!)
+* added parse_options! helper to pull option parsing out of commands
+* Pry now respects the terminal's input encoding
+* moved some requires out of the startup process for improved speed
+* added input_array info to DEFAULT_PROMPT, e.g [1] pry(main)>
+* added --no-history option to pry binary (prevent history being LOADED, history will still be saved)
+
 27/9/2011 version 0.9.6.2 HOTFIX release
 * downgrading to CodeRay 0.9.8 due to problems with 1.0 and rails (autoloading problem) see #280 on pry and #6 on CodeRay
 * also added (as a minor feature) cirwin's implementation of edit --in
@@ -77,7 +95,7 @@ complete CHANGELOG:
 * ls separator configurable via, e.g Pry.config.ls.separator = "  "
 * Pry.view_clip() now only calls inspect on a few immediates, otherwise uses the #<> syntax, which has been truncated further to exclude teh mem address, again related to #245
 
-*/7/2011 version 0.9.3
+27/7/2011 version 0.9.3
 * cat --ex (cats 5 lines above and below line in file where exception was raised)
 * edit --ex (edits line in file where exception was raised)
 * edit -t (opens a temporary file and evals it in current context when closed)

data/CONTRIBUTORS

@@ -1,16 +1,22 @@
-   617	John Mair
-    76	Rob Gleeson
-    50	Lee Jarvis
-    47	Mon ouïe
-    18	David Palm
-    16	Conrad Irwin
-    14	Ryan Fitzgerald
-    13	epitron
-     2	Darrick Wiebe
-     2	robgleeson
-     2	Eric Christopherson
-     2	Xavier Shay
-     1	Tim Pope
-     1	Gosha Arinich
-     1	Josh Cheek
-     1	Eero Saynatkari
+   687	John Mair <jrmair@gmail.com>
+    82	Conrad Irwin <conrad.irwin@gmail.com>
+    76	Rob Gleeson <rob@flowof.info>
+    70	Ryan Fitzgerald <rwfitzge@gmail.com>
+    50	Lee Jarvis <lee@jarvis.co>
+    47	Mon ouïe <mon.ouie@gmail.com>
+    18	David Palm <dpalm@elctech.com>
+    13	epitron <chris@ill-logic.com>
+     8	Eero Saynatkari <projects@kittensoft.org>
+     6	Yorick Peterse <yorickpeterse@gmail.com>
+     3	Darrick Wiebe <darrick@innatesoftware.com>
+     2	robgleeson <rob@flowof.info>
+     2	Eric Christopherson <echristopherson@gmail.com>
+     2	Kelsey Judson <kelseyjudson@gmail.com>
+     2	Xavier Shay <xavier@rhnh.net>
+     1	Josh Cheek <josh.cheek@gmail.com>
+     1	Tim Pope <code@tpope.net>
+     1	Gosha Arinich <me@goshakkk.name>
+     1	Shawn Anderson <shawn42@gmail.com>
+     1	Jordan Running <jrunning@gmail.com>
+     1	fowlmouth <phowl.mouth@gmail.com>
+     1	Lars Haugseth <git@larshaugseth.com>

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake/clean'
-require "rubygems"
-require "rubygems/package_task"
+require 'rake/gempackagetask'
 
 $:.unshift 'lib'
 require 'pry/version'
@@ -21,7 +20,7 @@ def apply_spec_defaults(s)
   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("ruby_parser","~>2.3.1")
   s.add_dependency("coderay","~>0.9.8")
   s.add_dependency("slop","~>2.1.0")
   s.add_dependency("method_source","~>0.6.5")
@@ -38,6 +37,13 @@ task :test do
   sh "bacon -Itest -rubygems -a -q"
 end
 
+desc "profile pry's startup time"
+task :profile do
+  require 'profile'
+  require 'pry'
+  Pry.start(TOPLEVEL_BINDING, :input => StringIO.new('exit'))
+end
+
 desc "run pry"
 task :pry do
   load 'bin/pry'
@@ -54,7 +60,7 @@ namespace :ruby do
     s.platform = Gem::Platform::RUBY
   end
 
-  Gem::PackageTask.new(spec) do |pkg|
+  Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -74,7 +80,7 @@ namespace :jruby do
     s.platform = "java"
   end
 
-  Gem::PackageTask.new(spec) do |pkg|
+  Rake::GemPackageTask.new(spec) do |pkg|
     pkg.need_zip = false
     pkg.need_tar = false
   end
@@ -89,7 +95,7 @@ end
       s.platform = "i386-#{v}"
     end
 
-    Gem::PackageTask.new(spec) do |pkg|
+    Rake::GemPackageTask.new(spec) do |pkg|
       pkg.need_zip = false
       pkg.need_tar = false
     end

data/bin/pry

@@ -15,14 +15,19 @@ end
 opts = Slop.parse(:help => true, :multiple_switches => false) do
   banner %{Usage: pry [OPTIONS]
 Start a Pry session.
-See: `https://github.com/banister` for more information.
+See: `https://github.com/pry` for more information.
+Copyright (c) 2011 John Mair (banisterfiend)
 --
 }
 
   on :e, :exec, "A line of code to execute in context before the session starts", true
 
   on "no-pager", "Disable pager for long output" do
-    Pry.pager = false
+    Pry.config.pager = false
+  end
+
+  on "no-history", "Disable history loading" do
+    Pry.config.history.should_load = false
   end
 
   on "no-color", "Disable syntax highlighting for session" do
@@ -39,7 +44,14 @@ See: `https://github.com/banister` for more information.
     Pry.config.plugins.enabled = false
   end
 
-  on "installed-plugins", "List installed plugins."
+  on "installed-plugins", "List installed plugins." do
+    puts "Installed Plugins:"
+    puts "--"
+    Pry.locate_plugins.each do |plugin|
+      puts "#{plugin.name}".ljust(18) + plugin.spec.summary
+    end
+    exit
+  end
 
   on "simple-prompt", "Enable simple prompt mode" do
     Pry.prompt = Pry::SIMPLE_PROMPT
@@ -65,15 +77,6 @@ See: `https://github.com/banister` for more information.
     )
 end
 
-if opts["installed-plugins"]
-  puts "Installed Plugins:"
-  puts "--"
-  Pry.locate_plugins.each do |plugin|
-    puts "#{plugin.name}".ljust(18) + plugin.spec.summary
-  end
-  exit
-end
-
 # invoked via cli
 Pry.cli = true
 

data/lib/pry.rb

@@ -1,5 +1,6 @@
 # (C) John Mair (banisterfiend) 2011
 # MIT License
+#
 
 require 'pp'
 require 'pry/helpers/base_helpers'
@@ -11,7 +12,7 @@ class Pry
       file = target.eval('__FILE__')
 
       # /unknown/ for rbx
-      if file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e"
+      if file == Pry.eval_path  || (file !~ /(\(.*\))|<.*>/ && file !~ /__unknown__/ && file != "" && file != "-e")
         _pry_.process_line("whereami 5", "", target)
       end
     end
@@ -31,7 +32,11 @@ class Pry
       stringified = "#<#{klass}:0x#{value.__id__.to_s(16)}>"
     end
 
-    Helpers::BaseHelpers.stagger_output("=> #{Helpers::BaseHelpers.colorize_code(stringified)}", output)
+    nonce = rand(0x100000000).to_s(16) # whatever
+
+    colorized = Helpers::BaseHelpers.colorize_code(stringified.gsub(/#</, "%<#{nonce}"))
+
+    Helpers::BaseHelpers.stagger_output("=> #{colorized.gsub(/%<(.*?)#{nonce}/, '#<\1')}", output)
   end
 
   # may be convenient when working with enormous objects and
@@ -60,42 +65,23 @@ class Pry
 
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
-                    proc { |target_self, nest_level, _|
+                    proc { |target_self, nest_level, pry|
                       if nest_level == 0
-                        "pry(#{Pry.view_clip(target_self)})> "
+                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})> "
                       else
-                        "pry(#{Pry.view_clip(target_self)}):#{nest_level}> "
+                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)}):#{nest_level}> "
                       end
                     },
 
-                    proc { |target_self, nest_level, _|
+                    proc { |target_self, nest_level, pry|
                       if nest_level == 0
-                        "pry(#{Pry.view_clip(target_self)})* "
+                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)})* "
                       else
-                        "pry(#{Pry.view_clip(target_self)}):#{nest_level}* "
+                        "[#{pry.input_array.size}] pry(#{Pry.view_clip(target_self)}):#{nest_level}* "
                       end
                     }
                    ]
 
-  # Deal with the ^D key being pressed, different behaviour in
-  # different cases:
-  # 1) In an expression     - behave like `!` command   (clear input buffer)
-  # 2) At top-level session - behave like `exit command (break out of repl loop)
-  # 3) In a nested session  - behave like `cd ..`       (pop a binding)
-  DEFAULT_CONTROL_D_HANDLER = proc do |eval_string, _pry_|
-    if !eval_string.empty?
-      # clear input buffer
-      eval_string.replace("")
-    elsif _pry_.binding_stack.one?
-      # ^D at top-level breaks out of loop
-      _pry_.binding_stack.clear
-      throw(:breakout)
-    else
-      # otherwise just pops a binding
-      _pry_.binding_stack.pop
-    end
-  end
-
   # A simple prompt - doesn't display target or nesting level
   SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
 
@@ -117,6 +103,25 @@ class Pry
                 end,
                ]
 
+  # Deal with the ^D key being pressed, different behaviour in
+  # different cases:
+  # 1) In an expression     - behave like `!` command   (clear input buffer)
+  # 2) At top-level session - behave like `exit command (break out of repl loop)
+  # 3) In a nested session  - behave like `cd ..`       (pop a binding)
+  DEFAULT_CONTROL_D_HANDLER = proc do |eval_string, _pry_|
+    if !eval_string.empty?
+      # clear input buffer
+      eval_string.replace("")
+    elsif _pry_.binding_stack.one?
+      # ^D at top-level breaks out of loop
+      _pry_.binding_stack.clear
+      throw(:breakout)
+    else
+      # otherwise just pops a binding
+      _pry_.binding_stack.pop
+    end
+  end
+
   DEFAULT_SYSTEM = proc do |output, cmd, _|
     if !system(cmd)
       output.puts "Error: there was a problem executing system command: #{cmd}"
@@ -144,6 +149,10 @@ class Pry
     end
   end
 
+  # CommandErrors are caught by the REPL loop and displayed to the user. They
+  # indicate an exceptional condition that's fatal to the current command.
+  class CommandError < StandardError
+  end
 end
 
 require "method_source"
@@ -153,7 +162,6 @@ require "stringio"
 require "coderay"
 require "optparse"
 require "slop"
-require "rubygems/dependency_installer"
 
 if RUBY_PLATFORM =~ /jruby/
   begin
@@ -173,6 +181,9 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 end
 
 require "pry/version"
+require "pry/rbx_method"
+require "pry/rbx_path"
+require "pry/method"
 require "pry/history_array"
 require "pry/helpers"
 require "pry/history"

data/lib/pry/command_context.rb

@@ -9,6 +9,7 @@ class Pry
     # give it a nice inspect
     def VOID_VALUE.inspect() "void" end
 
+    attr_accessor :command_name
     attr_accessor :output
     attr_accessor :target
     attr_accessor :target_self

data/lib/pry/command_processor.rb

@@ -126,7 +126,11 @@ class Pry
       # remove the one leading space if it exists
       arg_string.slice!(0) if arg_string.start_with?(" ")
 
-      args = arg_string ? Shellwords.shellwords(arg_string) : []
+      if arg_string
+        args = command.options[:shellwords] ? Shellwords.shellwords(arg_string) : arg_string.split(" ")
+      else
+        args = []
+      end
 
       options = {
         :val => val,
@@ -164,7 +168,10 @@ class Pry
 
       context.command_processor = self
 
-      ret = commands.run_command(context, command, *args)
+      ret = nil
+      catch(:command_done) do
+        ret = commands.run_command(context, command, *args)
+      end
 
       options[:val].replace("")
 

data/lib/pry/command_set.rb

@@ -11,6 +11,8 @@ class Pry
     class Command < Struct.new(:name, :description, :options, :block)
 
       def call(context, *args)
+        context.command_name = options[:listing]
+
         if stub_block = options[:stub_info]
           context.instance_eval(&stub_block)
         else
@@ -81,6 +83,9 @@ class Pry
     # @option options [Boolean] :use_prefix Whether the command uses
     #   `Pry.config.command_prefix` prefix (if one is defined). Defaults
     #   to true.
+    # @option options [Boolean] :shellwords Whether the command's arguments
+    #   should be split using Shellwords instead of just split on spaces.
+    #   Defaults to true.
     # @yield The action to perform. The parameters in the block
     #   determines the parameters the command will receive. All
     #   parameters passed into the block will be strings. Successive
@@ -118,6 +123,7 @@ class Pry
         :keep_retval => false,
         :argument_required => false,
         :interpolate => true,
+        :shellwords => true,
         :listing => name,
         :use_prefix => true
       }.merge!(options)
@@ -254,6 +260,7 @@ class Pry
       end
 
       command "install-command", "Install a disabled command." do |name|
+        require 'rubygems/dependency_installer' unless defined? Gem::DependencyInstaller
         command = find_command(name)
         stub_info = command.options[:stub_info]
 

data/lib/pry/config.rb

@@ -32,6 +32,10 @@ class Pry
     # @return [Array] The classes of exception that will not be caught by Pry.
     attr_accessor :exception_whitelist
 
+    # @return [Fixnum] The number of lines of context to show before and after
+    # the exception when using cat --ex.
+    attr_accessor :exception_window_size
+
     # Get/Set the Hash that defines Pry hooks used by default by all Pry
     # instances.
     # @return [Hash] The hooks used by default by all Pry instances.
@@ -126,6 +130,10 @@ class Pry
     #   The proc is passed the pry output object, the command string
     #   to eval, and a reference to the pry instance
     attr_accessor :system
+
+    # @return [Boolean] Whether or not code should be indented
+    #  using Pry::Indent.
+    attr_accessor :auto_indent
   end
 end
 

data/lib/pry/default_commands/basic.rb

@@ -21,24 +21,21 @@ class Pry
       end
 
       command "import-set", "Import a command set" do |command_set_name|
-        next output.puts "Provide a command set name" if command_set.nil?
+        raise CommandError, "Provide a command set name" if command_set.nil?
 
         set = target.eval(arg_string)
         _pry_.commands.import set
       end
 
       command "reload-method", "Reload the source file that contains the specified method" do |meth_name|
-        if (meth = get_method_object(meth_name, target, {})).nil?
-          output.puts "Invalid method name: #{meth_name}."
-          next
-        end
+        meth = get_method_or_raise(meth_name, target, {}, :omit_help)
 
-        if is_a_c_method?(meth)
-          output.puts "Error: Can't reload a C method."
-        elsif is_a_dynamically_defined_method?(meth)
-          output.puts "Error: Can't reload an eval method."
+        if meth.source_type == :c
+          raise CommandError, "Can't reload a C method."
+        elsif meth.dynamically_defined?
+          raise CommandError, "Can't reload an eval method."
         else
-          file_name = meth.source_location.first
+          file_name = meth.source_file
           load file_name
           output.puts "Reloaded #{file_name}."
         end

data/lib/pry/default_commands/context.rb

@@ -50,7 +50,7 @@ class Pry
         selection = selection.to_i
 
         if selection < 0 || selection > _pry_.binding_stack.size - 1
-          output.puts "Invalid binding index #{selection} - use `nesting` command to view valid indices."
+          raise CommandError, "Invalid binding index #{selection} - use `nesting` command to view valid indices."
         else
           Pry.start(_pry_.binding_stack[selection])
         end
@@ -137,42 +137,52 @@ class Pry
           i_num = 5
         end
 
-        meth_name = meth_name_from_binding(target)
-        meth_name = "N/A" if !meth_name
+        if (meth = Pry::Method.from_binding(target))
+          meth_name = meth.name
+        else
+          meth_name = "N/A"
+        end
 
-        if file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e"
-          output.puts "Cannot find local context. Did you use `binding.pry` ?"
-          next
+        if file != Pry.eval_path && (file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e")
+          raise CommandError, "Cannot find local context. Did you use `binding.pry`?"
         end
 
         set_file_and_dir_locals(file)
         output.puts "\n#{text.bold('From:')} #{file} @ line #{line_num} in #{klass}##{meth_name}:\n\n"
 
-        unless File.readable?(file)
-          output.puts "Cannot open #{file.inspect} for reading."
-          next
+        if file == Pry.eval_path
+          f = Pry.line_buffer[1..-1]
+        else
+          unless File.readable?(file)
+            raise CommandError, "Cannot open #{file.inspect} for reading."
+          end
+          f = File.open(file)
         end
 
         # This method inspired by http://rubygems.org/gems/ir_b
-        File.open(file).each_with_index do |line, index|
-          line_n = index + 1
-          next unless line_n > (line_num - i_num - 1)
-          break if line_n > (line_num + i_num)
-          if line_n == line_num
-            code =" =>#{line_n.to_s.rjust(3)}: #{line.chomp}"
-            if Pry.color
-              code = CodeRay.scan(code, :ruby).term
-            end
-            output.puts code
-            code
-          else
-            code = "#{line_n.to_s.rjust(6)}: #{line.chomp}"
-            if Pry.color
-              code = CodeRay.scan(code, :ruby).term
+        begin
+          f.each_with_index do |line, index|
+            line_n = index + 1
+            next unless line_n > (line_num - i_num - 1)
+            break if line_n > (line_num + i_num)
+            if line_n == line_num
+              code =" =>#{line_n.to_s.rjust(3)}: #{line.chomp}"
+              if Pry.color
+                code = CodeRay.scan(code, :ruby).term
+              end
+              output.puts code
+              code
+            else
+              code = "#{line_n.to_s.rjust(6)}: #{line.chomp}"
+              if Pry.color
+                code = CodeRay.scan(code, :ruby).term
+              end
+              output.puts code
+              code
             end
-            output.puts code
-            code
           end
+        ensure
+          f.close if f.respond_to?(:close)
         end
       end