pry 0.9.6.1-i386-mswin32 → 0.9.6.2-i386-mswin32

data/lib/pry/default_commands/shell.rb

@@ -61,8 +61,8 @@ class Pry
             start_line = (ex_line - 1) - window_size
             start_line = start_line < 0 ? 0 : start_line
             end_line = (ex_line - 1) + window_size
-            if ex_file && RbxPath.is_core_path?(ex_file)
-              file_name = RbxPath.convert_path_to_full(ex_file)
+            if ex_file && is_core_rbx_path?(ex_file)
+              file_name = rbx_convert_path_to_full(ex_file)
             else
               file_name = ex_file
             end

data/lib/pry/extended_commands/experimental.rb

@@ -4,8 +4,12 @@ class Pry
     Experimental = Pry::CommandSet.new do
 
       command "reload-method", "Reload the source specifically for a method", :requires_gem => "method_reload" do |meth_name|
-        meth = get_method_or_print_error(meth_name, target, {}, :no_cmd)
-        meth.reload if meth
+        if (meth = get_method_object(meth_name, target, {})).nil?
+          output.puts "Invalid method name: #{meth_name}."
+          next
+        end
+
+        meth.reload
       end
     end
   end

data/lib/pry/helpers/base_helpers.rb

@@ -35,7 +35,7 @@ class Pry
       end
 
       def set_file_and_dir_locals(file_name)
-        return if !target or !file_name
+        return if !target
         _pry_.last_file = File.expand_path(file_name)
         _pry_.inject_local("_file_", _pry_.last_file, target)
 

data/lib/pry/helpers/command_helpers.rb

@@ -5,6 +5,15 @@ class Pry
 
       module_function
 
+      def meth_name_from_binding(b)
+        meth_name = b.eval('__method__')
+        if [:__script__, nil, :__binding__, :__binding_impl__].include?(meth_name)
+          nil
+        else
+          meth_name
+        end
+      end
+
       # if start_line is not false then add line numbers starting with start_line
       def render_output(should_flood, start_line, text, color=:blue)
         if start_line
@@ -18,6 +27,18 @@ class Pry
         end
       end
 
+      def is_a_dynamically_defined_method?(meth)
+        file, _ = meth.source_location
+        !!(file =~ /(\(.*\))|<.*>/)
+      end
+
+      def check_for_dynamically_defined_method(meth)
+        file, _ = meth.source_location
+        if file =~ /(\(.*\))|<.*>/ && file != Pry.eval_path
+          raise "Cannot retrieve source for dynamically defined method."
+        end
+      end
+
       # Open a temp file and yield it to the block, closing it after
       # @return [String] The path of the temp file
       def temp_file
@@ -27,28 +48,225 @@ class Pry
         file.close
       end
 
-      def get_method_or_print_error(name, target, opts={}, omit_cmd=false)
-        if (meth = Pry::Method.from_str(name, target, opts))
-          set_file_and_dir_locals(meth.source_file)
-          meth
+      ########### RBX HELPERS #############
+      def is_core_rbx_path?(path)
+        rbx? &&
+          path.start_with?("kernel")
+      end
+
+      def rbx_core?(meth)
+          meth.source_location &&
+          is_core_rbx_path?(meth.source_location.first)
+      end
+
+      def rvm_ruby?(path)
+        !!(path =~ /\.rvm/)
+      end
+
+      def rbx_core_code_for(meth)
+        rbx_core_code_or_doc_for(meth, :code)
+      end
+
+      def rbx_core_doc_for(meth)
+        rbx_core_code_or_doc_for(meth, :doc)
+      end
+
+      def rbx_core_code_or_doc_for(meth, code_or_doc)
+        path_line = rbx_core_path_line_for(meth)
+
+        case code_or_doc
+        when :code
+          MethodSource.source_helper(path_line)
+        when :doc
+          MethodSource.comment_helper(path_line)
+        end
+      end
+
+      def rbx_convert_path_to_full(path)
+        if rvm_ruby?(Rubinius::BIN_PATH)
+          rbx_rvm_convert_path_to_full(path)
+        else
+          rbx_std_convert_path_to_full(path)
+        end
+      end
+
+      def rbx_rvm_convert_path_to_full(path)
+          ruby_name = File.dirname(Rubinius::BIN_PATH).split("/").last
+          source_path = File.join(File.dirname(File.dirname(File.dirname(Rubinius::BIN_PATH))),  "src", ruby_name)
+        file_name = File.join(source_path, path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
+      def rbx_std_convert_path_to_full(path)
+        file_name = File.join(Rubinius::BIN_PATH, "..", path)
+        raise "Cannot find rbx core source" if !File.exists?(file_name)
+        file_name
+      end
+
+      def rbx_core_path_line_for(meth)
+        if rvm_ruby?(Rubinius::BIN_PATH)
+          rvm_rbx_core_path_line_for(meth)
+        else
+          std_rbx_core_path_line_for(meth)
+        end
+      end
+
+      def std_rbx_core_path_line_for(meth)
+        file_name  = rbx_std_convert_path_to_full(meth.source_location.first)
+        start_line = meth.source_location.last
+
+        [file_name, start_line]
+      end
+
+      def rvm_rbx_core_path_line_for(meth)
+        file_name  = rbx_rvm_convert_path_to_full(meth.source_location.first)
+        start_line = meth.source_location.last
+
+        [file_name, start_line]
+      end
+
+      ######### END RBX HELPERS ###############
+
+      def code_and_code_type_for(meth)
+        case code_type = code_type_for(meth)
+        when nil
+          return nil
+        when :c
+          code = Pry::MethodInfo.info_for(meth).source
+          code = strip_comments_from_c_code(code)
+        when :ruby
+          if meth.source_location.first == Pry.eval_path
+            start_line = meth.source_location.last
+
+            # FIXME this line below needs to be refactored, WAY too
+            # much of a hack. We pass nothing to prompt because if
+            # prompt uses #inspect (or #pretty_inspect) on the context
+            # it can hang the session if the object being inspected on
+            # is enormous see: https://github.com/pry/pry/issues/245
+            p = Pry.new(:input => StringIO.new(Pry.line_buffer[start_line..-1].join), :prompt => proc {""}, :hooks => {}).r(target)
+            code = strip_leading_whitespace(p)
+          else
+            if rbx_core?(meth)
+              code = strip_leading_whitespace(rbx_core_code_for(meth))
+            else
+              code = strip_leading_whitespace(meth.source)
+            end
+          end
+          set_file_and_dir_locals(path_line_for(meth).first)
+        end
+
+        [code, code_type]
+      end
+
+      def doc_and_code_type_for(meth)
+        case code_type = code_type_for(meth)
+        when nil
+          return nil
+        when :c
+          doc = Pry::MethodInfo.info_for(meth).docstring
+        when :ruby
+          if rbx_core?(meth)
+            doc = strip_leading_hash_and_whitespace_from_ruby_comments(rbx_core_doc_for(meth))
+          else
+            doc = strip_leading_hash_and_whitespace_from_ruby_comments(meth.comment)
+          end
+          set_file_and_dir_locals(path_line_for(meth).first)
+        end
+
+        [doc, code_type]
+      end
+
+      def get_method_object(meth_name, target=nil, options={})
+        get_method_object_from_target(*get_method_attributes(meth_name, target, options)) rescue nil
+      end
+
+      def get_method_attributes(meth_name, target=nil, options={})
+        if meth_name
+          if meth_name =~ /(\S+)\#(\S+)\Z/
+            context, meth_name = $1, $2
+            target = Pry.binding_for(target.eval(context))
+            type = :instance
+          elsif meth_name =~ /(\S+)\.(\S+)\Z/
+            context, meth_name = $1, $2
+            target = Pry.binding_for(target.eval(context))
+            type = :singleton
+          elsif options["instance_methods"]
+            type = :instance
+          elsif options[:methods]
+            type = :singleton
+          else
+            type = nil
+          end
         else
-          # FIXME: better/more accurate error handling
-          output.print "Invalid method name: #{name}."
-          output.print " Type `#{command_name} --help` for help." unless omit_cmd
-          output.puts
+          meth_name = meth_name_from_binding(target)
+          type = nil
         end
+        [meth_name, target, type]
       end
 
-      def make_header(meth, content=meth.source)
-        code_type = meth.source_type
+      def get_method_object_from_target(meth_name, target, type=nil)
+        case type
+        when :instance
+          target.eval("instance_method(:#{meth_name})") rescue nil
+        when :singleton
+          target.eval("method(:#{meth_name})") rescue nil
+        else
+          get_method_object_from_target(meth_name, target, :instance) ||
+            get_method_object_from_target(meth_name, target, :singleton)
+        end
+      end
+
+      def path_line_for(meth)
+        if rbx_core?(meth)
+          rbx_core_path_line_for(meth)
+        else
+          meth.source_location
+        end
+      end
+
+      def make_header(meth, code_type, content)
         num_lines = "Number of lines: #{Pry::Helpers::Text.bold(content.each_line.count.to_s)}"
         case code_type
-        when :c
+        when :ruby
+          file, line = path_line_for(meth)
+          "\n#{Pry::Helpers::Text.bold('From:')} #{file} @ line #{line}:\n#{num_lines}\n\n"
+        else
           file = Pry::MethodInfo.info_for(meth).file
           "\n#{Pry::Helpers::Text.bold('From:')} #{file} in Ruby Core (C Method):\n#{num_lines}\n\n"
         end
       end
 
+      def is_a_c_method?(meth)
+        meth.source_location.nil?
+      end
+
+      def should_use_pry_doc?(meth)
+        Pry.config.has_pry_doc && is_a_c_method?(meth)
+      end
+
+      def code_type_for(meth)
+        # only C methods
+        if should_use_pry_doc?(meth)
+          info = Pry::MethodInfo.info_for(meth)
+          if info && info.source
+            code_type = :c
+          else
+            output.puts "Cannot find C method: #{meth.name}"
+            code_type = nil
+          end
+        else
+          if is_a_c_method?(meth)
+            output.puts "Cannot locate this method: #{meth.name}. Try `gem install pry-doc` to get access to Ruby Core documentation."
+            code_type = nil
+          else
+            check_for_dynamically_defined_method(meth)
+            code_type = :ruby
+          end
+        end
+        code_type
+      end
+
       def file_map
         {
           [".c", ".h"] => :c,
@@ -139,6 +357,24 @@ class Pry
         process_yardoc process_rdoc(comment, code_type)
       end
 
+      # strip leading whitespace but preserve indentation
+      def strip_leading_whitespace(text)
+        return text if text.empty?
+        leading_spaces = text.lines.first[/^(\s+)/, 1]
+        text.gsub(/^#{leading_spaces}/, '')
+      end
+
+      def strip_leading_hash_and_whitespace_from_ruby_comments(comment)
+        comment = comment.dup
+        comment.gsub!(/\A\#+?$/, '')
+        comment.gsub!(/^\s*#/, '')
+        strip_leading_whitespace(comment)
+      end
+
+      def strip_comments_from_c_code(code)
+        code.sub(/\A\s*\/\*.*?\*\/\s*/m, '')
+      end
+
       def invoke_editor(file, line)
         if Pry.config.editor.respond_to?(:call)
           editor_invocation = Pry.config.editor.call(file, line)

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.6.1"
+  VERSION = "0.9.6.2"
 end

data/pry.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pry}
-  s.version = "0.9.6.1"
+  s.version = "0.9.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{John Mair (banisterfiend)}]
@@ -10,39 +10,39 @@ Gem::Specification.new do |s|
   s.description = %q{An IRB alternative and runtime developer console}
   s.email = %q{jrmair@gmail.com}
   s.executables = [%q{pry}]
-  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/command_context.rb}, %q{lib/pry/command_processor.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/method.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/rbx_method.rb}, %q{lib/pry/rbx_path.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
+  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.travis.yml}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/command_context.rb}, %q{lib/pry/command_processor.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
   s.homepage = %q{http://pry.github.com}
   s.require_paths = [%q{lib}]
   s.rubygems_version = %q{1.8.6}
   s.summary = %q{An IRB alternative and runtime developer console}
-  s.test_files = [%q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_method.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}]
+  s.test_files = [%q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.5"])
-      s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+      s.add_runtime_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_runtime_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_runtime_dependency(%q<method_source>, [">= 0.6.5"])
-      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_development_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_development_dependency(%q<open4>, ["~> 1.0.1"])
       s.add_development_dependency(%q<rake>, ["~> 0.9"])
     else
-      s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
-      s.add_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+      s.add_dependency(%q<coderay>, ["~> 0.9.8"])
       s.add_dependency(%q<slop>, ["~> 2.1.0"])
-      s.add_dependency(%q<method_source>, [">= 0.6.5"])
-      s.add_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+      s.add_dependency(%q<bacon>, ["~> 1.1.0"])
       s.add_dependency(%q<open4>, ["~> 1.0.1"])
       s.add_dependency(%q<rake>, ["~> 0.9"])
     end
   else
-    s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
-    s.add_dependency(%q<coderay>, [">= 0.9.8"])
+    s.add_dependency(%q<ruby_parser>, ["~> 2.0.5"])
+    s.add_dependency(%q<coderay>, ["~> 0.9.8"])
     s.add_dependency(%q<slop>, ["~> 2.1.0"])
-    s.add_dependency(%q<method_source>, [">= 0.6.5"])
-    s.add_dependency(%q<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<method_source>, ["~> 0.6.5"])
+    s.add_dependency(%q<bacon>, ["~> 1.1.0"])
     s.add_dependency(%q<open4>, ["~> 1.0.1"])
     s.add_dependency(%q<rake>, ["~> 0.9"])
   end

data/test/test_command_helpers.rb

@@ -5,5 +5,73 @@ describe Pry::Helpers::CommandHelpers do
     @helper = Pry::Helpers::CommandHelpers
   end
 
-  # FIXME: currently no tests
+  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
+
+