pry 0.9.7.4-i386-mingw32 → 0.9.8-i386-mingw32

data/lib/pry/default_commands/introspection.rb

@@ -5,40 +5,58 @@ class Pry
 
     Introspection = Pry::CommandSet.new do
 
-      command "show-method", "Show the source for METH. Type `show-method --help` for more info. Aliases: $, show-source", :shellwords => false do |*args|
-        opts, meth = parse_options!(args, :method_object) do |opt|
-          opt.banner unindent <<-USAGE
-            Usage: show-method [OPTIONS] [METH]
-            Show the source for method METH. Tries instance methods first and then methods by default.
-            e.g: show-method hello_method
-          USAGE
+      create_command "show-method" do
+        description "Show the source for METH. Type `show-method --help` for more info. Aliases: $, show-source"
+
+        banner <<-BANNER
+          Usage: show-method [OPTIONS] [METH]
+          Aliases: $, show-source
+
+          Show the source for method METH. Tries instance methods first and then methods by default.
 
+          e.g: `show-method hello_method`
+          e.g: `show-method -m hello_method`
+          e.g: `show-method Pry#rep`
+
+          https://github.com/pry/pry/wiki/Source-browsing#wiki-Show_method
+        BANNER
+
+        command_options(
+          :shellwords => false
+        )
+
+        def options(opt)
+          method_options(opt)
           opt.on :l, "line-numbers", "Show line numbers."
           opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)."
           opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
         end
 
-        raise CommandError, "Could not find method source" unless meth.source
+        def process
+          raise CommandError, "Could not find method source" unless method_object.source
+
+          output.puts make_header(method_object)
+          output.puts "#{text.bold("Owner:")} #{method_object.owner || "N/A"}"
+          output.puts "#{text.bold("Visibility:")} #{method_object.visibility}"
+          output.puts
 
-        output.puts make_header(meth)
-        output.puts "#{text.bold("Owner:")} #{meth.owner || "N/A"}"
-        output.puts "#{text.bold("Visibility:")} #{meth.visibility}"
-        output.puts
+          code = Code.from_method(method_object, start_line).
+                   with_line_numbers(use_line_numbers?)
 
-        if Pry.color
-          code = CodeRay.scan(meth.source, meth.source_type).term
-        else
-          code = meth.source
+          render_output(code, opts)
         end
 
-        start_line = false
-        if opts.b?
-          start_line = 1
-        elsif opts.l?
-          start_line = meth.source_line || 1
+        def use_line_numbers?
+          opts.present?(:b) || opts.present?(:l)
         end
 
-        render_output(opts.flood?, start_line, code)
+        def start_line
+          if opts.present?(:'base-one')
+            1
+          else
+            method_object.source_line || 1
+          end
+        end
       end
 
       alias_command "show-source", "show-method"
@@ -57,11 +75,11 @@ class Pry
           opt.on :l, "line-numbers", "Show line numbers."
           opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
           opt.on :h, :help, "This message." do
-            output.puts opt
+            output.puts opt.help
           end
         end
 
-        next if opts.help?
+        next if opts.present?(:help)
 
         command_name = args.shift
         if !command_name
@@ -77,68 +95,75 @@ class Pry
           output.puts make_header(block)
           output.puts
 
-          if Pry.color
-            code = CodeRay.scan(block.source, :ruby).term
-          else
-            code = block.source
-          end
-
-          start_line = false
-          if opts.l?
-            start_line = block.source_line || 1
-          end
+          code = Code.from_method(block).with_line_numbers(opts.present?(:'line-numbers'))
 
-          render_output(opts.flood?, opts.l? ? block.source_line : false, code)
-          code
+          render_output(code, opts)
         else
           raise CommandError, "No such command: #{command_name}."
         end
       end
 
-      command "edit", "Invoke the default editor on a file. Type `edit --help` for more info" do |*args|
-        opts = Slop.parse!(args) do |opt|
-          opt.banner unindent <<-USAGE
-            Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]|--in N]
-            Open a text editor. When no FILE is given, edits the pry input buffer.
-            Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.
-            e.g: edit sample.rb
-          USAGE
+      create_command "edit" do
+        description "Invoke the default editor on a file. Type `edit --help` for more info"
+
+        banner <<-BANNER
+          Usage: edit [--no-reload|--reload] [--line LINE] [--temp|--ex|FILE[:LINE]|--in N]
+
+          Open a text editor. When no FILE is given, edits the pry input buffer.
+          Ensure Pry.config.editor is set to your editor of choice.
+
+          e.g: `edit sample.rb`
+          e.g: `edit sample.rb --line 105`
+          e.g: `edit --ex`
+
+          https://github.com/pry/pry/wiki/Editor-integration#wiki-Edit_command
+        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 :t, :temp, "Open an empty temporary file"
           opt.on :l, :line, "Jump to this line in the opened file", true, :as => Integer
           opt.on :n, :"no-reload", "Don't automatically reload the edited code"
           opt.on :r, :reload, "Reload the edited code immediately (default for ruby files)"
-          opt.on :h, :help, "This message." do
-            output.puts opt
+        end
+
+        def process
+          if [opts.present?(:ex), opts.present?(:temp), opts.present?(:in), !args.empty?].count(true) > 1
+            raise CommandError, "Only one of --ex, --temp, --in and FILE may be specified."
+          end
+
+          if !opts.present?(:ex) && args.empty?
+            # edit of local code, eval'd within pry.
+            process_local_edit
+          else
+            # edit of remote code, eval'd at top-level
+            process_remote_edit
           end
         end
-        next if opts.h?
 
-        if [opts.ex?, opts.t?, opts.i?, !args.empty?].count(true) > 1
-          raise CommandError, "Only one of --ex, --temp, --in and FILE may be specified."
+        def process_i
+          case opts[:i]
+          when Range
+            (_pry_.input_array[opts[:i]] || []).join
+          when Fixnum
+            _pry_.input_array[opts[:i]] || ""
+          else
+            return output.puts "Not a valid range: #{opts[:i]}"
+          end
         end
 
-        # edit of local code, eval'd within pry.
-        if !opts.ex? && args.empty?
-
-          content = if opts.t?
-                      ""
-                    elsif opts.i?
-                      case opts[:i]
-                      when Range
-                        (_pry_.input_array[opts[:i]] || []).join
-                      when Fixnum
-                        _pry_.input_array[opts[:i]] || ""
-                      else
-                        next output.puts "Not a valid range: #{opts[:i]}"
-                      end
-                    elsif eval_string.strip != ""
-                      eval_string
-                    else
-                      _pry_.input_array.reverse_each.find{ |x| x && x.strip != "" } || ""
-                    end
+        def process_local_edit
+          content = case
+            when opts.present?(:temp)
+              ""
+            when opts.present?(:in)
+              process_i
+            when eval_string.strip != ""
+              eval_string
+            else
+              _pry_.input_array.reverse_each.find{ |x| x && x.strip != "" } || ""
+          end
 
           line = content.lines.count
 
@@ -146,16 +171,16 @@ class Pry
             f.puts(content)
             f.flush
             invoke_editor(f.path, line)
-            if !opts.n?
+            if !opts.present?(:'no-reload')
               silence_warnings do
                 eval_string.replace(File.read(f.path))
               end
             end
           end
+        end
 
-        # edit of remote code, eval'd at top-level
-        else
-          if opts.ex?
+        def process_remote_edit
+          if opts.present?(:ex)
             if _pry_.last_exception.nil?
               raise CommandError, "No exception found."
             end
@@ -186,12 +211,12 @@ class Pry
             line = file_name.sub!(/:(\d+)$/, "") ? $1.to_i : 1
           end
 
-          line = opts[:l].to_i if opts.l?
+          line = opts[:l].to_i if opts.present?(:line)
 
           invoke_editor(file_name, line)
           set_file_and_dir_locals(file_name)
 
-          if opts.r? || ((opts.ex? || file_name.end_with?(".rb")) && !opts.n?)
+          if opts.present?(:reload) || ((opts.present?(:ex) || file_name.end_with?(".rb")) && !opts.present?(:'no-reload'))
             silence_warnings do
               TOPLEVEL_BINDING.eval(File.read(file_name), file_name)
             end
@@ -199,33 +224,60 @@ class Pry
         end
       end
 
-      command "edit-method", "Edit a method. Type `edit-method --help` for more info.", :shellwords => false do |*args|
-        target = target()
+      create_command "edit-method" do
+        description "Edit a method. Type `edit-method --help` for more info."
 
-        opts, meth = parse_options!(args, :method_object) do |opt|
-          opt.banner unindent <<-USAGE
-            Usage: edit-method [OPTIONS] [METH]
-            Edit the method METH in an editor.
-            Ensure #{text.bold("Pry.config.editor")} is set to your editor of choice.
-            e.g: edit-method hello_method
-          USAGE
+        banner <<-BANNER
+          Usage: edit-method [OPTIONS] [METH]
+
+          Edit the method METH in an editor.
+          Ensure Pry.config.editor is set to your editor of choice.
 
+          e.g: `edit-method hello_method`
+          e.g: `edit-method Pry#rep`
+          e.g: `edit-method`
+
+          https://github.com/pry/pry/wiki/Editor-integration#wiki-Edit_method
+        BANNER
+
+        command_options :shellwords => false
+
+        def options(opt)
+          method_options(opt)
           opt.on :n, "no-reload", "Do not automatically reload the method's file after editing."
           opt.on "no-jump", "Do not fast forward editor to first line of method."
           opt.on :p, :patch, "Instead of editing the method's file, try to edit in a tempfile and apply as a monkey patch."
-          opt.on :h, :help, "This message." do
-            output.puts opt
-          end
         end
 
-        if !Pry.config.editor
-          raise CommandError, "No editor set!\nEnsure that #{text.bold("Pry.config.editor")} is set to your editor of choice."
+        def process
+          if !Pry.config.editor
+            raise CommandError, "No editor set!\nEnsure that #{text.bold("Pry.config.editor")} is set to your editor of choice."
+          end
+
+          begin
+            @method = method_object
+          rescue NonMethodContextError => err
+          end
+
+          if opts.present?(:patch) || (@method && @method.dynamically_defined?)
+            if err
+              raise err # can't patch a non-method
+            end
+
+            process_patch
+          else
+            if err && !File.exist?(target.eval('__FILE__'))
+              raise err # can't edit a non-file
+            end
+
+            process_file
+          end
         end
 
-        if opts.p? || meth.dynamically_defined?
-          lines = meth.source.lines.to_a
+        def process_patch
+          lines = @method.source.lines.to_a
 
-          if ((original_name = meth.original_name) &&
+          if ((original_name = @method.original_name) &&
               lines[0] =~ /^def (?:.*?\.)?#{original_name}(?=[\(\s;]|$)/)
             lines[0] = "def #{original_name}#{$'}"
           else
@@ -237,40 +289,49 @@ class Pry
             f.flush
             invoke_editor(f.path, 0)
 
-            if meth.alias?
-              with_method_transaction(original_name, meth.owner) do
-                Pry.new(:input => StringIO.new(File.read(f.path))).rep(meth.owner)
-                Pry.binding_for(meth.owner).eval("alias #{meth.name} #{original_name}")
+            if @method.alias?
+              with_method_transaction(original_name, @method.owner) do
+                Pry.new(:input => StringIO.new(File.read(f.path))).rep(@method.owner)
+                Pry.binding_for(@method.owner).eval("alias #{@method.name} #{original_name}")
               end
             else
-              Pry.new(:input => StringIO.new(File.read(f.path))).rep(meth.owner)
+              Pry.new(:input => StringIO.new(File.read(f.path))).rep(@method.owner)
             end
           end
-          next
         end
 
-        if meth.source_type == :c
-          raise CommandError, "Can't edit a C method."
-        else
-          file, line = meth.source_file, meth.source_line
+        def process_file
+          file, line = extract_file_and_line
 
           invoke_editor(file, opts["no-jump"] ? 0 : line)
           silence_warnings do
-            load file if !opts.n? && !Pry.config.disable_auto_reload
+            load file unless opts.present?(:'no-jump') || Pry.config.disable_auto_reload
           end
         end
-      end
 
-      helpers do
-        def with_method_transaction(meth_name, target=TOPLEVEL_BINDING)
-          target = Pry.binding_for(target)
-          temp_name = "__pry_#{meth_name}__"
+        protected
+          def extract_file_and_line
+            if @method
+              if @method.source_type == :c
+                raise CommandError, "Can't edit a C method."
+              else
+                [@method.source_file, @method.source_line]
+              end
+            else
+              [target.eval('__FILE__'), target.eval('__LINE__')]
+            end
+          end
+
+          def with_method_transaction(meth_name, target=TOPLEVEL_BINDING)
+            target = Pry.binding_for(target)
+            temp_name = "__pry_#{meth_name}__"
 
-          target.eval("alias #{temp_name} #{meth_name}")
-          yield
-          target.eval("alias #{meth_name} #{temp_name}")
-          target.eval("undef #{temp_name}")
-        end
+            target.eval("alias #{temp_name} #{meth_name}")
+            yield
+            target.eval("alias #{meth_name} #{temp_name}")
+          ensure
+            target.eval("undef #{temp_name}") rescue nil
+          end
       end
     end
   end

data/lib/pry/default_commands/ls.rb

@@ -3,7 +3,94 @@ class Pry
 
     Ls = Pry::CommandSet.new do
 
-      helpers do
+      create_command "ls","Show the list of vars and methods in the current scope. Type `ls --help` for more info.",
+              :shellwords => false, :interpolate => false do
+
+        def options(opt)
+          opt.banner unindent <<-USAGE
+            Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object]
+                   ls [-g] [-l]
+
+            ls shows you which methods, constants and variables are accessible to Pry. By default it shows you the local variables defined in the current shell, and any public methods or instance variables defined on the current object.
+
+            The colours used are configurable using Pry.config.ls.*_color, and the separator is Pry.config.ls.separator.
+
+            Pry.config.ls.ceiling is used to hide methods defined higher up in the inheritance chain, this is by default set to [Object, Module, Class] so that methods defined on all Objects are omitted. The -v flag can be used to ignore this setting and show all methods, while the -q can be used to set the ceiling much lower and show only methods defined on the object or its direct class.
+          USAGE
+
+          opt.on :m, "methods", "Show public methods defined on the Object (default)"
+          opt.on :M, "instance-methods", "Show methods defined in a Module or Class"
+
+          opt.on :p, "ppp", "Show public, protected (in yellow) and private (in green) methods"
+          opt.on :q, "quiet", "Show only methods defined on object.singleton_class and object.class"
+          opt.on :v, "verbose", "Show methods and constants on all super-classes (ignores Pry.config.ls.ceiling)"
+
+          opt.on :g, "globals", "Show global variables, including those builtin to Ruby (in cyan)"
+          opt.on :l, "locals", "Show locals, including those provided by Pry (in red)"
+
+          opt.on :c, "constants", "Show constants, highlighting classes (in blue), and exceptions (in purple)"
+
+          opt.on :i, "ivars", "Show instance variables (in blue) and class variables (in bright blue)"
+
+          opt.on :G, "grep", "Filter output by regular expression", :optional => false
+        end
+
+        def process
+          obj = args.empty? ? target_self : target.eval(args.join(" "))
+
+          # exclude -q, -v and --grep because they don't specify what the user wants to see.
+          has_opts = (opts.present?(:methods) || opts.present?(:'instance-methods') || opts.present?(:ppp) ||
+                      opts.present?(:globals) || opts.present?(:locals) || opts.present?(:constants) ||
+                      opts.present?(:ivars))
+
+          show_methods   = opts.present?(:methods) || opts.present?(:'instance-methods') || opts.present?(:ppp) || !has_opts
+          show_constants = opts.present?(:constants) || (!has_opts && Module === obj)
+          show_ivars     = opts.present?(:ivars) || !has_opts
+          show_locals    = opts.present?(:locals) || (!has_opts && args.empty?)
+
+          grep_regex, grep = [Regexp.new(opts[:G] || "."), lambda{ |x| x.grep(grep_regex) }]
+
+          raise Pry::CommandError, "-l does not make sense with a specified Object" if opts.present?(:locals) && !args.empty?
+          raise Pry::CommandError, "-g does not make sense with a specified Object" if opts.present?(:globals) && !args.empty?
+          raise Pry::CommandError, "-q does not make sense with -v" if opts.present?(:quiet) && opts.present?(:verbose)
+          raise Pry::CommandError, "-M only makes sense with a Module or a Class" if opts.present?(:'instance-methods') && !(Module === obj)
+          raise Pry::CommandError, "-c only makes sense with a Module or a Class" if opts.present?(:constants) && !args.empty? && !(Module === obj)
+
+
+          if opts.present?(:globals)
+            output_section("global variables", grep[format_globals(target.eval("global_variables"))])
+          end
+
+          if show_constants
+            mod = Module === obj ? obj : Object
+            constants = mod.constants
+            constants -= (mod.ancestors - [mod]).map(&:constants).flatten unless opts.present?(:verbose)
+            output_section("constants", grep[format_constants(mod, constants)])
+          end
+
+          if show_methods
+            # methods is a hash {Module/Class => [Pry::Methods]}
+            methods = all_methods(obj).select{ |method| opts.present?(:ppp) || method.visibility == :public }.group_by(&:owner)
+
+            # reverse the resolution order so that the most useful information appears right by the prompt
+            resolution_order(obj).take_while(&below_ceiling(obj)).reverse.each do |klass|
+              methods_here = format_methods((methods[klass] || []).select{ |m| m.name =~ grep_regex })
+              output_section "#{Pry::WrappedModule.new(klass).method_prefix}methods", methods_here
+            end
+          end
+
+          if show_ivars
+            klass = (Module === obj ? obj : obj.class)
+            output_section("instance variables", format_variables(:instance_var, grep[obj.__send__(:instance_variables)]))
+            output_section("class variables", format_variables(:class_var, grep[klass.__send__(:class_variables)]))
+          end
+
+          if show_locals
+            output_section("locals", format_locals(grep[target.eval("local_variables")]))
+          end
+        end
+
+        private
 
         # http://ruby.runpaint.org/globals, and running "puts global_variables.inspect".
         BUILTIN_GLOBALS = %w($" $$ $* $, $-0 $-F $-I $-K $-W $-a $-d $-i $-l $-p $-v $-w $. $/ $\\
@@ -20,37 +107,20 @@ class Pry
                            $LAST_PAREN_MATCH $LAST_READ_LINE $MATCH $POSTMATCH $PREMATCH)
 
         # Get all the methods that we'll want to output
-        def all_methods(obj, opts)
-          opts.M? ? Pry::Method.all_from_class(obj) : Pry::Method.all_from_obj(obj)
+        def all_methods(obj)
+          opts.present?(:'instance-methods') ? Pry::Method.all_from_class(obj) : Pry::Method.all_from_obj(obj)
         end
 
-        def resolution_order(obj, opts)
-          opts.M? ? Pry::Method.instance_resolution_order(obj) : Pry::Method.resolution_order(obj)
-        end
-
-        # Get the name of the klass for pretty display in the title column of ls -m
-        # as there can only ever be one singleton class of a non-class, we just call
-        # that "self".
-        def class_name(klass)
-          if klass == klass.ancestors.first
-            (klass.name || "") == "" ? klass.to_s : klass.name
-          elsif klass.ancestors.include?(Module)
-            begin
-              "#{class_name(ObjectSpace.each_object(klass).detect{ |x| class << x; self; end == klass })}.self"
-            rescue # ObjectSpace is not enabled by default in jruby
-              klass.to_s.sub(/#<Class:(.*)>/, '\1.self')
-            end
-          else
-            "self"
-          end
+        def resolution_order(obj)
+          opts.present?(:'instance-methods') ? Pry::Method.instance_resolution_order(obj) : Pry::Method.resolution_order(obj)
         end
 
         # Get a lambda that can be used with .take_while to prevent over-eager
         # traversal of the Object's ancestry graph.
-        def below_ceiling(obj, opts)
-          ceiling = if opts.q?
-                       [opts.M? ? obj.ancestors[1] : obj.class.ancestors[1]] + Pry.config.ls.ceiling
-                     elsif opts.v?
+        def below_ceiling(obj)
+          ceiling = if opts.present?(:quiet)
+                       [opts.present?(:'instance-methods') ? obj.ancestors[1] : obj.class.ancestors[1]] + Pry.config.ls.ceiling
+                     elsif opts.present?(:verbose)
                        []
                      else
                        Pry.config.ls.ceiling.dup
@@ -125,94 +195,6 @@ class Pry
           text.send(Pry.config.ls.send(:"#{type}_color"), str)
         end
       end
-
-      command "ls", "Show the list of vars and methods in the current scope. Type `ls --help` for more info.",
-              :shellwords => false, :interpolate => false do |*args|
-
-        opts = Slop.parse!(args, :strict => true) do |opt|
-          opt.banner unindent <<-USAGE
-            Usage: ls [-m|-M|-p|-pM] [-q|-v] [-c|-i] [Object]
-                   ls [-g] [-l]
-
-            ls shows you which methods, constants and variables are accessible to Pry. By default it shows you the local variables defined in the current shell, and any public methods or instance variables defined on the current object.
-
-            The colours used are configurable using Pry.config.ls.*_color, and the separator is Pry.config.ls.separator.
-
-            Pry.config.ls.ceiling is used to hide methods defined higher up in the inheritance chain, this is by default set to [Object, Module, Class] so that methods defined on all Objects are omitted. The -v flag can be used to ignore this setting and show all methods, while the -q can be used to set the ceiling much lower and show only methods defined on the object or its direct class.
-          USAGE
-
-          opt.on :m, "methods", "Show public methods defined on the Object (default)"
-          opt.on :M, "module", "Show methods defined in a Module or Class"
-
-          opt.on :p, "ppp", "Show public, protected (in yellow) and private (in green) methods"
-          opt.on :q, "quiet", "Show only methods defined on object.singleton_class and object.class"
-          opt.on :v, "verbose", "Show methods and constants on all super-classes (ignores Pry.config.ls.ceiling)"
-
-          opt.on :g, "globals", "Show global variables, including those builtin to Ruby (in cyan)"
-          opt.on :l, "locals", "Show locals, including those provided by Pry (in red)"
-
-          opt.on :c, "constants", "Show constants, highlighting classes (in blue), and exceptions (in purple)"
-
-          opt.on :i, "ivars", "Show instance variables (in blue) and class variables (in bright blue)"
-
-          opt.on :G, "grep", "Filter output by regular expression", :optional => false
-
-          opt.on :h, "help", "Show help"
-        end
-
-        next output.puts(opts) if opts.h?
-
-        obj = args.empty? ? target_self : target.eval(args.join(" "))
-
-        # exclude -q, -v and --grep because they don't specify what the user wants to see.
-        has_opts = (opts.m? || opts.M? || opts.p? || opts.g? || opts.l? || opts.c? || opts.i?)
-
-        show_methods   = opts.m? || opts.M? || opts.p? || !has_opts
-        show_constants = opts.c? || (!has_opts && Module === obj)
-        show_ivars     = opts.i? || !has_opts
-        show_locals    = opts.l? || (!has_opts && args.empty?)
-
-        grep_regex, grep = [Regexp.new(opts[:G] || "."), lambda{ |x| x.grep(grep_regex) }]
-
-        raise Pry::CommandError, "-l does not make sense with a specified Object" if opts.l? && !args.empty?
-        raise Pry::CommandError, "-g does not make sense with a specified Object" if opts.g? && !args.empty?
-        raise Pry::CommandError, "-q does not make sense with -v" if opts.q? && opts.v?
-        raise Pry::CommandError, "-M only makes sense with a Module or a Class" if opts.M? && !(Module === obj)
-        raise Pry::CommandError, "-c only makes sense with a Module or a Class" if opts.c? && !args.empty? && !(Module === obj)
-
-
-        if opts.g?
-          output_section("global variables", grep[format_globals(target.eval("global_variables"))])
-        end
-
-        if show_constants
-          mod = Module === obj ? obj : Object
-          constants = mod.constants
-          constants -= (mod.ancestors - [mod]).map(&:constants).flatten unless opts.v?
-          output_section("constants", grep[format_constants(mod, constants)])
-        end
-
-        if show_methods
-          # methods is a hash {Module/Class => [Pry::Methods]}
-          methods = all_methods(obj, opts).select{ |method| opts.p? || method.visibility == :public }.group_by(&:owner)
-
-          # reverse the resolution order so that the most useful information appears right by the prompt
-          resolution_order(obj, opts).take_while(&below_ceiling(obj, opts)).reverse.each do |klass|
-            methods_here = format_methods((methods[klass] || []).select{ |m| m.name =~ grep_regex })
-            output_section "#{class_name(klass)} methods", methods_here
-          end
-        end
-
-        if show_ivars
-          klass = (Module === obj ? obj : obj.class)
-          output_section("instance variables", format_variables(:instance_var, grep[obj.__send__(:instance_variables)]))
-          output_section("class variables", format_variables(:class_var, grep[klass.__send__(:class_variables)]))
-        end
-
-        if show_locals
-          output_section("locals", format_locals(grep[target.eval("local_variables")]))
-        end
-      end
     end
   end
 end