pry 0.9.5 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,24 @@
+19/9/2011 version 0.9.6
+* restored previous behavior of command-line switches (allowing "-rfilename")
+* removed -p option (--play) from edit command
+* `edit` with no arguments now edits the current or most recent expression
+* `edit` auto-reloads .rb files (need to specify -n to suppress)
+* added -p option (--patch) to edit-method command, which allows
+    monkeypatching methods without touching the original file
+* edit-method can now edit REPL-defined methods
+* cat --ex now works on exceptions in REPL-defined code
+* play -m now uses eval_string.replace()
+* play -m --open uses show-input to show play'd code
+* added "unindent" helper to make adding help to commands easier
+* local ./.pryrc now loaded after ~/.pryrc if it exists
+* cat --ex N and edit --ex N now can navigate through backtrace, where cat --ex (with no args) moves throuh successive levels of the backtrace automatically with state stored on the exceptino object itself
+* new option Pry.config.exception_window_size determines window size for cat --ex
+* input_stack now implemented - pushing objects onto a pry instance's input_stack causes the instance to read from those objects in turn as it encounters EOF on the previous object. On finishing the input_stack the input object for the pry instance is set back to Pry.config.input, if this fails, pry breaks out of the REPL (throw(:breakout)) with an error message
+* Pry.config.system() defines how pry runs system commands
+* now injecting target_self method into command scope
+* play now performs 'show-input' always unless eval_string contains a valid expression (i.e it's about to be eval'd)
+* play and hist --replay now push the current input object onto the input_stack before redirecting input to a StringIO (works much better with pry-remote now)
+
 8/9/2011 version 0.9.5
 
 MAJOR NEW FEATURES:

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.markdown

@@ -1,16 +1,20 @@
+<center>
 ![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_350.png)
 
 (C) John Mair (banisterfiend) 2011
 
-_Get to the code_
 
-**Note that JRuby is not yet supported in this release, but will be
-  soon.**
-  
- **Please** [DONATE](http://www.pledgie.com/campaigns/15899) to the Pry project - Pry was a **huge** amount of work and every donation received is encouraging and supports Pry's continued development!
+**Please** [DONATE](http://www.pledgie.com/campaigns/15899) to the Pry project - Pry was a **huge** amount of work and every donation received is encouraging and supports Pry's continued development!
+
+**Sponsors**
+
+[Atomic Object](http://www.atomicobject.com/)
+
+**Other Resources**
 
 [Skip to the website (recommended)](http://pry.github.com) <br />
 [Skip to the wiki](https://github.com/pry/pry/wiki)
+</center>
 
 Pry is a powerful alternative to the standard IRB shell for Ruby. It is
 written from scratch to provide a number of advanced features, some of
@@ -28,11 +32,11 @@ these include:
 * Exotic object support (BasicObject instances, IClasses, ...)
 * A Powerful and flexible command system
 * Ability to view and replay history
-* Many convenience commands inspired by IPython and other advanced REPLs
+* Many convenience commands inspired by IPython, Smalltalk and other advanced REPLs
 
 Pry also aims to be more than an IRB replacement; it is an
 attempt to bring REPL driven programming to the Ruby language. It is
-currently not nearly as powerful as tools like [SLIME](http://en.wikipedia.org/wiki/SLIME) for lisp, but that is the
+currently not as powerful as tools like [SLIME](http://en.wikipedia.org/wiki/SLIME) for lisp, but that is the
 general direction Pry is heading.
 
 Pry is also fairly flexible and allows significant user
@@ -352,14 +356,12 @@ avaiable.
 
 ### Use Pry as your Rails Console
 
-    pry -r./config/environment
+    pry -r ./config/environment
 
 MyArtChannel has kindly provided a hack to replace the `rails console` command in Rails 3: [https://gist.github.com/941174](https://gist.github.com/941174) This is not recommended for code bases with multiple developers, as they may not all want to use Pry.
 
 ### Limitations:
 
-* JRuby not officially supported due to currently too many quirks and
- strange behaviour. This will be fixed soon.
 * Tab completion is currently a bit broken/limited this will have a
   major overhaul in a future version.
 
@@ -376,7 +378,6 @@ Many new features are planned such as:
 
 * Increase modularity (rely more on plugin system)
 * Much improved tab completion (using [Bond](http://github.com/cldwalker/bond))
-* Improved JRuby support
 * Much improved documentation system, better support for YARD
 * Better support for code and method reloading and saving code
 * Extended and more sophisticated command system, allowing piping
@@ -388,9 +389,6 @@ Problems or questions contact me at [github](http://github.com/banister)
 
 ### Contributors
 
-The Pry team consists of:
-
-* [banisterfiend](http://github.com/banister)
-* [Rob Gleeson](https://github.com/robgleeson)
-* [Mon_Ouie](http://github.com/mon-ouie)
-* [injekt](http://github.com/injekt)
+Pry is primarily the work of [John Mair (banisterfiend)]((http://github.com/banister)), for full list
+of contributors see the
+[CONTRIBUTORS](https://github.com/pry/pry/blob/master/CONTRIBUTORS) file.

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 desc "Run tests"
 task :test do
-  sh "bacon -Itest -rubygems -a"
+  sh "bacon -Itest -rubygems -a -q"
 end
 
 desc "run pry"

data/bin/pry

@@ -12,7 +12,7 @@ rescue LoadError
   require 'pry'
 end
 
-opts = Slop.parse(:help => true) do
+opts = Slop.parse(:help => true, :multiple_switches => false) do
   banner %{Usage: pry [OPTIONS]
 Start a Pry session.
 See: `https://github.com/banister` for more information.
@@ -80,10 +80,12 @@ Pry.cli = true
 # create the actual context
 context = Pry.binding_for(eval(opts[:context]))
 
-# run code passed with `-e`, if there is any.
-if opts.exec?
-  Pry.new(:input => StringIO.new(opts[:exec]), :print => proc {}).rep(context)
+if opts[:exec]
+  exec_string = opts[:exec] + "\n"
+else
+  exec_string = ""
 end
 
-# start the session
-context.pry
+# Start the session (running any code passed with -e, if there is any)
+Pry.start(context, :input => StringIO.new(exec_string), :input_stack => [Readline])
+

data/examples/example_command_override.rb

@@ -14,7 +14,7 @@ class MyCommands < Pry::CommandBase
   import_from Pry::Commands, "status"
 
   # analogy to Ruby's native alias_method idiom for decorating a method
-  alias_command "old_status", "status", ""
+  alias_command "old_status", "status"
 
   # Invoke one command from within another using `run`
   command "status", "Modified status."  do |x|

data/lib/pry.rb

@@ -21,7 +21,7 @@ class Pry
   DEFAULT_PRINT = proc do |output, value|
     stringified = begin
                     value.pretty_inspect
-                  rescue RescuableException => ex
+                  rescue RescuableException
                     nil
                   end
 
@@ -29,7 +29,6 @@ class Pry
       # Read the class name off of the singleton class to provide a default inspect.
       klass = (class << value; self; end).ancestors.first
       stringified = "#<#{klass}:0x#{value.__id__.to_s(16)}>"
-      Helpers::BaseHelpers.stagger_output("output error: #{ex.inspect}", output) if ex
     end
 
     Helpers::BaseHelpers.stagger_output("=> #{Helpers::BaseHelpers.colorize_code(stringified)}", output)
@@ -51,11 +50,14 @@ class Pry
   end
 
   # Will only show the first line of the backtrace
-  DEFAULT_EXCEPTION_HANDLER = proc do |output, exception|
+  DEFAULT_EXCEPTION_HANDLER = proc do |output, exception, _|
     output.puts "#{exception.class}: #{exception.message}"
     output.puts "from #{exception.backtrace.first}"
   end
 
+  # Don't catch these exceptions
+  DEFAULT_EXCEPTION_WHITELIST = [SystemExit, SignalException]
+
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
                     proc { |target_self, nest_level, _|
@@ -115,6 +117,11 @@ class Pry
                 end,
                ]
 
+  DEFAULT_SYSTEM = proc do |output, cmd, _|
+    if !system(cmd)
+      output.puts "Error: there was a problem executing system command: #{cmd}"
+    end
+  end
 
   # As a REPL, we often want to catch any unexpected exceptions that may have
   # been raised; however we don't want to go overboard and prevent the user
@@ -128,7 +135,7 @@ class Pry
         true
         # Don't catch signals (particularly not SIGTERM) as these are unlikely to be
         # intended for pry itself. We should also make sure that Kernel#exit works.
-      when SystemExit, SignalException
+      when *Pry.config.exception_whitelist
         false
         # All other exceptions will be caught.
       else
@@ -148,6 +155,14 @@ require "optparse"
 require "slop"
 require "rubygems/dependency_installer"
 
+if RUBY_PLATFORM =~ /jruby/
+  begin
+    require 'ffi'
+  rescue LoadError
+    $stderr.puts "Need to `gem install ffi`"
+  end
+end
+
 if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
   begin
     require 'win32console'

data/lib/pry/command_context.rb

@@ -11,6 +11,7 @@ class Pry
 
     attr_accessor :output
     attr_accessor :target
+    attr_accessor :target_self
     attr_accessor :captures
     attr_accessor :eval_string
     attr_accessor :arg_string

data/lib/pry/command_processor.rb

@@ -154,6 +154,7 @@ class Pry
       # set some useful methods to be used by the action blocks
       context.opts        = options
       context.target      = target
+      context.target_self = target.eval('self')
       context.output      = output
       context.captures    = options[:captures]
       context.eval_string = options[:eval_string]

data/lib/pry/command_set.rb

@@ -168,10 +168,10 @@ class Pry
     # @param [String] new_name New name of the command.
     # @param [String] old_name Old name of the command.
     # @param [String, nil] desc New description of the command.
-    def alias_command(new_name, old_name, desc = nil)
+    def alias_command(new_name, old_name, desc="")
       commands[new_name] = commands[old_name].dup
       commands[new_name].name = new_name
-      commands[new_name].description = desc if desc
+      commands[new_name].description = desc
     end
 
     # Runs a command.

data/lib/pry/config.rb

@@ -29,6 +29,9 @@ class Pry
     #   Pry instances.
     attr_accessor :exception_handler
 
+    # @return [Array] The classes of exception that will not be caught by Pry.
+    attr_accessor :exception_whitelist
+
     # Get/Set the Hash that defines Pry hooks used by default by all Pry
     # instances.
     # @return [Hash] The hooks used by default by all Pry instances.
@@ -37,6 +40,13 @@ class Pry
     #     :after_session => proc { puts "goodbye" }
     attr_accessor :hooks
 
+    # Get/Set the stack of input objects that a Pry instance switches
+    # to when its current input object encounters EOF.
+    # @return [Array] The array of input objects.
+    # @example
+    #   Pry.config.input_stack = [StringIO.new("puts 'hello world'\nexit")]
+    attr_accessor :input_stack
+
     # Get the array of Procs to be used for the prompts by default by
     # all Pry instances.
     # @return [Array<Proc>] The array of Procs to be used for the
@@ -111,6 +121,11 @@ class Pry
     # @return [Proc] The proc that manages ^D presses in the REPL.
     #   The proc is passed the current eval_string and the current pry instance.
     attr_accessor :control_d_handler
+
+    # @return [Proc] The proc that runs system commands
+    #   The proc is passed the pry output object, the command string
+    #   to eval, and a reference to the pry instance
+    attr_accessor :system
   end
 end
 

data/lib/pry/default_commands/context.rb

@@ -91,7 +91,7 @@ class Pry
         throw(:breakout, target.eval(arg_string))
       end
 
-      alias_command "!!@", "exit-all", ""
+      alias_command "!!@", "exit-all"
 
       command "exit", "Pop the current binding and return to the one immediately prior. Note this does NOT exit the program. Aliases: quit", :keep_retval => true do
         if _pry_.binding_stack.one?
@@ -111,15 +111,15 @@ class Pry
         end
       end
 
-      alias_command "quit", "exit", ""
+      alias_command "quit", "exit"
 
       command "exit-program", "End the current program. Aliases: quit-program, !!!" do
         Pry.save_history if Pry.config.history.should_save
         Kernel.exit target.eval(arg_string).to_i
       end
 
-      alias_command "quit-program", "exit-program", ""
-      alias_command "!!!", "exit-program", ""
+      alias_command "quit-program", "exit-program"
+      alias_command "!!!", "exit-program"
 
       command "!pry", "Start a Pry session on current self; this even works mid multi-line expression." do
         target.pry
@@ -147,6 +147,10 @@ class Pry
         set_file_and_dir_locals(file)
         output.puts "\n#{text.bold('From:')} #{file} @ line #{line_num} in #{klass}##{meth_name}:\n\n"
 
+        unless File.readable?(file)
+          output.puts "Cannot open #{file.inspect} for reading."
+          next
+        end
 
         # This method inspired by http://rubygems.org/gems/ir_b
         File.open(file).each_with_index do |line, index|

data/lib/pry/default_commands/documentation.rb

@@ -11,9 +11,11 @@ class Pry
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner = "Usage: show-doc [OPTIONS] [METH 1] [METH 2] [METH N]\n" \
-                       "Show the comments above method METH. Tries instance methods first and then methods by default.\n" \
-                       "e.g show-doc hello_method"
+          opt.banner unindent <<-USAGE
+            Usage: show-doc [OPTIONS] [METH 1] [METH 2] [METH N]
+            Show the comments above method METH. Tries instance methods first and then methods by default.
+            e.g show-doc hello_method
+          USAGE
 
           opt.on :M, "instance-methods", "Operate on instance methods."
           opt.on :m, :methods, "Operate on methods."
@@ -50,15 +52,17 @@ class Pry
         end
       end
 
-      alias_command "?", "show-doc", ""
+      alias_command "?", "show-doc"
 
       command "stat", "View method information and set _file_ and _dir_ locals. Type `stat --help` for more info." do |*args|
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: stat [OPTIONS] [METH]\n" \
-                     "Show method information for method METH and set _file_ and _dir_ locals." \
-                     "e.g: stat hello_method"
+          opt.banner unindent <<-USAGE
+            Usage: stat [OPTIONS] [METH]
+            Show method information for method METH and set _file_ and _dir_ locals.
+            e.g: stat hello_method
+          USAGE
 
           opt.on :M, "instance-methods", "Operate on instance methods."
           opt.on :m, :methods, "Operate on methods."
@@ -100,11 +104,13 @@ class Pry
         target = target()
 
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: gist-method [OPTIONS] [METH]\n" \
-                     "Gist the method (doc or source) to github.\n" \
-                     "Ensure the `gist` gem is properly working before use. http://github.com/defunkt/gist for instructions.\n" \
-                     "e.g: gist -m my_method\n" \
-                     "e.g: gist -d my_method\n"
+          opt.banner unindent <<-USAGE
+            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
+          USAGE
 
           opt.on :m, :method, "Gist a method's source."
           opt.on :d, :doc, "Gist a method's documentation."

data/lib/pry/default_commands/input.rb

@@ -17,14 +17,16 @@ class Pry
         start_line_number, end_line_number, replacement_line = *args
 
         opts = Slop.parse!(args.compact) do |opt|
-          opt.banner %{Amend a line of input in multi-line mode. `amend-line N`, where the N in `amend-line N` represents line to replace.
-
-Can also specify a range of lines using `amend-line N..M` syntax. Passing '!' as replacement content deletes the line(s) instead. Aliases: %N
-e.g amend-line 1 puts 'hello world! # replace line 1'
-e.g amend-line 1..4 !               # delete lines 1..4
-e.g amend-line 3 >puts 'goodbye'    # insert before line 3
-e.g amend-line puts 'hello again'   # no line number modifies immediately preceding line
-}
+          opt.banner unindent <<-USAGE
+            Amend a line of input in multi-line mode. `amend-line N`, where the N in `amend-line N` represents line to replace.
+
+            Can also specify a range of lines using `amend-line N..M` syntax. Passing '!' as replacement content deletes the line(s) instead. Aliases: %N
+            e.g amend-line 1 puts 'hello world! # replace line 1'
+            e.g amend-line 1..4 !               # delete lines 1..4
+            e.g amend-line 3 >puts 'goodbye'    # insert before line 3
+            e.g amend-line puts 'hello again'   # no line number modifies immediately preceding line
+          USAGE
+
           opt.on :h, :help, "This message." do
             output.puts opt
           end
@@ -52,11 +54,17 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
         run "show-input"
       end
 
-      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/, "")
+      alias_command(/%.?(-?\d+)?(?:\.\.(-?\d+))?/, /amend-line(?: (-?\d+)(?:\.\.(-?\d+))?)?/)
 
       command "play", "Play back a string variable or a method or a file as input. Type `play --help` for more information." do |*args|
         opts = Slop.parse!(args) do |opt|
-          opt.banner "Usage: play [OPTIONS] [--help]\nDefault action (no options) is to play the provided string variable\ne.g `play _in_[20] --lines 1..3`\ne.g `play -m Pry#repl --lines 1..-1`\ne.g `play -f Rakefile --lines 5`"
+          opt.banner unindent <<-USAGE
+            Usage: play [OPTIONS] [--help]
+            Default action (no options) is to play the provided string variable
+            e.g `play _in_[20] --lines 1..3`
+            e.g `play -m Pry#repl --lines 1..-1`
+            e.g `play -f Rakefile --lines 5`
+          USAGE
 
           opt.on :l, :lines, 'The line (or range of lines) to replay.', true, :as => Range
           opt.on :m, :method, 'Play a method.', true
@@ -79,7 +87,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
-          _pry_.input = StringIO.new(Array(code.each_line.to_a[range]).join)
+          eval_string << Array(code.each_line.to_a[range]).join
         elsif opts.f?
           file_name = File.expand_path(opts[:f])
           next output.puts "No such file: #{opts[:f]}" if !File.exists?(file_name)
@@ -87,6 +95,7 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           range = opts.l? ? one_index_range_or_number(opts[:l]) : (0..-1)
           range = (0..-2) if opts.o?
 
+          _pry_.input_stack << _pry_.input
           _pry_.input = StringIO.new(Array(text_array[range]).join)
         else
           next output.puts "Error: no input to play command" if !args.first
@@ -97,6 +106,8 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
 
           eval_string << Array(code.each_line.to_a[range]).join
         end
+
+        run "show-input" if !_pry_.valid_expression?(eval_string)
       end
 
       command "hist", "Show and replay Readline history. Type `hist --help` for more info. Aliases: history" do |*args|
@@ -106,86 +117,121 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
         opts = Slop.parse!(args) do |opt|
           opt.banner "Usage: hist [--replay START..END] [--clear] [--grep PATTERN] [--head N] [--tail N] [--help] [--save [START..END] file.txt]\n"
 
-          opt.on :g, :grep, 'A pattern to match against the history.', true do |pattern|
-            pattern = Regexp.new arg_string.strip.split(/ /, 2).last.strip
-            history.pop
+          opt.on :n, 'no-numbers', 'Omit line numbers.'
 
-            history.map!.with_index do |element, index|
-              if element =~ pattern
-                "#{text.blue index}: #{element}"
-              end
-            end
+          opt.on :g, :grep, 'A pattern to match against the history.', true
 
-            stagger_output history.compact.join "\n"
-          end
+          opt.on :head, 'Display the first N items of history.',
+                 :optional => true,
+                 :as       => Integer
 
-          opt.on :head, 'Display the first N items of history',
+          opt.on :t, :tail, 'Display the last N items of history.',
                  :optional => true,
-                 :as       => Integer,
-                 :unless   => :grep do |limit|
+                 :as       => Integer
 
-            limit ||= 10
-            list  = history.first limit
-            lines = text.with_line_numbers list.join("\n"), 0
-            stagger_output lines
-          end
+          opt.on :s, :show, 'Show the history corresponding to the history line (or range of lines).',
+                 :optional => true,
+                 :as       => Range
 
-          opt.on :t, :tail, 'Display the last N items of history',
-                     :optional => true,
-                     :as       => Integer,
-                     :unless   => :grep do |limit|
+          opt.on :e, :exclude, 'Exclude pry commands from the history.'
 
-            limit ||= 10
-            offset = history.size - limit
-            offset = offset < 0 ? 0 : offset
+          opt.on :r, :replay, 'The line (or range of lines) to replay.', true,
+                 :as => Range
 
-            list  = history.last limit
-            lines = text.with_line_numbers list.join("\n"), offset
-            stagger_output lines
-          end
+          opt.on "save", "Save history to a file. --save [start..end] output.txt. Pry commands are excluded from saved history.", true,
+                 :as => Range
 
-          opt.on :s, :show, 'Show the history corresponding to the history line (or range of lines).',
-                 true,
-                 :as     => Range,
-                 :unless => :grep do |range|
+          opt.on :c, :clear, 'Clear the history.', :unless => :grep
 
-            start_line = range.is_a?(Range) ? range.first : range
-            lines = text.with_line_numbers Array(history[range]).join("\n"), start_line
-            stagger_output lines
+          opt.on :h, :help, 'Show this message.', :tail => true, :unless => :grep do
+            output.puts opt.help
           end
+        end
+        next if opts.help?
 
-          opt.on :e, :exclude, 'Exclude pry commands from the history.', :unless => :grep do
-            history.map!.with_index do |element, index|
-              unless command_processor.valid_command? element
+        if opts.grep?
+          pattern = Regexp.new(arg_string.strip.split(/ /, 2).last.strip)
+          history.pop
+
+          history.map!.with_index do |element, index|
+            if element =~ pattern
+              if opts.n?
+                element
+              else
                 "#{text.blue index}: #{element}"
               end
             end
-            stagger_output history.compact.join "\n"
           end
 
-          opt.on :r, :replay, 'The line (or range of lines) to replay.',
-                 true,
-                 :as     => Range,
-                 :unless => :grep do |range|
-            actions = Array(history[range]).join("\n") + "\n"
-            _pry_.input = StringIO.new(actions)
+          stagger_output history.compact.join "\n"
+          next
+        end
+
+        if opts.head?
+          limit = opts['head'] || 10
+          list  = history.first limit
+          lines = list.join("\n")
+          if opts.n?
+            stagger_output lines
+          else
+            stagger_output text.with_line_numbers(lines, 0)
           end
+          next
+        end
 
-          opt.on "save", "Save history to a file. --save [start..end] output.txt. Pry commands are excluded from saved history.", true, :as => Range
+        if opts.tail?
+          limit = opts['tail'] || 10
+          offset = history.size - limit
+          offset = offset < 0 ? 0 : offset
 
-          opt.on :c, :clear, 'Clear the history', :unless => :grep do
-            Pry.history.clear
-            output.puts 'History cleared.'
+          list  = history.last limit
+          lines = list.join("\n")
+          if opts.n?
+            stagger_output lines
+          else
+            stagger_output text.with_line_numbers(lines, offset)
           end
+          next
+        end
 
-          opt.on :h, :help, 'Show this message.', :tail => true, :unless => :grep do
-            output.puts opt.help
+        if opts.show?
+          range = opts['show']
+          start_line = range.is_a?(Range) ? range.first : range
+          lines = Array(history[range]).join("\n")
+          if opts.n?
+            stagger_output lines
+          else
+            stagger_output text.with_line_numbers(lines, start_line)
           end
+          next
+        end
 
-          opt.on_empty do
-            lines = text.with_line_numbers history.join("\n"), 0
-            stagger_output lines
+        if opts.exclude?
+          history.map!.with_index do |element, index|
+            unless command_processor.valid_command? element
+              if opts.n?
+                element
+              else
+                "#{text.blue index}: #{element}"
+              end
+            end
           end
+          stagger_output history.compact.join "\n"
+          next
+        end
+
+        if opts.replay?
+          range = opts['replay']
+          actions = Array(history[range]).join("\n") + "\n"
+          _pry_.input_stack << _pry_.input
+          _pry_.input = StringIO.new(actions)
+          next
+        end
+
+        if opts.clear?
+          Pry.history.clear
+          output.puts 'History cleared.'
+          next
         end
 
         # FIXME: hack to save history (this must be refactored)
@@ -214,11 +260,18 @@ e.g amend-line puts 'hello again'   # no line number modifies immediately preced
           end
 
           output.puts "... history saved."
+          next
         end
 
+        lines = history.join("\n")
+        if opts.n?
+          stagger_output lines
+        else
+          stagger_output text.with_line_numbers(lines, 0)
+        end
       end
 
-      alias_command "history", "hist", ""
+      alias_command "history", "hist"
 
       helpers do
         def one_index_number(line_number)