pry 0.10.2-i386-mswin32 → 1.0.0.pre1-i386-mswin32

data/lib/pry/core_extensions.rb

@@ -89,7 +89,7 @@ class Object
       # 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, Pry::FrozenObjectException
+      rescue TypeError
         # class_eval sets the default definee to self.class
         self.class.class_eval(*Pry::BINDING_METHOD_IMPL)
       end
@@ -99,33 +99,23 @@ class Object
   end
 end
 
-class BasicObject
-  # 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 new
-  # methods defined will be added to the singleton class of the BasicObject.
-  #
-  # @return [Binding]
-  def __binding__
-    # BasicObjects don't have respond_to?, so we just define the method
-    # every time. As they also don't have `.freeze`, this call won't
-    # fail as it can for normal Objects.
-    (class << self; self; end).class_eval <<-EOF, __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__
-        ::Kernel.binding
-      end
-    EOF
-    self.__pry__
+# 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/custom_completions.rb

@@ -0,0 +1,6 @@
+class Pry
+
+  # This proc will be instance_eval's against the active Pry instance
+  DEFAULT_CUSTOM_COMPLETIONS = proc { commands.commands.keys }
+  FILE_COMPLETIONS = proc { commands.commands.keys + Dir.entries('.') }
+end

data/lib/pry/editor.rb

@@ -1,135 +1,129 @@
 class Pry
   class Editor
-    include Pry::Helpers::BaseHelpers
-    include Pry::Helpers::CommandHelpers
-
-    attr_reader :_pry_
-
-    def initialize(_pry_)
-      @_pry_ = _pry_
-    end
-
-    def edit_tempfile_with_content(initial_content, line=1)
-      temp_file do |f|
-        f.puts(initial_content)
-        f.flush
-        f.close(false)
-        invoke_editor(f.path, line, true)
-        File.read(f.path)
+    extend Pry::Helpers::BaseHelpers
+    extend Pry::Helpers::CommandHelpers
+
+    class << self
+      def edit_tempfile_with_content(initial_content, line=1)
+        temp_file do |f|
+          f.puts(initial_content)
+          f.flush
+          f.close(false)
+          invoke_editor(f.path, line, true)
+          File.read(f.path)
+        end
       end
-    end
 
-    def invoke_editor(file, line, blocking=true)
-      raise CommandError, "Please set Pry.config.editor or export $VISUAL or $EDITOR" unless _pry_.config.editor
+      def invoke_editor(file, line, blocking=true)
+        raise CommandError, "Please set Pry.config.editor or export $VISUAL or $EDITOR" unless Pry.config.editor
 
-      editor_invocation = build_editor_invocation_string(file, line, blocking)
-      return nil unless editor_invocation
+        editor_invocation = build_editor_invocation_string(file, line, blocking)
+        return nil unless editor_invocation
 
-      if jruby?
-        open_editor_on_jruby(editor_invocation)
-      else
-        open_editor(editor_invocation)
+        if jruby?
+          open_editor_on_jruby(editor_invocation)
+        else
+          open_editor(editor_invocation)
+        end
       end
-    end
 
-    private
+      private
 
-    # Generate the string that's used to start the editor. This includes
-    # all the flags we want as well as the file and line number we
-    # want to open at.
-    def build_editor_invocation_string(file, line, blocking)
+      # Generate the string that's used to start the editor. This includes
+      # all the flags we want as well as the file and line number we
+      # want to open at.
+      def build_editor_invocation_string(file, line, blocking)
 
-      if _pry_.config.editor.respond_to?(:call)
-        args = [file, line, blocking][0...(_pry_.config.editor.arity)]
-        _pry_.config.editor.call(*args)
-      else
-        sanitized_file = if windows?
-                            file.gsub(/\//, '\\')
-                          else
-                            Shellwords.escape(file)
-                          end
+        if Pry.config.editor.respond_to?(:call)
+          args = [file, line, blocking][0...(Pry.config.editor.arity)]
+          Pry.config.editor.call(*args)
+        else
+          sanitized_file = if windows?
+                             file.gsub(/\//, '\\')
+                           else
+                             Shellwords.escape(file)
+                           end
 
-        "#{_pry_.config.editor} #{blocking_flag_for_editor(blocking)} #{start_line_syntax_for_editor(sanitized_file, line)}"
+          "#{Pry.config.editor} #{blocking_flag_for_editor(blocking)} #{start_line_syntax_for_editor(sanitized_file, line)}"
+        end
       end
-    end
 
-    # Start the editor running, using the calculated invocation string
-    def open_editor(editor_invocation)
-      # Note we dont want to use Pry.config.system here as that
-      # may be invoked non-interactively (i.e via Open4), whereas we want to
-      # ensure the editor is always interactive
-      system(*Shellwords.split(editor_invocation)) or raise CommandError, "`#{editor_invocation}` gave exit status: #{$?.exitstatus}"
-    end
+      # Start the editor running, using the calculated invocation string
+      def open_editor(editor_invocation)
+        # Note we dont want to use Pry.config.system here as that
+        # may be invoked non-interactively (i.e via Open4), whereas we want to
+        # ensure the editor is always interactive
+        system(editor_invocation) or raise CommandError, "`#{editor_invocation}` gave exit status: #{$?.exitstatus}"
+      end
 
-    # We need JRuby specific code here cos just shelling out using
-    # system() appears to be pretty broken :/
-    def open_editor_on_jruby(editor_invocation)
-      begin
-        require 'spoon'
-        pid = Spoon.spawnp(*Shellwords.split(editor_invocation))
-        Process.waitpid(pid)
-      rescue FFI::NotFoundError
-        system(editor_invocation)
+      # We need JRuby specific code here cos just shelling out using
+      # system() appears to be pretty broken :/
+      def open_editor_on_jruby(editor_invocation)
+        begin
+          require 'spoon'
+          pid = Spoon.spawnp(*editor_invocation.split)
+          Process.waitpid(pid)
+        rescue FFI::NotFoundError
+          system(editor_invocation)
+        end
       end
-    end
 
-    # Some editors that run outside the terminal allow you to control whether or
-    # not to block the process from which they were launched (in this case, Pry).
-    # For those editors, return the flag that produces the desired behavior.
-    def blocking_flag_for_editor(blocking)
-      case editor_name
-      when /^emacsclient/
-        '--no-wait' unless blocking
-      when /^[gm]vim/
-        '--nofork' if blocking
-      when /^jedit/
-        '-wait' if blocking
-      when /^mate/, /^subl/, /^redcar/
-        '-w' if blocking
+      # Some editors that run outside the terminal allow you to control whether or
+      # not to block the process from which they were launched (in this case, Pry).
+      # For those editors, return the flag that produces the desired behavior.
+      def blocking_flag_for_editor(blocking)
+        case editor_name
+        when /^emacsclient/
+          '--no-wait' unless blocking
+        when /^[gm]vim/
+          '--nofork' if blocking
+        when /^jedit/
+          '-wait' if blocking
+        when /^mate/, /^subl/
+          '-w' if blocking
+        end
       end
-    end
 
-    # Return the syntax for a given editor for starting the editor
-    # and moving to a particular line within that file
-    def start_line_syntax_for_editor(file_name, line_number)
-      # special case for 1st line
-      return file_name if line_number <= 1
+      # Return the syntax for a given editor for starting the editor
+      # and moving to a particular line within that file
+      def start_line_syntax_for_editor(file_name, line_number)
+        # special case for 1st line
+        return file_name if line_number <= 1
 
-      case editor_name
-      when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
-        "+#{line_number} #{file_name}"
-      when /^mate/, /^geany/
-        "-l #{line_number} #{file_name}"
-      when /^subl/
-        "#{file_name}:#{line_number}"
-      when /^uedit32/
-        "#{file_name}/#{line_number}"
-      when /^jedit/
-        "#{file_name} +line:#{line_number}"
-      when /^redcar/
-        "-l#{line_number} #{file_name}"
-      else
-        if windows?
-          "#{file_name}"
-        else
+        case editor_name
+        when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
           "+#{line_number} #{file_name}"
+        when /^mate/, /^geany/
+          "-l #{line_number} #{file_name}"
+        when /^subl/
+          "#{file_name}:#{line_number}"
+        when /^uedit32/
+          "#{file_name}/#{line_number}"
+        when /^jedit/
+          "#{file_name} +line:#{line_number}"
+        else
+          if windows?
+            "#{file_name}"
+          else
+            "+#{line_number} #{file_name}"
+          end
         end
       end
-    end
 
-    # Get the name of the binary that Pry.config.editor points to.
-    #
-    # This is useful for deciding which flags we pass to the editor as
-    # we can just use the program's name and ignore any absolute paths.
-    #
-    # @example
-    #   Pry.config.editor="/home/conrad/bin/textmate -w"
-    #   editor_name
-    #   # => textmate
-    #
-    def editor_name
-      File.basename(_pry_.config.editor).split(" ").first
-    end
+      # Get the name of the binary that Pry.config.editor points to.
+      #
+      # This is useful for deciding which flags we pass to the editor as
+      # we can just use the program's name and ignore any absolute paths.
+      #
+      # @example
+      #   Pry.config.editor="/home/conrad/bin/textmate -w"
+      #   editor_name
+      #   # => textmate
+      #
+      def editor_name
+        File.basename(Pry.config.editor).split(" ").first
+      end
 
+    end
   end
 end

data/lib/pry/helpers/base_helpers.rb

@@ -42,12 +42,25 @@ class Pry
         end
       end
 
+      def set_file_and_dir_locals(file_name, _pry_=_pry_(), target=target())
+        return if !target or !file_name
+        _pry_.last_file = File.expand_path(file_name)
+        _pry_.inject_local("_file_", _pry_.last_file, target)
+
+        _pry_.last_dir = File.dirname(_pry_.last_file)
+        _pry_.inject_local("_dir_", _pry_.last_dir, target)
+      end
+
       def use_ansi_codes?
         windows_ansi? || ENV['TERM'] && ENV['TERM'] != "dumb"
       end
 
       def colorize_code(code)
-        CodeRay.scan(code, :ruby).term
+        if Pry.color
+          CodeRay.scan(code, :ruby).term
+        else
+          code
+        end
       end
 
       def highlight(string, regexp, highlight_color=:bright_yellow)
@@ -57,7 +70,7 @@ class Pry
       # formatting
       def heading(text)
         text = "#{text}\n--"
-        "\e[1m#{text}\e[0m"
+        Pry.color ? "\e[1m#{text}\e[0m": text
       end
 
       # have fun on the Windows platform.
@@ -67,7 +80,7 @@ class Pry
 
       # are we able to use ansi on windows?
       def windows_ansi?
-        defined?(Win32::Console) || ENV['ANSICON'] || (windows? && mri_2?)
+        defined?(Win32::Console) || ENV['ANSICON']
       end
 
       def jruby?
@@ -75,39 +88,113 @@ class Pry
       end
 
       def jruby_19?
-        jruby? && RbConfig::CONFIG['ruby_version'] == '1.9'
+        RbConfig::CONFIG['ruby_install_name'] == 'jruby' &&
+          RbConfig::CONFIG['ruby_version'] == '1.9'
       end
 
       def rbx?
         RbConfig::CONFIG['ruby_install_name'] == 'rbx'
       end
 
-      def mri?
-        RbConfig::CONFIG['ruby_install_name'] == 'ruby'
+      def mri_18?
+        RUBY_VERSION =~ /1.8/ && RbConfig::CONFIG['ruby_install_name'] == 'ruby'
       end
 
       def mri_19?
-        mri? && RUBY_VERSION =~ /^1\.9/
+        RUBY_VERSION =~ /1.9/ && RbConfig::CONFIG['ruby_install_name'] == 'ruby'
       end
 
-      def mri_2?
-        mri? && RUBY_VERSION =~ /^2/
-      end
-
-      def mri_20?
-        mri? && RUBY_VERSION =~ /^2\.0/
-      end
+      # Try to use `less` for paging, if it fails then use
+      # simple_pager. Also do not page if Pry.pager is falsey
+      def stagger_output(text, out = nil)
+        out ||= case
+                when respond_to?(:output)
+                  # Mixin.
+                  output
+                when Pry.respond_to?(:output)
+                  # Parent.
+                  Pry.output
+                else
+                  # Sys.
+                  $stdout
+                end
+
+        if text.lines.count < Pry::Pager.page_size || !Pry.pager
+          out.puts text
+        else
+          Pry::Pager.page(text)
+        end
+      rescue Errno::ENOENT
+        Pry::Pager.page(text, :simple)
+      rescue Errno::EPIPE
+      end
+
+      # @param [String] arg_string The object path expressed as a string.
+      # @param [Pry] _pry_ The relevant Pry instance.
+      # @param [Array<Binding>] old_stack The state of the old binding stack
+      # @return [Array<Array<Binding>, Array<Binding>>] An array
+      #   containing two elements: The new `binding_stack` and the old `binding_stack`.
+      def context_from_object_path(arg_string, _pry_=nil, old_stack=[])
+
+        # 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
+        state_old_stack = old_stack
+
+        # 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
 
-      def mri_21?
-        mri? && RUBY_VERSION =~ /^2\.1/
+        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
+
+            msg = [
+              "Bad object path: #{arg_string}.",
+              "Failed trying to resolve: #{context}.",
+              e.inspect
+            ].join(' ')
+
+            CommandError.new(msg).tap do |err|
+              err.set_backtrace e.backtrace
+              raise err
+            end
+          end
+        end
+        return stack, state_old_stack
       end
 
-      # Send the given text through the best available pager (if Pry.config.pager is
-      # enabled). Infers where to send the output if used as a mixin.
-      # DEPRECATED.
-      def stagger_output(text, out = nil)
-        Pry.new.pager.page text
-      end
     end
   end
 end