pry 0.8.3-i386-mingw32 → 0.8.4pre1-i386-mingw32

data/lib/pry/helpers.rb

@@ -0,0 +1,2 @@
+require "pry/helpers/base_helpers"
+require "pry/helpers/command_helpers"

data/lib/pry/{command_base_helpers.rb → helpers/base_helpers.rb}

@@ -1,10 +1,29 @@
 class Pry
-  class CommandBase
-    module CommandBaseHelpers
+  module Helpers
+
+    module BaseHelpers
+      module_function
+
+      def silence_warnings
+        old_verbose = $VERBOSE
+        $VERBOSE = nil
+        begin
+          yield
+        ensure
+          $VERBOSE = old_verbose
+        end
+      end
 
-     private
+      # turn off color for duration of block
+      def no_color(&block)
+        old_color_state = Pry.color
+        Pry.color = false
+        yield
+      ensure
+        Pry.color = old_color_state
+      end
 
-     def gem_installed?(gem_name)
+      def gem_installed?(gem_name)
         require 'rubygems'
         !!Gem.source_index.find_name(gem_name).first
       end
@@ -16,6 +35,14 @@ class Pry
         end
       end
 
+      def set_file_and_dir_locals(file_name)
+        return if !target
+        $_file_temp = File.expand_path(file_name)
+        $_dir_temp =  File.dirname($_file_temp)
+        target.eval("_file_ = $_file_temp")
+        target.eval("_dir_ = $_dir_temp")
+      end
+
       def stub_proc(name, options)
         gems_needed = Array(options[:requires_gem])
         gems_not_installed = gems_needed.select { |g| !gem_installed?(g) }
@@ -49,15 +76,15 @@ class Pry
       #
 
       COLORS = {
-         "black" => 0,
-         "red" => 1,
-         "green" => 2,
-         "yellow" => 3,
-         "blue" => 4,
-         "purple" => 5,
-         "magenta" => 5,
-         "cyan" => 6,
-         "white" => 7
+        "black" => 0,
+        "red" => 1,
+        "green" => 2,
+        "yellow" => 3,
+        "blue" => 4,
+        "purple" => 5,
+        "magenta" => 5,
+        "cyan" => 6,
+        "white" => 7
       }
 
       COLORS.each do |color, i|
@@ -75,10 +102,10 @@ class Pry
 
       require 'set'
       VALID_COLORS = Set.new(
-        COLORS.keys +
-        COLORS.keys.map{|k| "bright_#{k}" } +
-        ["grey", "gray"]
-      )
+                             COLORS.keys +
+                             COLORS.keys.map{|k| "bright_#{k}" } +
+                             ["grey", "gray"]
+                             )
 
       def bold(text)
         Pry.color ? "\e[1m#{text}\e[0m" : text
@@ -106,7 +133,7 @@ class Pry
           if /<([\w\d_]+)>/ =~ token and VALID_COLORS.include?($1) #valid_tag?($1)
             stack.push $1
 
-          # token is a closing tag!
+            # token is a closing tag!
 
           elsif /<\/([\w\d_]+)>/ =~ token and VALID_COLORS.include?($1) # valid_tag?($1)
 
@@ -118,7 +145,7 @@ class Pry
               raise "Error: tried to close an unopened color tag -- #{token}"
             end
 
-          # token is a literal string!
+            # token is a literal string!
 
           else
 
@@ -237,5 +264,3 @@ class Pry
     end
   end
 end
-
-

data/lib/pry/{command_helpers.rb → helpers/command_helpers.rb}

@@ -1,8 +1,9 @@
 class Pry
-  class Commands < CommandBase
+  module Helpers
+
     module CommandHelpers
 
-      private
+      module_function
 
       def try_to_load_pry_doc
 
@@ -22,14 +23,6 @@ class Pry
         end
       end
 
-      def set_file_and_dir_locals(file_name)
-        return if !target
-        $_file_temp = File.expand_path(file_name)
-        $_dir_temp =  File.dirname($_file_temp)
-        target.eval("_file_ = $_file_temp")
-        target.eval("_dir_ = $_dir_temp")
-      end
-
       def add_line_numbers(lines, start_line)
         line_array = lines.each_line.to_a
         line_array.each_with_index.map do |line, idx|
@@ -56,21 +49,6 @@ class Pry
         end
       end
 
-      def editor_with_start_line(line_number)
-        case Pry.editor
-        when /^[gm]?vi/, /^emacs/, /^nano/, /^pico/, /^gedit/, /^kate/
-          "#{Pry.editor} +#{line_number}"
-        when /^mate/
-          "#{Pry.editor} -l#{line_number}"
-        else
-          if RUBY_PLATFORM =~ /mswin|mingw/
-            Pry.editor
-          else
-            "#{Pry.editor} +#{line_number}"
-          end
-        end
-      end
-
       def is_a_dynamically_defined_method?(meth)
         file, _ = meth.source_location
         !!(file =~ /(\(.*\))|<.*>/)
@@ -82,6 +60,13 @@ class Pry
         end
       end
 
+      def check_for_dynamically_defined_method(meth)
+        file, _ = meth.source_location
+        if file =~ /(\(.*\))|<.*>/
+          raise "Cannot retrieve source for dynamically defined method."
+        end
+      end
+
       def remove_first_word(text)
         text.split.drop(1).join(' ')
       end
@@ -91,8 +76,8 @@ class Pry
         old_color_state = Pry.color
         Pry.color = false
         yield
-        ensure
-          Pry.color = old_color_state
+      ensure
+        Pry.color = old_color_state
       end
 
       def code_and_code_type_for(meth)
@@ -126,23 +111,35 @@ class Pry
       end
 
       def get_method_object(meth_name, target, options)
+        if meth_name
+          if meth_name =~ /(\S+)\#(\S+)\Z/
+            context, meth_name = $1, $2
+            target = Pry.binding_for(target.eval(context))
+            options["instance-methods"] = true
+            options[:methods] = false
+          elsif meth_name =~ /(\S+)\.(\S+)\Z/
+            context, meth_name = $1, $2
+            target = Pry.binding_for(target.eval(context))
+            options["instance-methods"] = false
+            options[:methods] = true
+          end
+        else
+          meth_name = meth_name_from_binding(target)
+        end
+
         if !meth_name
           return nil
         end
 
-        if options[:M]
-          target.eval("instance_method(:#{meth_name})")
-        elsif options[:m]
-          target.eval("method(:#{meth_name})")
+        if options["instance-methods"]
+          target.eval("instance_method(:#{meth_name})") rescue nil
+        elsif options[:methods]
+          target.eval("method(:#{meth_name})") rescue nil
         else
           begin
             target.eval("instance_method(:#{meth_name})")
           rescue
-            begin
-              target.eval("method(:#{meth_name})")
-            rescue
-              return nil
-            end
+            target.eval("method(:#{meth_name})") rescue nil
           end
         end
       end
@@ -318,5 +315,6 @@ class Pry
       end
 
     end
+
   end
 end

data/lib/pry/pry_class.rb

@@ -101,7 +101,16 @@ class Pry
 
     # The default editor to use. Defaults to $EDITOR or nano if
     # $EDITOR is not defined.
-    # @return [String]
+    # If `editor` is a String then that string is used as the shell
+    # command to invoke the editor. If `editor` is callable (e.g a
+    # Proc) then `file` and `line` are passed in as parameters and the
+    # return value of that callable invocation is used as the exact
+    # shell command to invoke the editor.
+    # @example String
+    #   Pry.editor = "emacsclient"
+    # @example Callable
+    #   Pry.editor = proc { |file, line| "emacsclient #{file} +#{line}" }
+    # @return [String, #call]
     attr_accessor :editor
   end
 
@@ -190,20 +199,17 @@ class Pry
       :commands => Pry.commands
     }.merge!(options)
 
-    null_output = Object.new.tap { |v| v.instance_eval { def puts(*) end } }
+    null_output = StringIO.new
 
+    context = CommandContext.new
     commands = options[:commands]
 
-    commands.output = options[:show_output] ? options[:output] : null_output
-    commands.target = Pry.binding_for(options[:context])
+    context.opts        = {}
+    context.output      = options[:show_output] ? options[:output] : null_output
+    context.target      = Pry.binding_for(options[:context])
+    context.command_set = commands
 
-    cmd = commands.commands[name]
-    if cmd
-      action = cmd[:action]
-      commands.instance_exec(*Shellwords.shellwords(arg_string), &action)
-    else
-      raise "No such Pry command: #{name}"
-    end
+    commands.run_command(context, name, *Shellwords.shellwords(arg_string))
   end
 
   def self.default_editor_for_platform

data/lib/pry/pry_instance.rb

@@ -30,7 +30,7 @@ class Pry
     default_options.merge!(options)
 
     CONFIG_OPTIONS.each do |key|
-      instance_variable_set("@#{key}", default_options[key])
+      send "#{key}=", default_options[key]
     end
 
     @command_processor = CommandProcessor.new(self)
@@ -54,7 +54,7 @@ class Pry
   # @return [Pry] The parent of the current Pry session.
   def parent
     idx = Pry.sessions.index(self)
-    Pry.sessions[idx - 1] if idx > 0
+    Pry.sessions[idx - 1] if idx && idx > 0
   end
 
   # Execute the hook `hook_name`, if it is defined.
@@ -320,6 +320,63 @@ class Pry
     end
   end
 
+  # the array that the prompt stack is stored in
+  def prompt_stack
+    @prompt_stack ||= Array.new
+  end
+  private :prompt_stack
+
+  # The current prompt, this is the prompt at the top of the prompt stack.
+  # @return [Array<Proc>] Current prompt.
+  # @example
+  #    push_prompt(Pry::SIMPLE_PROMPT)
+  #    prompt # => Pry::SIMPLE_PROMPT
+  def prompt
+    prompt_stack.last
+  end
+
+  # Replaces the current prompt with the new prompt.
+  # Does not change the rest of the prompt stack.
+  # @param [Array<Proc>] new_prompt
+  # @return [Array<Proc>] new_prompt
+  # @example
+  #    pry.prompt = Pry::SIMPLE_PROMPT # => Pry::SIMPLE_PROMPT
+  #    pry.prompt # => Pry::SIMPLE_PROMPT
+  def prompt=(new_prompt)
+    if prompt_stack.empty?
+      push_prompt new_prompt
+    else
+      prompt_stack[-1] = new_prompt
+    end
+  end
+
+  # Pushes the current prompt onto a stack that it can be restored from later.
+  # Use this if you wish to temporarily change the prompt.
+  # @param [Array<Proc>] new_prompt
+  # @return [Array<Proc>] new_prompt
+  # @example
+  #    new_prompt = [ proc { '>' }, proc { '>>' } ]
+  #    push_prompt(new_prompt) # => new_prompt
+  def push_prompt(new_prompt)
+    prompt_stack.push new_prompt
+  end
+
+  # Pops the current prompt off of the prompt stack.
+  # If the prompt you are popping is the last prompt, it will not be popped.
+  # Use this to restore the previous prompt.
+  # @return [Array<Proc>] Prompt being popped.
+  # @example
+  #    prompt1 = [ proc { '>' }, proc { '>>' } ]
+  #    prompt2 = [ proc { '$' }, proc { '>' } ]
+  #    pry = Pry.new :prompt => prompt1
+  #    pry.push_prompt(prompt2)
+  #    pry.pop_prompt # => prompt2
+  #    pry.pop_prompt # => prompt1
+  #    pry.pop_prompt # => prompt1
+  def pop_prompt
+    if prompt_stack.size > 1 then prompt_stack.pop else prompt end
+  end
+
   if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE == "ruby"
     require 'ripper'
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.8.3"
+  VERSION = "0.8.4pre1"
 end

data/test/{test_helper.rb → helper.rb}

@@ -1,3 +1,10 @@
+unless Object.const_defined? 'Pry'
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'pry'
+end
+
+require 'bacon'
+
 # Ensure we do not execute any rc files
 Pry::RC_FILES.clear
 Pry.color = false
@@ -40,8 +47,7 @@ class Pry
 end
 
 
-class CommandTester < Pry::CommandBase
-
+CommandTester = Pry::CommandSet.new :test do
   command "command1", "command 1 test" do
     output.puts "command1"
   end

data/test/test_command_helpers.rb

@@ -0,0 +1,77 @@
+require 'helper'
+
+describe Pry::Helpers::CommandHelpers do
+  before do
+    @helper = Pry::Helpers::CommandHelpers
+  end
+
+  describe "get_method_object" do
+    it 'should look up instance methods if no methods available and no options provided' do
+      klass = Class.new { def hello; end }
+      meth = @helper.get_method_object(:hello, Pry.binding_for(klass), {})
+      meth.should == klass.instance_method(:hello)
+    end
+
+    it 'should look up methods if no instance methods available and no options provided' do
+      klass = Class.new { def self.hello; end }
+      meth = @helper.get_method_object(:hello, Pry.binding_for(klass), {})
+      meth.should == klass.method(:hello)
+    end
+
+    it 'should look up instance methods first even if methods available and no options provided' do
+      klass = Class.new { def hello; end; def self.hello; end  }
+      meth = @helper.get_method_object(:hello, Pry.binding_for(klass), {})
+      meth.should == klass.instance_method(:hello)
+    end
+
+    it 'should look up instance methods if "instance-methods"  option provided' do
+      klass = Class.new { def hello; end; def self.hello; end  }
+      meth = @helper.get_method_object(:hello, Pry.binding_for(klass), {"instance-methods" => true})
+      meth.should == klass.instance_method(:hello)
+    end
+
+    it 'should look up methods if :methods  option provided' do
+      klass = Class.new { def hello; end; def self.hello; end  }
+      meth = @helper.get_method_object(:hello, Pry.binding_for(klass), {:methods => true})
+      meth.should == klass.method(:hello)
+    end
+
+    it 'should look up instance methods using the Class#method syntax' do
+      klass = Class.new { def hello; end; def self.hello; end  }
+      meth = @helper.get_method_object("klass#hello", Pry.binding_for(binding), {})
+      meth.should == klass.instance_method(:hello)
+    end
+
+    it 'should look up methods using the object.method syntax' do
+      klass = Class.new { def hello; end; def self.hello; end  }
+      meth = @helper.get_method_object("klass.hello", Pry.binding_for(binding), {})
+      meth.should == klass.method(:hello)
+    end
+
+    it 'should NOT look up instance methods using the Class#method syntax if no instance methods defined' do
+      klass = Class.new { def self.hello; end  }
+      meth = @helper.get_method_object("klass#hello", Pry.binding_for(binding), {})
+      meth.should == nil
+    end
+
+    it 'should NOT look up methods using the object.method syntax if no methods defined' do
+      klass = Class.new { def hello; end  }
+      meth = @helper.get_method_object("klass.hello", Pry.binding_for(binding), {})
+      meth.should == nil
+    end
+
+    it 'should look up methods using klass.new.method syntax' do
+      klass = Class.new { def hello; :hello; end }
+      meth = @helper.get_method_object("klass.new.hello", Pry.binding_for(binding), {})
+      meth.name.to_sym.should == :hello
+    end
+
+    it 'should look up instance methods using klass.meth#method syntax' do
+      klass = Class.new { def self.meth; Class.new; end }
+      meth = @helper.get_method_object("klass.meth#initialize", Pry.binding_for(binding), {})
+      meth.name.to_sym.should == :initialize
+    end
+  end
+end
+
+