pry 0.8.0pre9-i386-mingw32 → 0.8.1-i386-mingw32

data/lib/pry/command_helpers.rb

@@ -1,18 +1,18 @@
 class Pry
   class Commands < CommandBase
-    module CommandHelpers 
+    module CommandHelpers
 
       private
 
       def try_to_load_pry_doc
 
-        # YARD crashes on rbx, so do not require it 
+        # YARD crashes on rbx, so do not require it
         if !Object.const_defined?(:RUBY_ENGINE) || RUBY_ENGINE !~ /rbx/
           require "pry-doc"
         end
       rescue LoadError
       end
-      
+
       def meth_name_from_binding(b)
         meth_name = b.eval('__method__')
         if [:__script__, nil, :__binding__, :__binding_impl__].include?(meth_name)
@@ -29,7 +29,7 @@ class Pry
         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|
@@ -110,7 +110,7 @@ class Pry
         if !meth_name
           return nil
         end
-        
+
         if options[:M]
           target.eval("instance_method(:#{meth_name})")
         elsif options[:m]
@@ -127,15 +127,16 @@ class Pry
           end
         end
       end
-      
+
       def make_header(meth, code_type, content)
-        file, line = meth.source_location
         num_lines = "Number of lines: #{bold(content.each_line.count.to_s)}"
         case code_type
         when :ruby
+          file, line = meth.source_location
           "\n#{bold('From:')} #{file} @ line #{line}:\n#{num_lines}\n\n"
         else
-          "\n#{bold('From:')} Ruby Core (C Method):\n#{num_lines}\n\n"
+          file = Pry::MethodInfo.info_for(meth).file
+          "\n#{bold('From:')} #{file} in Ruby Core (C Method):\n#{num_lines}\n\n"
         end
       end
 
@@ -146,11 +147,11 @@ class Pry
       def should_use_pry_doc?(meth)
         Pry.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) 
+          info = Pry::MethodInfo.info_for(meth)
           if info && info.source
             code_type = :c
           else
@@ -168,7 +169,7 @@ class Pry
         end
         code_type
       end
-      
+
       def file_map
         {
           [".c", ".h"] => :c,
@@ -187,7 +188,7 @@ class Pry
           ".json" => :json
         }
       end
-      
+
       def syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
         _, language_detected = file_map.find do |k, v|
           Array(k).any? do |matcher|
@@ -204,7 +205,7 @@ class Pry
       def normalized_line_number(line_number, total_lines)
         line_number < 0 ? line_number + total_lines : line_number
       end
-      
+
       # returns the file content between the lines and the normalized
       # start and end line numbers.
       def read_between_the_lines(file_name, start_line, end_line)
@@ -274,6 +275,29 @@ class Pry
         code.sub /\A\s*\/\*.*?\*\/\s*/m, ''
       end
 
+      def prompt(message, options="Yn")
+        opts      = options.scan(/./)
+        optstring = opts.join("/") # case maintained
+        defaults  = opts.select{|o| o.upcase == o }
+        opts      = opts.map{|o| o.downcase}
+
+        raise "Error: Too many default values for the prompt: #{default.inspect}" if defaults.size > 1
+
+        default = defaults.first
+
+        loop do
+          response = Pry.input.readline("#{message} (#{optstring}) ").downcase
+          case response
+          when *opts
+            return response
+          when ""
+            return default.downcase
+          else
+            output.puts "  |_ Invalid option: #{response.inspect}. Try again."
+          end
+        end
+      end
+
     end
   end
 end

data/lib/pry/command_processor.rb

@@ -6,15 +6,15 @@ class Pry
     SYSTEM_COMMAND_REGEX = /^#{Regexp.escape(SYSTEM_COMMAND_DELIMITER)}(.*)/
 
     extend Forwardable
-    
+
     attr_accessor :pry_instance
-    
+
     def initialize(pry_instance)
       @pry_instance = pry_instance
     end
 
     def_delegators :@pry_instance, :commands, :nesting, :output
-    
+
     # Is the string a command valid?
     # @param [String] val The string passed in from the Pry prompt.
     # @return [Boolean] Whether the string is a valid command.
@@ -59,21 +59,31 @@ class Pry
     def execute_system_command(val, target)
       SYSTEM_COMMAND_REGEX  =~ val
       cmd = interpolate_string($1, target)
-      
+
       if cmd =~ /^cd\s+(.+)/i
         begin
-          Dir.chdir(File.expand_path($1))
+          @@cd_history ||= []
+          if $1 == "-"
+            dest = @@cd_history.pop || Dir.pwd
+          else
+            dest = File.expand_path($1)
+          end
+          
+          @@cd_history << Dir.pwd
+          Dir.chdir(dest)
         rescue Errno::ENOENT
-          output.puts "No such directory: #{$1}"
+          output.puts "No such directory: #{dest}"
         end
       else
-        system(cmd)
+        if !system(cmd)
+          output.puts "Error: there was a problem executing system command: #{cmd}"
+        end
       end
 
       # Tick, tock, im getting rid of this shit soon.
       val.replace("")
     end
-    
+
     # Determine whether a Pry command was matched and return command data
     # and argument string.
     # This method should not need to be invoked directly.
@@ -114,7 +124,7 @@ class Pry
       args = args_string ? Shellwords.shellwords(args_string) : []
       action = cmd_data[:action]
       keep_retval = cmd_data[:keep_retval]
-      
+
       options = {
         :val => val,
         :eval_string => eval_string,
@@ -157,7 +167,7 @@ class Pry
 
       # Tick, tock, im getting rid of this shit soon.
       options[:val].clear
-      
+
       ret_val
     end
   end

data/lib/pry/commands.rb

@@ -2,6 +2,8 @@ direc = File.dirname(__FILE__)
 
 require "optparse"
 require "method_source"
+require 'slop'
+require 'rubygems/dependency_installer'
 require "#{direc}/command_base"
 require "#{direc}/pry_instance"
 require "#{direc}/command_helpers"
@@ -23,31 +25,30 @@ class Pry
       Pry.start(target)
     end
 
-    # this cannot be accessed, it's just for help purposed.
+    # this cannot be accessed, it's just for help purposes.
     command ".<shell command>", "All text following a '.' is forwarded to the shell." do
     end
 
-    command "hist", "Show and replay Readline history" do |*args|
-      require 'slop'
+    command "hist", "Show and replay Readline history. Type `hist --help` for more info." do |*args|
+      hist_array = Readline::HISTORY.to_a
+
       if args.empty?
-        text = add_line_numbers(Readline::HISTORY.to_a.join("\n"), 0)
+        text = add_line_numbers(hist_array.join("\n"), 0)
         stagger_output(text)
         next
       end
 
-      opts = Slop.parse(args) do
-        banner "Usage: hist [-rSTART..END]"
-        on :r, :replay, 'The line (or range of lines) to replay.', true, :as => Range do |r|
-          options[:r].argument_value = r.to_i if r.is_a?(String)
+      opts = Slop.parse(args) do |opt|
+        opt.banner "Usage: hist [--replay START..END]\nView and replay history\ne.g hist --replay 2..8"
+        opt.on :r, :replay, 'The line (or range of lines) to replay.', true, :as => Range
+        opt.on :h, :help, 'Show this message.', :tail => true do
+          output.puts opt.help
         end
-        on :h, :help, 'Show this message.', :tail => true do
-          output.puts help
-        end        
       end
 
       next if opts.h?
 
-      actions = Array(Readline::HISTORY.to_a[opts[:r]]).join("\n") + "\n"
+      actions = Array(hist_array[opts[:replay]]).join("\n") + "\n"
       Pry.active_instance.input = StringIO.new(actions)
     end
 
@@ -58,46 +59,67 @@ class Pry
     alias_command "quit-program", "exit-program", ""
     alias_command "!!!", "exit-program", ""
 
+    command "gem-install", "Install a gem and refresh the gem cache." do |gem_name|
+      gem_home = Gem.instance_variable_get(:@gem_home)
+      output.puts "Attempting to install gem: #{bold(gem_name)}"
+
+      begin
+        if File.writable?(gem_home)
+          Gem::DependencyInstaller.new.install(gem_name)
+          output.puts "Gem #{bold(gem_name)} successfully installed."
+        else
+          if system("sudo gem install #{gem_name}")
+            output.puts "Gem #{bold(gem_name)} successfully installed."
+          else
+            output.puts "Gem #{bold(gem_name)} could not be installed."
+            next
+          end
+        end
+      rescue Gem::GemNotFoundException
+        output.puts "Required Gem: #{bold(gem_name)} not found."
+        next
+      end
+
+      Gem.refresh
+      output.puts "Refreshed gem cache."
+    end
+
     command "ri", "View ri documentation. e.g `ri Array#each`" do |*args|
-      run target, ".ri", *args
+      run ".ri", *args
     end
 
-    command "stat", "View method information and set _file_ and _dir_ locals" do |*args|
-      options = {}
+    command "stat", "View method information and set _file_ and _dir_ locals. Type `stat --help` for more info." do |*args|
       target = target()
-      meth_name = nil
-      
-      OptionParser.new do |opts|
-        opts.banner = %{Usage: stat [OPTIONS] [METH]
-Show method information for method METH and set _file_ and _dir_ locals. 
+
+      opts = Slop.parse!(args) do |opts|
+        opts.banner %{Usage: stat [OPTIONS] [METH]
+Show method information for method METH and set _file_ and _dir_ locals.
 e.g: stat hello_method
 --
 }
-        opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
-          options[:M] = true
-        end
-
-        opts.on("-m", "--methods", "Operate on methods.") do 
-          options[:m] = true
-        end
-
-        opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
+        opts.on :M, "instance-methods", "Operate on instance methods."
+        opts.on :m, :methods, "Operate on methods."
+        opts.on :c, :context, "Select object context to run under.", true do |context|
           target = Pry.binding_for(target.eval(context))
         end
-
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on :h, :help, "This message" do
           output.puts opts
-          options[:h] = true
         end
-      end.order(args) do |v|
-        meth_name = v
       end
 
-      next if options[:h]
-
-      meth_name = meth_name_from_binding(target) if !meth_name
+      next if opts.help?
 
-      if (meth = get_method_object(meth_name, target, options)).nil?
+      meth_name = args.shift
+      if meth_name
+        if meth_name =~ /\A([^\.\#]+)[\.\#](.+)\z/ && !opts.context?
+          context, meth_name = $1, $2
+          target = Pry.binding_for(target.eval(context))
+        end
+      else
+        meth_name = meth_name_from_binding(target)
+      end
+      
+      if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
         output.puts "Invalid method name: #{meth_name}. Type `stat --help` for help"
         next
       end
@@ -108,50 +130,59 @@ e.g: stat hello_method
 
       output.puts make_header(meth, code_type, code)
       output.puts bold("Method Name: ") + meth_name
+      output.puts bold("Method Owner: ") + (meth.owner.to_s ? meth.owner.to_s : "Unknown")
       output.puts bold("Method Language: ") + code_type.to_s.capitalize
       output.puts bold("Method Type: ") + (meth.is_a?(Method) ? "Bound" : "Unbound")
       output.puts bold("Method Arity: ") + meth.arity.to_s
+
+      name_map = { :req => "Required:", :opt => "Optional:", :rest => "Rest:" }
+      if meth.respond_to?(:parameters)
+        output.puts bold("Method Parameters: ") + meth.parameters.group_by(&:first).
+          map { |k, v| "#{name_map[k]} #{v.map { |kk, vv| vv ? vv.to_s : "noname" }.join(", ")}" }.join(". ")
+      end
       output.puts bold("Comment length: ") + (doc.empty? ? 'No comment.' : (doc.lines.count.to_s + ' lines.'))
     end
 
-    command "gist-method", "Gist a method to github.", :requires_gem => "gist" do |*args|
-      options = {}
-      meth_name = nil
+    command "gist-method", "Gist a method to github. Type `gist-method --help` for more info.", :requires_gem => "gist" do |*args|
+      target = target()
       
-      OptionParser.new do |opts|
+      opts = Slop.parse!(args) do |opts|
         opts.banner = %{Usage: gist-method [OPTIONS] [METH]
 Gist the method (doc or source) to github.
+Ensure the `gist` gem is properly working before use. http://github.com/defunkt/gist for instructions.
 e.g: gist -m my_method
 e.g: gist -d my_method
 --
 }
-        opts.on("-m", "--method", "Gist a method's source.") do |line|
-          options[:m] = true
-        end
-
-        opts.on("-d", "--doc", "Gist a method's documentation.") do 
-          options[:d] = true
-        end
-
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on :m, :method, "Gist a method's source."
+        opts.on :d, :doc, "Gist a method's documentation."
+        opts.on :p, :private, "Create a private gist (default: true)", :default => true
+        opts.on :h, :help, "This message" do
           output.puts opts
-          options[:h] = true
         end
-      end.order(args) do |v|
-        meth_name = v
       end
 
-      next if options[:h]
-
-      meth_name = meth_name_from_binding(target) if !meth_name
+      next if opts.help?
 
-      if (meth = get_method_object(meth_name, target, options)).nil?
+      # This needs to be extracted into its own method as it's shared
+      # by show-method and show-doc and stat commands 
+      meth_name = args.shift
+      if meth_name
+        if meth_name =~ /\A([^\.\#]+)[\.\#](.+)\z/ 
+          context, meth_name = $1, $2
+          target = Pry.binding_for(target.eval(context))
+        end
+      else
+        meth_name = meth_name_from_binding(target)
+      end
+      
+      if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
         output.puts "Invalid method name: #{meth_name}. Type `gist-method --help` for help"
         next
       end
 
       type_map = { :ruby => "rb", :c => "c", :plain => "plain" }
-      if !options[:d]
+      if !opts.doc?
         content, code_type = code_and_code_type_for(meth)
       else
         content, code_type = doc_and_code_type_for(meth)
@@ -160,8 +191,8 @@ e.g: gist -d my_method
         end
         code_type = :plain
       end
-      
-      IO.popen("gist -p -t #{type_map[code_type]} -", "w") do |gist|
+
+      IO.popen("gist#{' -p' if opts.p?} -t #{type_map[code_type]} -", "w") do |gist|
         gist.puts content
       end
     end
@@ -189,22 +220,22 @@ e.g: gist -d my_method
 
     command "shell-mode", "Toggle shell mode. Bring in pwd prompt and file completion." do
       case Pry.active_instance.prompt
-      when Pry::FILE_PROMPT
+      when Pry::SHELL_PROMPT
         Pry.active_instance.prompt = Pry::DEFAULT_PROMPT
         Pry.active_instance.custom_completions = Pry::DEFAULT_CUSTOM_COMPLETIONS
       else
-        Pry.active_instance.prompt = Pry::FILE_PROMPT
+        Pry.active_instance.prompt = Pry::SHELL_PROMPT
         Pry.active_instance.custom_completions = Pry::FILE_COMPLETIONS
         Readline.completion_proc = Pry::InputCompleter.build_completion_proc target,
         Pry.active_instance.instance_eval(&Pry::FILE_COMPLETIONS)
-      end        
+      end
     end
 
     alias_command "file-mode", "shell-mode", ""
 
-    command "nesting", "Show nesting information." do 
+    command "nesting", "Show nesting information." do
       nesting = opts[:nesting]
-      
+
       output.puts "Nesting status:"
       output.puts "--"
       nesting.each do |level, obj|
@@ -218,7 +249,7 @@ e.g: gist -d my_method
 
     command "status", "Show status information." do
       nesting = opts[:nesting]
-      
+
       output.puts "Status:"
       output.puts "--"
       output.puts "Receiver: #{Pry.view_clip(target.eval('self'))}"
@@ -232,7 +263,53 @@ e.g: gist -d my_method
       output.puts "Last result: #{Pry.view(Pry.last_result)}"
     end
 
-    command "whereami", "Show the code context for the session. Shows AROUND lines around the invocation line. AROUND defaults to 5 lines. " do |num|
+
+    command "req", "Requires gem(s). No need for quotes! (If the gem isn't installed, it will ask if you want to install it.)" do |*gems|
+      gems = gems.join(' ').gsub(',', '').split(/\s+/)
+      gems.each do |gem|
+        begin
+          if require gem
+            output.puts "#{bright_yellow(gem)} loaded"
+          else
+            output.puts "#{bright_white(gem)} already loaded"
+          end
+
+        rescue LoadError => e
+
+          if gem_installed? gem
+            output.puts e.inspect
+          else
+            output.puts "#{bright_red(gem)} not found"
+            if prompt("Install the gem?") == "y"
+              run "gem-install", gem
+            end
+          end
+
+        end # rescue
+      end # gems.each
+    end
+
+
+    command "gem-list", "List/search installed gems. (Optional parameter: a regexp to limit the search)" do |arg|
+      gems = Gem.source_index.gems.values.group_by(&:name)
+      if arg
+        query = Regexp.new(arg, Regexp::IGNORECASE)
+        gems = gems.select { |gemname, specs| gemname =~ query }
+      end
+
+      gems.each do |gemname, specs|
+        versions = specs.map(&:version).sort.reverse.map(&:to_s)
+        versions = ["<bright_green>#{versions.first}</bright_green>"] +
+                   versions[1..-1].map{|v| "<green>#{v}</green>" }
+
+        gemname = highlight(gemname, query) if query
+        result = "<white>#{gemname} <grey>(#{versions.join ', '})</grey>"
+        output.puts colorize(result)
+      end
+    end
+
+
+    command "whereami", "Show the code context for the session. (whereami <n> shows <n> extra lines of code around the invocation line. Default: 5)" do |num|
       file = target.eval('__FILE__')
       line_num = target.eval('__LINE__')
       klass = target.eval('self.class')
@@ -246,14 +323,14 @@ e.g: gist -d my_method
       meth_name = meth_name_from_binding(target)
       meth_name = "N/A" if !meth_name
 
-      if file =~ /(\(.*\))|<.*>/ || file == ""
+      if file =~ /(\(.*\))|<.*>/ || file == "" || file == "-e"
         output.puts "Cannot find local context. Did you use `binding.pry` ?"
         next
       end
-     
-      set_file_and_dir_locals(file) 
+
+      set_file_and_dir_locals(file)
       output.puts "\n#{bold('From:')} #{file} @ line #{line_num} in #{klass}##{meth_name}:\n\n"
-      
+
       # This method inspired by http://rubygems.org/gems/ir_b
       File.open(file).each_with_index do |line, index|
         line_n = index + 1
@@ -276,25 +353,24 @@ e.g: gist -d my_method
         end
       end
     end
-    
+
     command "version", "Show Pry version." do
       output.puts "Pry version: #{Pry::VERSION} on Ruby #{RUBY_VERSION}."
     end
-    
-    command "exit-all", "End all nested Pry sessions. Accepts optional return value. Aliases: !@" do 
+
+    command "exit-all", "End all nested Pry sessions. Accepts optional return value. Aliases: !!@" do
       str = remove_first_word(opts[:val])
       throw(:breakout, [0, target.eval(str)])
     end
 
-    alias_command "!@", "exit-all", ""
+    alias_command "!!@", "exit-all", ""
 
     command "ls", "Show the list of vars and methods in the current scope. Type `ls --help` for more info." do |*args|
       options = {}
-      
       # Set target local to the default -- note that we can set a different target for
       # ls if we like: e.g ls my_var
       target = target()
-      
+
       OptionParser.new do |opts|
         opts.banner = %{Usage: ls [OPTIONS] [VAR]\n\
 List information about VAR (the current context by default).
@@ -304,7 +380,7 @@ Shows local and instance variables by default.
         opts.on("-g", "--globals", "Display global variables.") do
           options[:g] = true
         end
-        
+
         opts.on("-c", "--constants", "Display constants.") do
           options[:c] = true
         end
@@ -313,15 +389,15 @@ Shows local and instance variables by default.
           options[:l] = true
         end
 
-        opts.on("-i", "--ivars", "Display instance variables.") do 
+        opts.on("-i", "--ivars", "Display instance variables.") do
           options[:i] = true
         end
 
-        opts.on("-k", "--class-vars", "Display class variables.") do 
+        opts.on("-k", "--class-vars", "Display class variables.") do
           options[:k] = true
-        end        
+        end
 
-        opts.on("-m", "--methods", "Display methods (public methods by default).") do 
+        opts.on("-m", "--methods", "Display methods (public methods by default).") do
           options[:m] = true
         end
 
@@ -329,34 +405,42 @@ Shows local and instance variables by default.
           options[:M] = true
         end
 
-        opts.on("-P", "--public", "Display public methods (with -m).") do 
+        opts.on("-P", "--public", "Display public methods (with -m).") do
           options[:P] = true
         end
 
-        opts.on("-r", "--protected", "Display protected methods (with -m).") do 
+        opts.on("-r", "--protected", "Display protected methods (with -m).") do
           options[:r] = true
-        end        
+        end
 
-        opts.on("-p", "--private", "Display private methods (with -m).") do 
+        opts.on("-p", "--private", "Display private methods (with -m).") do
           options[:p] = true
         end
 
-        opts.on("-j", "--just-singletons", "Display just the singleton methods (with -m).") do 
+        opts.on("-j", "--just-singletons", "Display just the singleton methods (with -m).") do
           options[:j] = true
-        end        
+        end
 
-        opts.on("-s", "--super", "Include superclass entries (relevant to constant and methods options).") do 
+        opts.on("-s", "--super", "Include superclass entries (relevant to constant and methods options).") do
           options[:s] = true
         end
-        
+
         opts.on("-a", "--all", "Display all types of entries.") do
           options[:a] = true
         end
 
-        opts.on("-v", "--verbose", "Verbose ouput.") do 
+        opts.on("-v", "--verbose", "Verbose ouput.") do
           options[:v] = true
         end
 
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do
+          options[:f] = true
+        end
+
+        opts.on("--grep REG", "Regular expression to be used.") do |reg|
+          options[:grep] = Regexp.new(reg)
+        end
+
         opts.on_tail("-h", "--help", "Show this message.") do
           output.puts opts
           options[:h] = true
@@ -374,18 +458,21 @@ Shows local and instance variables by default.
                        :l => true,
                        :i => true,
                        :k => true
-                     }) if options.empty? || (options.size == 1 && options[:v])
+                     }) if options.empty? || (options.size == 1 && options[:v]) || (options.size == 1 && options[:grep])
+
+      options[:grep] = // if !options[:grep]
+
 
       # Display public methods by default if -m or -M switch is used.
       options[:P] = true if (options[:m] || options[:M]) && !(options[:p] || options[:r] || options[:j])
-      
+
       info = {}
       target_self = target.eval('self')
 
       # ensure we have a real boolean and not a `nil` (important when
       # interpolating in the string)
       options[:s] = !!options[:s]
-      
+
       # Numbers (e.g 0, 1, 2) are for ordering the hash values in Ruby 1.8
       i = -1
 
@@ -400,7 +487,7 @@ Shows local and instance variables by default.
                                  end, i += 1] if options[:k] || options[:a]
 
       info["global variables"] = [Array(target.eval("global_variables")).sort, i += 1] if options[:g] || options[:a]
-      
+
       info["public methods"] = [Array(target.eval("public_methods(#{options[:s]})")).uniq.sort, i += 1] if (options[:m] && options[:P]) || options[:a]
 
       info["protected methods"] = [Array(target.eval("protected_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:r]) || options[:a]
@@ -408,52 +495,77 @@ Shows local and instance variables by default.
       info["private methods"] = [Array(target.eval("private_methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:p]) || options[:a]
 
       info["just singleton methods"] = [Array(target.eval("methods(#{options[:s]})")).sort, i += 1] if (options[:m] && options[:j]) || options[:a]
-      
+
       info["public instance methods"] = [Array(target.eval("public_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:P]) || options[:a])
 
       info["protected instance methods"] = [Array(target.eval("protected_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:r]) || options[:a])
 
       info["private instance methods"] = [Array(target.eval("private_instance_methods(#{options[:s]})")).uniq.sort, i += 1] if target_self.is_a?(Module) && ((options[:M] && options[:p]) || options[:a])
-      
+
       # dealing with 1.8/1.9 compatibility issues :/
       csuper = options[:s]
       if Module.method(:constants).arity == 0
         csuper = nil
       end
-      
+
       info["constants"] = [Array(target_self.is_a?(Module) ? target.eval("constants(#{csuper})") :
                                  target.eval("self.class.constants(#{csuper})")).uniq.sort, i += 1] if options[:c] || options[:a]
 
+      text = ""
+
       # verbose output?
       if options[:v]
-
         # verbose
+
         info.sort_by { |k, v| v.last }.each do |k, v|
           if !v.first.empty?
-            output.puts "#{k}:\n--"
+            text <<  "#{k}:\n--\n"
+            filtered_list = v.first.grep options[:grep]
             if Pry.color
-              output.puts CodeRay.scan(Pry.view(v.first), :ruby).term
+              text << CodeRay.scan(Pry.view(filtered_list), :ruby).term + "\n"
             else
-              output.puts Pry.view(v.first)
+              text << Pry.view(filtered_list) + "\n"
             end
-            output.puts
+            text << "\n\n"
           end
         end
 
+        if !options[:f]
+          stagger_output(text)
+        else
+          output.puts text
+        end
+
       # plain
       else
         list = info.values.sort_by(&:last).map(&:first).inject(&:+)
+        list = list.grep(options[:grep]) if list
         list.uniq! if list
         if Pry.color
-          output.puts CodeRay.scan(Pry.view(list), :ruby).term
+          text << CodeRay.scan(Pry.view(list), :ruby).term + "\n"
+        else
+          text <<  Pry.view(list) + "\n"
+        end
+        if !options[:f]
+          stagger_output(text)
         else
-          output.puts Pry.view(list)
+          output.puts text
         end
         list
       end
     end
 
-    command "cat-file", "Show output of file FILE. Type `cat-file --help` for more information." do |*args|
+    command "lls", "List local files using 'ls'" do |*args|
+      cmd = ".ls"
+      cmd << " --color=always" if Pry.color
+      run cmd, *args
+    end
+
+    command "lcd", "Change the current (working) directory" do |*args|
+      run ".cd", *args
+    end
+
+    command "cat", "Show output of file FILE. Type `cat --help` for more information." do |*args|
       options= {}
       file_name = nil
       start_line = 0
@@ -461,9 +573,9 @@ Shows local and instance variables by default.
       file_type = nil
 
       OptionParser.new do |opts|
-        opts.banner = %{Usage: cat-file [OPTIONS] FILE
+        opts.banner = %{Usage: cat [OPTIONS] FILE
 Cat a file. Defaults to displaying whole file. Syntax highlights file if type is recognized.
-e.g: cat-file hello.rb
+e.g: cat hello.rb
 --
 }
         opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
@@ -482,11 +594,11 @@ e.g: cat-file hello.rb
           file_type = type.to_sym
         end
 
-        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do
           options[:f] = true
         end
 
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on_tail("-h", "--help", "This message.") do
           output.puts opts
           options[:h] = true
         end
@@ -495,7 +607,7 @@ e.g: cat-file hello.rb
       end
 
       next if options[:h]
-      
+
       if !file_name
         output.puts "Must provide a file name."
         next
@@ -516,7 +628,7 @@ e.g: cat-file hello.rb
       options = {}
       target = target()
       file_name = nil
-      
+
       OptionParser.new do |opts|
         opts.banner = %{Usage: eval-file [OPTIONS] FILE
 Eval a Ruby script at top-level or in the specified context. Defaults to top-level.
@@ -528,7 +640,7 @@ e.g: eval-file -c self "hello.rb"
           target = Pry.binding_for(target.eval(context))
         end
 
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on_tail("-h", "--help", "This message.") do
           output.puts opts
           options[:h] = true
         end
@@ -556,73 +668,57 @@ e.g: eval-file -c self "hello.rb"
 
       new_constants = Object.constants - old_constants
       output.puts "Brought in the following top-level constants: #{new_constants.inspect}" if !new_constants.empty?
-    end      
-
-    command "cat", "Show output of VAR.inspect. Aliases: inspect" do |obj|
-      if !obj
-        output.puts "Must provide an object to inspect."
-        next
-      end
-      
-      output.puts Pry.view(target.eval("#{obj}"))
     end
 
-    alias_command "inspect", "cat", ""
-    
     command "cd", "Start a Pry session on VAR (use `cd ..` to go back and `cd /` to return to Pry top-level)",  :keep_retval => true do |obj|
       if !obj
         output.puts "Must provide an object."
         next
       end
-      
+
       throw(:breakout, opts[:nesting].level) if obj == ".."
 
-      if obj == "/" 
+      if obj == "/"
         throw(:breakout, 1) if opts[:nesting].level > 0
         next
-      end    
+      end
 
       Pry.start target.eval("#{obj}")
     end
 
     command "show-doc", "Show the comments above METH. Type `show-doc --help` for more info. Aliases: \?" do |*args|
-      options = {}
       target = target()
-      meth_name = nil
-      
-      OptionParser.new do |opts|
-        opts.banner = %{Usage: show-doc [OPTIONS] [METH]
+
+      opts = Slop.parse!(args) do |opts|
+        opts.banner %{Usage: show-doc [OPTIONS] [METH]
 Show the comments above method METH. Tries instance methods first and then methods by default.
 e.g show-doc hello_method
 --
 }
-        opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
-          options[:M] = true
-        end
-
-        opts.on("-m", "--methods", "Operate on methods.") do 
-          options[:m] = true
-        end
-
-        opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
+        opts.on :M, "instance-methods", "Operate on instance methods."
+        opts.on :m, :methods, "Operate on methods."
+        opts.on :c, :context, "Select object context to run under.", true do |context|
           target = Pry.binding_for(target.eval(context))
         end
-
-        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
-          options[:f] = true
-        end
-
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on :f, :flood, "Do not use a pager to view text longer than one screen."
+        opts.on :h, :help, "This message." do
           output.puts opts
-          options[:h] = true
         end
-      end.order(args) do |v|
-        meth_name = v
       end
 
-      next if options[:h]
+      next if opts.help?
+
+      meth_name = args.shift
+      if meth_name
+        if meth_name =~ /\A([^\.\#]+)[\.\#](.+)\z/ && !opts.context?
+          context, meth_name = $1, $2
+          target = Pry.binding_for(target.eval(context))
+        end
+      else
+        meth_name = meth_name_from_binding(target)
+      end
 
-      if (meth = get_method_object(meth_name, target, options)).nil?
+      if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
         output.puts "Invalid method name: #{meth_name}. Type `show-doc --help` for help"
         next
       end
@@ -631,65 +727,55 @@ e.g show-doc hello_method
       next if !doc
 
       next output.puts("No documentation found.") if doc.empty?
-      
+
       doc = process_comment_markup(doc, code_type)
-      
+
       output.puts make_header(meth, code_type, doc)
 
-      render_output(options[:f], false, doc)
+      render_output(opts.flood?, false, doc)
       doc
     end
 
     alias_command "?", "show-doc", ""
 
     command "show-method", "Show the source for METH. Type `show-method --help` for more info. Aliases: $, show-source" do |*args|
-      options = {}
       target = target()
-      meth_name = nil
-      
-      OptionParser.new do |opts|
-        opts.banner = %{Usage: show-method [OPTIONS] [METH]
+
+      opts = Slop.parse!(args) do |opts|
+        opts.banner %{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
 --
 }
-        opts.on("-l", "--line-numbers", "Show line numbers.") do |line|
-          options[:l] = true
-        end
-
-        opts.on("-M", "--instance-methods", "Operate on instance methods.") do 
-          options[:M] = true
-        end
-
-        opts.on("-m", "--methods", "Operate on methods.") do 
-          options[:m] = true
-        end
-
-        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
-          options[:f] = true
-        end
-
-        opts.on("-c", "--context CONTEXT", "Select object context to run under.") do |context|
+        opts.on :l, "line-numbers", "Show line numbers."
+        opts.on :M, "instance-methods", "Operate on instance methods."
+        opts.on :m, :methods, "Operate on methods."
+        opts.on :f, :flood, "Do not use a pager to view text longer than one screen."
+        opts.on :c, :context, "Select object context to run under.", true do |context|
           target = Pry.binding_for(target.eval(context))
         end
-
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on :h, :help, "This message." do
           output.puts opts
-          options[:h] = true
         end
-      end.order(args) do |v|
-        meth_name = v
       end
 
-      next if options[:h]
+      next if opts.help?
 
-      meth_name = meth_name_from_binding(target) if !meth_name
+      meth_name = args.shift
+      if meth_name
+        if meth_name =~ /\A([^\.\#]+)[\.\#](.+)\z/ && !opts.context?
+          context, meth_name = $1, $2
+          target = Pry.binding_for(target.eval(context))
+        end
+      else
+        meth_name = meth_name_from_binding(target)
+      end
 
-      if (meth = get_method_object(meth_name, target, options)).nil?
+      if (meth = get_method_object(meth_name, target, opts.to_hash(true))).nil?
         output.puts "Invalid method name: #{meth_name}. Type `show-method --help` for help"
         next
       end
-    
+
       code, code_type = code_and_code_type_for(meth)
       next if !code
 
@@ -699,11 +785,11 @@ e.g: show-method hello_method
       end
 
       start_line = false
-      if options[:l]
+      if opts.l?
         start_line = meth.source_location ? meth.source_location.last : 1
       end
-      
-      render_output(options[:f], start_line, code)
+
+      render_output(opts.flood?, start_line, code)
       code
     end
 
@@ -714,10 +800,10 @@ e.g: show-method hello_method
       options = {}
       target = target()
       command_name = nil
-      
+
       OptionParser.new do |opts|
         opts.banner = %{Usage: show-command [OPTIONS] [CMD]
-Show the source for command CMD. 
+Show the source for command CMD.
 e.g: show-command show-method
 --
 }
@@ -725,11 +811,11 @@ e.g: show-command show-method
           options[:l] = true
         end
 
-        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do 
+        opts.on("-f", "--flood", "Do not use a pager to view text longer than one screen.") do
           options[:f] = true
         end
 
-        opts.on_tail("-h", "--help", "This message.") do 
+        opts.on_tail("-h", "--help", "This message.") do
           output.puts opts
           options[:h] = true
         end
@@ -743,7 +829,7 @@ e.g: show-command show-method
         output.puts "You must provide a command name."
         next
       end
-      
+
       if commands[command_name]
         meth = commands[command_name][:action]
 
@@ -764,7 +850,7 @@ e.g: show-command show-method
         output.puts "No such command: #{command_name}."
       end
     end
-    
+
     command "jump-to", "Jump to a Pry session further up the stack, exiting all sessions below." do |break_level|
       break_level = break_level.to_i
       nesting = opts[:nesting]
@@ -780,7 +866,7 @@ e.g: show-command show-method
       end
     end
 
-    command "exit", "End the current Pry session. Accepts optional return value. Aliases: quit, back" do 
+    command "exit", "End the current Pry session. Accepts optional return value. Aliases: quit, back" do
       str = remove_first_word(opts[:val])
       throw(:breakout, [opts[:nesting].level, target.eval(str)])
     end
@@ -825,7 +911,7 @@ Wait for the early owl.
       output.puts text
       text
     end
-    
+
     command "cohen-poem", "" do
       text = %{
 --
@@ -843,7 +929,7 @@ and so small between the thin pines
 on these enormous landscapes,
 that if you turn your head
 they are lost for hours.
--- Leonard Cohen                    
+-- Leonard Cohen
                 }
   output.puts text
   text