pry 0.9.9.6pre2-i386-mswin32 → 0.9.10-i386-mswin32

data/lib/pry/config.rb

@@ -145,6 +145,10 @@ class Pry
     # @return [Boolean]
     attr_accessor :should_load_rc
 
+    # Determines whether the local rc file (./.pryrc) should be loaded.
+    # @return [Boolean]
+    attr_accessor :should_load_local_rc
+
     # Determines whether plugins should be loaded.
     # @return [Boolean]
     attr_accessor :should_load_plugins

data/lib/pry/core_extensions.rb

@@ -1,53 +1,110 @@
 class Object
-  # Start a Pry REPL.  This method only differs from Pry.start in that it
-  # assumes that the target is `self`.  It also accepts and passses the same
-  # exact options hash that Pry.start accepts. POSSIBLE DEPRICATION WARNING:
-  # In the future the backwards compatibility with pry(binding) could be
-  # removed so please properly use Object.pry or if you use pry(binding)
-  # switch Pry.start(binding).
-
-  # @param [Binding] the binding or options hash if no binding needed.
-  # @param [Hash] the options hash.
-  # @example First
-  #   "dummy".pry
-  # @example Second
+  # Start a Pry REPL on self.
+  #
+  # If `self` is a Binding then that will be used to evaluate expressions;
+  # otherwise a new binding will be created.
+  #
+  # @param [Object] object  the object or binding to pry
+  #                         (__deprecated__, use `object.pry`)
+  # @param [Hash] hash  the options hash
+  # @example With a binding
   #    binding.pry
-  # @example An example with options
+  # @example On any object
+  #   "dummy".pry
+  # @example With options
   #   def my_method
   #     binding.pry :quiet => true
   #   end
   #   my_method()
-
-  def pry(*args)
-    if args.first.is_a?(Hash) || args.length == 0
-      args.unshift(self)
+  # @see Pry.start
+  def pry(object=nil, hash={})
+    if object.nil? || Hash === object
+      Pry.start(self, object || {})
+    else
+      Pry.start(object, hash)
     end
-    
-    Pry.start(*args)
   end
 
   # Return a binding object for the receiver.
+  #
+  # The `self` of the binding is set to the current object, and it contains no
+  # local variables.
+  #
+  # The default definee (http://yugui.jp/articles/846) is set such that:
+  #
+  # * If `self` is a class or module, then new methods created in the binding
+  #   will be defined in that class or module (as in `class Foo; end`).
+  # * If `self` is a normal object, then new methods created in the binding will
+  #   be defined on its singleton class (as in `class << self; end`).
+  # * If `self` doesn't have a  real singleton class (i.e. it is a Fixnum, Float,
+  #   Symbol, nil, true, or false), then new methods will be created on the
+  #   object's class (as in `self.class.class_eval{ }`)
+  #
+  # Newly created constants, including classes and modules, will also be added
+  # to the default definee.
+  #
+  # @return [Binding]
   def __binding__
+    # When you're cd'd into a class, methods you define should be added to it.
     if is_a?(Module)
+      # class_eval sets both self and the default definee to this class.
       return class_eval "binding"
     end
 
-    unless respond_to? :__binding_impl__
+    unless respond_to?(:__pry__)
+      binding_impl_method = [<<-METHOD, __FILE__, __LINE__ + 1]
+        # Get a binding with 'self' set to self, and no locals.
+        #
+        # The default definee is determined by the context in which the
+        # definition is eval'd.
+        #
+        # Please don't call this method directly, see {__binding__}.
+        #
+        # @return [Binding]
+        def __pry__
+          binding
+        end
+      METHOD
+
+      # The easiest way to check whether an object has a working singleton class
+      # is to try and define a method on it. (just checking for the presence of
+      # the singleton class gives false positives for `true` and `false`).
+      # __pry__ is just the closest method we have to hand, and using
+      # it has the nice property that we can memoize this check.
       begin
-        instance_eval %{
-          def __binding_impl__
-            binding
-          end
-        }
+        # instance_eval sets the default definee to the object's singleton class
+        instance_eval(*binding_impl_method)
+
+      # If we can't define methods on the Object's singleton_class. Then we fall
+      # back to setting the default definee to be the Object's class. That seems
+      # nicer than having a REPL in which you can't define methods.
       rescue TypeError
-        self.class.class_eval %{
-          def __binding_impl__
-            binding
-          end
-        }
+        # class_eval sets the default definee to self.class
+        self.class.class_eval(*binding_impl_method)
       end
     end
 
-    __binding_impl__
+    __pry__
+  end
+end
+
+# There's a splat bug on jruby in 1.9 emulation mode, which breaks the
+# pp library.
+#
+# * http://jira.codehaus.org/browse/JRUBY-6687
+# * https://github.com/pry/pry/issues/568
+#
+# Until that gets fixed upstream, let's monkey-patch here:
+if [[1, 2]].pretty_inspect == "[1]\n"
+  class Array
+    def pretty_print(q)
+      q.group(1, '[', ']') {
+        i = 0
+        q.seplist(self) { |*|
+          q.pp self[i]
+          i += 1
+        }
+      }
+    end
   end
 end

data/lib/pry/default_commands/cd.rb

@@ -9,41 +9,63 @@ class Pry
           Usage: cd [OPTIONS] [--help]
 
           Move into new context (object or scope). As in unix shells use
-          `cd ..` to go back and `cd /` to return to Pry top-level).
-          Complex syntax (e.g cd ../@x/y) also supported.
+          `cd ..` to go back, `cd /` to return to Pry top-level and `cd -`
+          to toggle between last two scopes).
+          Complex syntax (e.g `cd ../@x/y`) also supported.
 
           e.g: `cd @x`
-          e.g: `cd ..
+          e.g: `cd ..`
           e.g: `cd /`
+          e.g: `cd -`
 
           https://github.com/pry/pry/wiki/State-navigation#wiki-Changing_scope
         BANNER
 
         def process
-          path   = arg_string.split(/\//)
-          stack  = _pry_.binding_stack.dup
+          # Extract command arguments. Delete blank arguments like " ", but
+          # don't delete empty strings like "".
+          path      = arg_string.split(/\//).delete_if { |a| a =~ /\A\s+\z/ }
+          stack     = _pry_.binding_stack.dup
+          old_stack = state.old_stack || []
 
-          # special case when we only get a single "/", return to root
-          stack  = [stack.first] if path.empty?
+          # Special case when we only get a single "/", return to root.
+          if path.empty?
+            state.old_stack = stack.dup unless old_stack.empty?
+            stack = [stack.first]
+          end
 
-          path.each do |context|
+          path.each_with_index do |context, i|
             begin
               case context.chomp
               when ""
+                state.old_stack = stack.dup
                 stack = [stack.first]
               when "::"
+                state.old_stack = stack.dup
                 stack.push(TOPLEVEL_BINDING)
               when "."
                 next
               when ".."
                 unless stack.size == 1
+                  # Don't rewrite old_stack if we're in complex expression
+                  # (e.g.: `cd 1/2/3/../4).
+                  state.old_stack = stack.dup if path.first == ".."
                   stack.pop
                 end
+              when "-"
+                unless old_stack.empty?
+                  # Interchange current stack and old stack with each other.
+                  stack, state.old_stack = state.old_stack, stack
+                end
               else
+                state.old_stack = stack.dup if i == 0
                 stack.push(Pry.binding_for(stack.last.eval(context)))
               end
 
             rescue RescuableException => e
+              # Restore old stack to its initial values.
+              state.old_stack = old_stack
+
               output.puts "Bad object path: #{arg_string.chomp}. Failed trying to resolve: #{context}"
               output.puts e.inspect
               return
@@ -52,6 +74,7 @@ class Pry
 
           _pry_.binding_stack = stack
         end
+
       end
     end
   end

data/lib/pry/default_commands/context.rb

@@ -1,6 +1,7 @@
 require "pry/default_commands/ls"
 require "pry/default_commands/cd"
 require "pry/default_commands/find_method"
+require "pry/default_commands/whereami"
 
 class Pry
   module DefaultCommands
@@ -9,62 +10,7 @@ class Pry
       import Ls
       import Cd
       import FindMethod
-
-      create_command "whereami" do
-        description "Show code surrounding the current context."
-        banner <<-BANNER
-          Usage: whereami [OPTIONS]
-        BANNER
-
-        def setup
-          @method = Pry::Method.from_binding(target)
-        end
-
-        def process
-          if show_method?
-            file   = @method.source_file
-            start  = @method.source_range.begin
-            finish = @method.source_range.end
-            marker = target.eval("__LINE__")
-          else
-            file   = target.eval("__FILE__")
-            start  = target.eval("__LINE__")
-            finish = (args.first && args.first.to_i) || 5
-            marker = start
-          end
-
-          if invalid_file?(file)
-            raise Pry::CommandError,
-            "Cannot find local context. Did you use binding.pry?"
-          end
-
-          # TODO: refactor.
-          if show_method?
-            code = Pry::Code.from_file(file).between(start, finish)
-          else
-            code = Pry::Code.from_file(file).around(start, finish)
-          end
-
-          desc = (@method && @method.name_with_owner) || ""
-
-          if !code.empty?
-            output.puts "\n#{text.bold('From:')} #{file} @ line #{start} #{desc}:\n\n"
-            output.puts code.with_line_numbers.with_marker(marker)
-            output.puts
-          end
-        end
-
-        private
-
-        def show_method?
-          args.empty? && @method && !@method.instance_of?(Pry::Method::Disowned) && @method.source_range.count < 20
-        end
-
-        def invalid_file?(file)
-          file != Pry.eval_path &&
-          (file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e")
-        end
-      end
+      import Whereami
 
       create_command "pry-backtrace", "Show the backtrace for the Pry session." do
         banner <<-BANNER
@@ -91,7 +37,7 @@ class Pry
         exec "pry"
       end
 
-      create_command /wtf([?!]*)/, "Show the backtrace of the most recent exception" do
+      create_command(/wtf([?!]*)/, "Show the backtrace of the most recent exception") do
         options :listing => 'wtf?'
 
         banner <<-BANNER
@@ -127,7 +73,7 @@ class Pry
       end
 
       # N.B. using a regular expresion here so that "raise-up 'foo'" does the right thing.
-      create_command /raise-up(!?\b.*)/, :listing => 'raise-up' do
+      create_command(/raise-up(!?\b.*)/, :listing => 'raise-up') do
         description "Raise an exception out of the current pry instance."
         banner <<-BANNER
           Raise up, like exit, allows you to quit pry. Instead of returning a value however, it raises an exception.

data/lib/pry/default_commands/easter_eggs.rb

@@ -77,7 +77,7 @@ end
           \____/   \________________________|
         EOS
 
-        if defined?(Win32::Console)
+        if windows_ansi?
           move_up = proc { |n| "\e[#{n}F" }
         else
           move_up = proc { |n| "\e[#{n}A\e[0G" }

data/lib/pry/default_commands/editing.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'shellwords'
 require 'pry/default_commands/hist'
 
 class Pry
@@ -37,10 +38,10 @@ class Pry
         BANNER
 
         def options(opt)
-          opt.on :e, :ex, "Open the file that raised the most recent exception (_ex_.file)", :optional => true, :as => Integer
-          opt.on :i, :in, "Open a temporary file containing the Nth line of _in_. N may be a range.", :optional => true, :as => Range, :default => -1..-1
+          opt.on :e, :ex, "Open the file that raised the most recent exception (_ex_.file)", :optional_argument => true, :as => Integer
+          opt.on :i, :in, "Open a temporary file containing the Nth input expression. N may be a range.", :optional_argument => true, :as => Range, :default => -1..-1
           opt.on :t, :temp, "Open an empty temporary file"
-          opt.on :l, :line, "Jump to this line in the opened file", true, :as => Integer
+          opt.on :l, :line, "Jump to this line in the opened file", :argument => true, :as => Integer
           opt.on :n, :"no-reload", "Don't automatically reload the edited code"
           opt.on :c, :"current", "Open the current __FILE__ and at __LINE__ (as returned by `whereami`)."
           opt.on :r, :reload, "Reload the edited code immediately (default for ruby files)"
@@ -89,6 +90,7 @@ class Pry
             f.puts(content)
             f.flush
             reload = !opts.present?(:'no-reload') && !Pry.config.disable_auto_reload
+            f.close(false)
             invoke_editor(f.path, line, reload)
             if reload
               silence_warnings do
@@ -140,8 +142,12 @@ class Pry
           line = opts[:l].to_i if opts.present?(:line)
 
           reload = opts.present?(:reload) || ((opts.present?(:ex) || file_name.end_with?(".rb")) && !opts.present?(:'no-reload')) && !Pry.config.disable_auto_reload
-          invoke_editor(file_name, line, reload)
-          set_file_and_dir_locals(file_name)
+
+          # Sanitize blanks.
+          sanitized_file_name = Shellwords.escape(file_name)
+
+          invoke_editor(sanitized_file_name, line, reload)
+          set_file_and_dir_locals(sanitized_file_name)
 
           if reload
             silence_warnings do
@@ -209,6 +215,7 @@ class Pry
           temp_file do |f|
             f.puts lines.join
             f.flush
+            f.close(false)
             invoke_editor(f.path, 0, true)
 
             if @method.alias?
@@ -352,26 +359,26 @@ class Pry
         end
 
         def options(opt)
-          opt.on :m, :method, "Play a method's source.", true do |meth_name|
+          opt.on :m, :method, "Play a method's source.", :argument => true do |meth_name|
             meth = get_method_or_raise(meth_name, target, {})
             self.content << meth.source
           end
-          opt.on :d, :doc, "Play a method's documentation.", true do |meth_name|
+          opt.on :d, :doc, "Play a method's documentation.", :argument => true do |meth_name|
             meth = get_method_or_raise(meth_name, target, {})
             text.no_color do
-              self.content << process_comment_markup(meth.doc, :ruby)
+              self.content << process_comment_markup(meth.doc)
             end
           end
-          opt.on :c, :command, "Play a command's source.", true do |command_name|
+          opt.on :c, :command, "Play a command's source.", :argument => true do |command_name|
             command = find_command(command_name)
-            block = Pry::Method.new(find_command(command_name).block)
+            block = Pry::Method.new(command.block)
             self.content << block.source
           end
-          opt.on :f, :file, "Play a file.", true do |file|
+          opt.on :f, :file, "Play a file.", :argument => true do |file|
             self.content << File.read(File.expand_path(file))
           end
-          opt.on :l, :lines, "Only play a subset of lines.", :optional => true, :as => Range, :default => 1..-1
-          opt.on :i, :in, "Play entries from Pry's input expression history. Takes an index or range. Note this can only replay pure Ruby code, not Pry commands.", :optional => true,
+          opt.on :l, :lines, "Only play a subset of lines.", :optional_argument => true, :as => Range, :default => 1..-1
+          opt.on :i, :in, "Play entries from Pry's input expression history. Takes an index or range. Note this can only replay pure Ruby code, not Pry commands.", :optional_argument => true,
           :as => Range, :default => -5..-1 do |range|
             input_expressions = _pry_.input_array[range] || []
             Array(input_expressions).each { |v| self.content << v }
@@ -389,7 +396,7 @@ class Pry
             begin
               self.content << target.eval(arg)
             rescue Pry::RescuableException
-              raise CommandError, "Prblem when evaling #{arg}."
+              raise CommandError, "Problem when evaling #{arg}."
             end
           end
         end

data/lib/pry/default_commands/find_method.rb

@@ -18,8 +18,8 @@ class Pry
           Use the `-n` switch (the default) to search for methods whose name matches the given regex.
           Use the `-c` switch to search for methods that contain the given code.
 
-          e.g find re Pry                # find all methods whose name match /re/ inside the Pry namespace. Matches Pry#repl, etc.
-          e.g find -c 'output.puts' Pry  # find all methods that contain the code: output.puts inside the Pry namepsace.
+          e.g find-method re Pry                # find all methods whose name match /re/ inside the Pry namespace. Matches Pry#repl, etc.
+          e.g find-method -c 'output.puts' Pry  # find all methods that contain the code: output.puts inside the Pry namepsace.
         BANNER
 
         def setup
@@ -90,9 +90,7 @@ class Pry
         # @yieldparam klazz  Each class/module in the namespace.
         #
         def recurse_namespace(klass, done={}, &block)
-          if done[klass] || !(Module === klass)
-            return
-          end
+          return if !(Module === klass) || done[klass]
 
           done[klass] = true
 
@@ -102,7 +100,7 @@ class Pry
             next if klass.autoload?(name)
             begin
               const = klass.const_get(name)
-            rescue RescuableException => e
+            rescue RescuableException
               # constant loading is an inexact science at the best of times,
               # this often happens when a constant was .autoload? but someone
               # tried to load it. It's now not .autoload? but will still raise
@@ -160,7 +158,7 @@ class Pry
           search_all_methods(namespace) do |meth|
             begin
               meth.source =~ regex
-            rescue RescuableException => e
+            rescue RescuableException
               false
             end
           end