pry 0.10.2-i386-mswin32 → 1.0.0.pre1-i386-mswin32

data/TODO

@@ -0,0 +1,117 @@
+0.9.5
+* include method visiblity in show-doc and stat output
+* tempfile should end in .rb (for edit -t)
+* ls output should not be in array format
+* exceptions should allow access to previous items in the backtrace
+* input should allow multiple objects which are switched to automatically when EOF is reached on the preceding one
+* pry -r should happen in pry
+* more plugin-related commands in pry - see installed ones, see activated ones, see available on rubygems
+* should also allow plugins be explicitly activated as a command line option
+* should not raise if plugin activation fails (should show warning instead)
+* more documentation on CommandContext, etc and also command helpers
+* fix history saving (should not save all of Readline::HISTORY, but only what changed)
+* prevent blank lines going to Readline::HISTORY
+* ensure that cat --ex emulates the `whereami` format - includes line numbers and formatted the same, etc
+* rename inp and out to _inp_ and _out_ otherwise than can overwrite locals by those names when debugging (not good)
+* add source file to stat command
+* make plugins use hash instead of array
+* ensure edit -t has 'edit' alias (no parameters) and dumps eval_string into buffer
+* whitelist exceptions
+* hooks system
+* jruby shell command support
+
+0.9.3
+* hist command now excludes last line of input (the command invocation itself)
+* hist now has `history` alias
+* `pry -r` requires now happen after plugin loading (so as not to interfere with
+* new Pry.config.disable_auto_reload option, for turning off auto reloading by edit-method and related
+* add better error messages for `cd` command
+* add command_prefix
+* change some command names to include hyphen, e.g version => pry-version, install => install-command
+* do cat --ex and edit --ex
+* add reload-method
+* fixed exotic object regression - BasicObject.new etc now return "=> unknown"
+* converted: import => import-set, version => pry-version, install => install-command
+* fix show-doc bug for ruby 1.8 and Kernel.fork
+* edit -t (opens a temporary file and evals it in current context when closed)
+
+0.9.0
+Major features
+--------------
+* Restructure command system and helpers (almost complete)
+* Delete unnecessary commands, add a couple of new ones (e.g amend-line)
+* Readline history
+* Plugin support
+* Support Rubinius core methods
+* in[] and out[] arrays
+* Improve test coverage (test some commands, etc)
+
+Minor changes
+-------------
+* improve edit-method support for various editors
+* ensure all commands have appropriate error handing and informative error messages
+* show-doc should include signature of method
+
+Optional
+--------
+* multi-line readline support
+
+
+0.8.0
+* allow #{} interpolation of all commands
+* update documentation! new commands and features and change in behaviour of `run`
+* add ; at end of line to suppress return value output
+* Remove message spam (before/after hooks)
+* stop commands returning a value
+* use `redo` in the r() method when encounter a command
+* shell functionality should just use system(), but redirect in and
+   out to Pry.input and Pry.output by reassining $stdin and $stdout
+   for duration of block.
+* basicobject and no to_s/inspect support
+* fix documentation, support rdoc and yard properly
+* only load Ripper if 1.9 AND MRI (support jruby 1.9, using
+   RubyParser)
+* shell commands invokable file .<command>
+* supercharge cat-file so it can syntax highlight sourcecode files
+
+
+0.7.0
+* add pry-doc support with syntax highlighting for docs
+* add 'mj' option to ls (restrict to singleton methods)
+* add _ex_ local to hold last exception raised in an exception
+
+0.6.8
+* add whereami command, a la the `ir_b` gem
+* make .pryrc be loaded by run-time pry sessions
+
+0.6.7
+* color support
+* --simple-prompt for pry commandline
+* -I mode for pry commandline
+* --color mode for pry commandline
+* clean up requires (put them all in one place)
+* simple-prompt command and toggle-color commandd.
+
+0.6.1
+* !@ command alias for exit_all
+* `cd /` for breaking out to pry top level (jump-to 0)
+* made `-e` option work in a more effective way for `pry` command line invocation
+* exit and exit-all commands now accept a parameter, this parameter becomes the return value of repl()
+* `command` method from CommandBase now accepts a :keep_retval arg that determines if command value is returned to pry session or just `nil` (`nil` was old behaviour)
+* tests for new :keep_retval and exit-all/exit behaviour; :keep_retval will remain undocumented.
+
+0.5.0 release:
+* !!!! UPDATE DOCUMENTATION !!!!
+* Use clipped version of Pry.view() for large objects
+* Exit Pry session on ^d
+* Use Shellwords for breaking up parameters to pry commands
+* Use OptionParser to parse options for default pry commands
+* Add version command
+* Refactor 'status' command: add current method info
+* Add meth_name_from_binding utility lambda to commands.rb
+* Add -M, -m, -v(erbose), -a(ll), -s(uper), -l(ocals), -i(ivars), -k(klass vars) options to ls
+* add -i(nstance) option to show-method
+* add --help option to most commands
+* Get rid of ls_method and ls_imethods (subsumed by more powerful ls)
+* Get rid of show_idoc and show_imethod
+* Add special eval-file command that evals target file in current context

data/lib/pry.rb

@@ -1,13 +1,10 @@
-# (C) John Mair (banisterfiend) 2013
+# (C) John Mair (banisterfiend) 2011
 # MIT License
 #
-require 'pp'
 
-require 'pry/input_lock'
-require 'pry/exceptions'
+require 'pp'
 require 'pry/helpers/base_helpers'
 require 'pry/hooks'
-require 'forwardable'
 
 class Pry
   # The default hooks - display messages when beginning and ending Pry sessions.
@@ -17,11 +14,42 @@ class Pry
   end
 
   # The default print
-  DEFAULT_PRINT = proc do |output, value, _pry_|
-    _pry_.pager.open do |pager|
-      pager.print _pry_.config.output_prefix
-      Pry::ColorPrinter.pp(value, pager, Pry::Terminal.width! - 1)
+  DEFAULT_PRINT = proc do |output, value|
+    output_with_default_format(output, value, :hashrocket => true)
+  end
+
+  def self.output_with_default_format(output, value, options = {})
+    stringified = begin
+                    value.pretty_inspect
+                  rescue RescuableException
+                    nil
+                  end
+
+    unless String === stringified
+      # Read the class name off of the singleton class to provide a default
+      # inspect.
+      eig = class << value; self; end
+      klass = Pry::Method.safe_send(eig, :ancestors).first
+      id = value.__id__.to_s(16) rescue 0
+      stringified = "#<#{klass}:0x#{id}>"
     end
+
+    nonce = rand(0x100000000).to_s(16) # whatever
+
+    stringified.gsub!(/#</, "%<#{nonce}")
+    # Don't recolorize output with color (for cucumber, looksee, etc.) [Issue #751]
+    colorized = if stringified =~ /\e\[/
+                  stringified
+                else
+                  Helpers::BaseHelpers.colorize_code(stringified)
+                end
+
+    # avoid colour-leak from CodeRay and any of the users' previous output
+    colorized = colorized.sub(/(\n*)\z/, "\e[0m\\1") if Pry.color
+
+    result = colorized.gsub(/%<(.*?)#{nonce}/, '#<\1')
+    result = "=> #{result}"if options[:hashrocket]
+    Helpers::BaseHelpers.stagger_output(result, output)
   end
 
   # may be convenient when working with enormous objects and
@@ -36,7 +64,7 @@ class Pry
 
   # useful when playing with truly enormous objects
   CLIPPED_PRINT = proc do |output, value|
-    output.puts Pry.view_clip(value, id: true)
+    output.puts Pry.view_clip(value)
   end
 
   # Will only show the first line of the backtrace
@@ -54,36 +82,32 @@ class Pry
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
                     proc { |target_self, nest_level, pry|
-                      "[#{pry.input_array.size}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
+                      "[#{pry.input_array.size}] #{Pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
                     },
 
                     proc { |target_self, nest_level, pry|
-                      "[#{pry.input_array.size}] #{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
+                      "[#{pry.input_array.size}] #{Pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
                     }
                    ]
 
-  DEFAULT_PROMPT_SAFE_OBJECTS = [String, Numeric, Symbol, nil, true, false]
-
   # A simple prompt - doesn't display target or nesting level
   SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
 
-  NO_PROMPT = [proc { '' }, proc { '' }]
-
   SHELL_PROMPT = [
-                  proc { |target_self, _, _pry_| "#{_pry_.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
-                  proc { |target_self, _, _pry_| "#{_pry_.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
+                  proc { |target_self, _, _| "#{Pry.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
+                  proc { |target_self, _, _| "#{Pry.config.prompt_name} #{Pry.view_clip(target_self)}:#{Dir.pwd} * " }
                  ]
 
   # A prompt that includes the full object path as well as
   # input/output (_in_ and _out_) information. Good for navigation.
   NAV_PROMPT = [
-                proc do |_, _, _pry_|
-                  tree = _pry_.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{_pry_.input_array.count}] (#{_pry_.config.prompt_name}) #{tree}: #{_pry_.binding_stack.size - 1}> "
+                proc do |conf|
+                  tree = conf.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
+                  "[#{conf.expr_number}] (#{Pry.config.prompt_name}) #{tree}: #{conf.nesting_level}> "
                 end,
-                proc do |_, _, _pry_|
-                  tree = _pry_.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{_pry_.input_array.count}] (#{ _pry_.config.prompt_name}) #{tree}: #{_pry_.binding_stack.size - 1}* "
+                proc do |conf|
+                  tree = conf.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
+                  "[#{conf.expr_number}] (#{ Pry.config.prompt_name}) #{tree}: #{conf.nesting_level}* "
                 end,
                ]
 
@@ -100,7 +124,7 @@ class Pry
     else
       # Otherwise, saves current binding stack as old stack and pops last
       # binding out of binding stack (the old stack still has that binding).
-      _pry_.command_state["cd"] ||= Pry::Config.from_hash({}) # FIXME
+      _pry_.command_state["cd"] ||= OpenStruct.new # FIXME
       _pry_.command_state['cd'].old_stack = _pry_.binding_stack.dup
       _pry_.binding_stack.pop
     end
@@ -116,9 +140,70 @@ class Pry
   # your process has changed directory since boot. [Issue #675]
   INITIAL_PWD = Dir.pwd
 
+  # 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
+  # from exiting Pry when they want to.
+  module RescuableException
+    def self.===(exception)
+      case exception
+        # Catch when the user hits ^C (Interrupt < SignalException), and assume
+        # that they just wanted to stop the in-progress command (just like bash etc.)
+      when Interrupt
+        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 *Pry.config.exception_whitelist
+        false
+        # All other exceptions will be caught.
+      else
+        true
+      end
+    end
+  end
+
+  # An Exception Tag (cf. Exceptional Ruby) that instructs Pry to show the error in
+  # a more user-friendly manner. This should be used when the exception happens within
+  # Pry itself as a direct consequence of the user typing something wrong.
+  #
+  # This allows us to distinguish between the user typing:
+  #
+  # pry(main)> def )
+  # SyntaxError: unexpected )
+  #
+  # pry(main)> method_that_evals("def )")
+  # SyntaxError: (eval):1: syntax error, unexpected ')'
+  # from ./a.rb:2 in `eval'
+  module UserError; end
+
+  # Catches SecurityErrors if $SAFE is set
+  module TooSafeException
+    def self.===(exception)
+      $SAFE > 0 && SecurityError === exception
+    end
+  end
+
+  # Don't catch these exceptions
+  DEFAULT_EXCEPTION_WHITELIST = [SystemExit, SignalException, Pry::TooSafeException]
+
+  # CommandErrors are caught by the REPL loop and displayed to the user. They
+  # indicate an exceptional condition that's fatal to the current command.
+  class CommandError < StandardError; end
+  class MethodNotFound < CommandError; end
+
+  # indicates obsolete API
+  class ObsoleteError < StandardError; end
+
   # This is to keep from breaking under Rails 3.2 for people who are doing that
   # IRB = Pry thing.
-  module ExtendCommandBundle; end
+  module ExtendCommandBundle
+  end
+end
+
+if Pry::Helpers::BaseHelpers.mri_18?
+  begin
+  require 'ruby18_source_location'
+  rescue LoadError
+  end
 end
 
 require 'method_source'
@@ -130,8 +215,41 @@ require 'rbconfig'
 require 'tempfile'
 require 'pathname'
 
+begin
+  require 'readline'
+rescue LoadError
+  warn "You're running a version of ruby with no Readline support"
+  warn "Please `gem install rb-readline` or recompile ruby --with-readline."
+  exit!
+end
+
+if Pry::Helpers::BaseHelpers.jruby?
+  begin
+    require 'ffi'
+  rescue LoadError
+    warn "Need to `gem install ffi`"
+  end
+end
+
+if Pry::Helpers::BaseHelpers.windows? && !Pry::Helpers::BaseHelpers.windows_ansi?
+  begin
+    require 'win32console'
+  # The mswin and mingw versions of pry require win32console, so this should
+  # only fail on jruby (where win32console doesn't work).
+  # Instead we'll recommend ansicon, which does.
+  rescue LoadError
+    warn "For a better pry experience, please use ansicon: http://adoxa.3eeweb.com/ansicon/"
+  end
+end
+
+begin
+  require 'bond'
+rescue LoadError
+end
+
 require 'pry/version'
 require 'pry/repl'
+require 'pry/rbx_method'
 require 'pry/rbx_path'
 require 'pry/code'
 require 'pry/history_array'
@@ -143,19 +261,14 @@ require 'pry/history'
 require 'pry/command'
 require 'pry/command_set'
 require 'pry/commands'
+require 'pry/custom_completions'
+require 'pry/completion'
 require 'pry/plugins'
 require 'pry/core_extensions'
 require 'pry/pry_class'
 require 'pry/pry_instance'
 require 'pry/cli'
-require 'pry/color_printer'
 require 'pry/pager'
 require 'pry/terminal'
 require 'pry/editor'
 require 'pry/rubygem'
-require "pry/indent"
-require "pry/last_exception"
-require "pry/prompt"
-require "pry/inspector"
-require 'pry/object_path'
-require 'pry/output'

data/lib/pry/cli.rb

@@ -1,3 +1,4 @@
+
 class Pry
 
   # Manage the processing of command line options
@@ -10,9 +11,7 @@ class Pry
       # @return [Proc] The Proc defining the valid command line options.
       attr_accessor :options
 
-      # @return [Array] The Procs that process the parsed options. Plugins can
-      #   utilize this facility in order to add and process their own Pry
-      #   options.
+      # @return [Array] The Procs that process the parsed options.
       attr_accessor :option_processors
 
       # @return [Array<String>] The input array of strings to process
@@ -44,7 +43,7 @@ class Pry
       end
 
       # Add a block responsible for processing parsed options.
-      def add_option_processor(&block)
+      def process_options(&block)
         self.option_processors ||= []
         option_processors << block
 
@@ -57,26 +56,14 @@ class Pry
         self.option_processors = nil
       end
 
-      def parse_options(args=ARGV)
+      def parse_options(args=ARGV.dup)
         unless options
           raise NoOptionsError, "No command line options defined! Use Pry::CLI.add_options to add command line options."
         end
 
         self.input_args = args
 
-        begin
-          opts = Slop.parse!(
-            args,
-            :help => true,
-            :multiple_switches => false,
-            :strict => true,
-            &options
-          )
-        rescue Slop::InvalidOptionError
-          # Display help message on unknown switches and exit.
-          puts Slop.new(&options)
-          exit
-        end
+        opts = Slop.parse!(args, :help => true, :multiple_switches => false, &options)
 
         # Option processors are optional.
         if option_processors
@@ -104,19 +91,19 @@ Slop.new do
 end.parse(ARGV.dup)
 
 if Pry.config.should_load_plugins
-  Pry::CLI.add_plugin_options
+  Pry::CLI.add_plugin_options 
 end
 
 # The default Pry command line options (before plugin options are included)
 Pry::CLI.add_options do
   banner %{Usage: pry [OPTIONS]
 Start a Pry session.
-See http://pryrepl.org/ for more information.
+See: `https://github.com/pry` for more information.
 Copyright (c) 2013 John Mair (banisterfiend)
 --
 }
   on :e, :exec=, "A line of code to execute in context before the session starts" do |input|
-    exec_string << input << "\n"
+    exec_string << input + "\n"
   end
 
   on "no-pager", "Disable pager for long output" do
@@ -128,7 +115,7 @@ Copyright (c) 2013 John Mair (banisterfiend)
   end
 
   on "no-color", "Disable syntax highlighting for session" do
-    Pry.config.color = false
+    Pry.color = false
   end
 
   on :f, "Suppress loading of ~/.pryrc and ./.pryrc" do
@@ -149,11 +136,11 @@ Copyright (c) 2013 John Mair (banisterfiend)
     Pry.config.should_load_plugins = false
   end
 
-  on "plugins", "List installed plugins." do
+  on "installed-plugins", "List installed plugins." do
     puts "Installed Plugins:"
     puts "--"
     Pry.locate_plugins.each do |plugin|
-      puts "#{plugin.name}".ljust(18) << plugin.spec.summary
+      puts "#{plugin.name}".ljust(18) + plugin.spec.summary
     end
     exit
   end
@@ -162,10 +149,6 @@ Copyright (c) 2013 John Mair (banisterfiend)
     Pry.config.prompt = Pry::SIMPLE_PROMPT
   end
 
-  on "noprompt", "No prompt mode" do
-    Pry.config.prompt = Pry::NO_PROMPT
-  end
-
   on :r, :require=, "`require` a Ruby script at startup" do |file|
     Pry.config.requires << file
   end
@@ -194,7 +177,7 @@ Copyright (c) 2013 John Mair (banisterfiend)
      "Start the session in the specified context. Equivalent to `context.pry` in a session.",
      :default => "Pry.toplevel_binding"
      )
-end.add_option_processor do |opts|
+end.process_options do |opts|
 
   exit if opts.help?
 
@@ -202,12 +185,7 @@ end.add_option_processor do |opts|
   Pry.cli = true
 
   # create the actual context
-  if opts[:context]
-    Pry.initial_session_setup
-    context = Pry.binding_for(eval(opts[:context]))
-  else
-    context = Pry.toplevel_binding
-  end
+  context = Pry.binding_for(eval(opts[:context]))
 
   if Pry::CLI.input_args.any? && Pry::CLI.input_args != ["pry"]
     full_name = File.expand_path(Pry::CLI.input_args.first)