pry 0.9.10 → 0.9.11

data/.travis.yml

@@ -5,7 +5,9 @@ rvm:
   - ree
   - rbx-18mode
   - rbx-19mode
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
 
 notifications:
   irc: "irc.freenode.org#pry"

data/CHANGELOG

@@ -1,3 +1,63 @@
+16/01/2013 version 0.9.11
+dependency changes:
+* upgrade the slop gem to version ~> 3.4
+* new optional dependency: Bond (you'll need to perform `gem install bond`). It enables autocompletion if you use Readline. Does not support work for Editline (more info: https://github.com/pry/pry/wiki/FAQ#wiki-readline). Big thanks to cldwalker.
+
+new features:
+* #738 basic Ruby 2.0 support
+* #732 JRuby 1.7.0+ support
+* added bond tabcompletion, much more powerful than standard tab
+	completion. However, it requires a real 'readline' to work,
+	so will not work on standard osx setup (since it uses Editline)
+* show-source can now extract source for classes, methods, procs,
+	pry commands, and arbitrary objects (it shows the source for the class of
+	the object). As a result, show-command is now deprecated
+* gist/play/save-file now infer object type without requiring flags,
+	e.g play MyClass, play my_file.rb, play my_method
+* edit command can now edit most things, including: files, methods,
+	classes, commands. As a result the 'edit-method' command is now
+	deprecatd.
+	e.g edit my_file.rb, edit my_method, edit MyClass
+* removed "edit-method", now merged with 'edit'
+* amend-line and play now properly indent code added to input buffer.
+* #674 added support for require switches chaining (`pry -rubygems -r./a.rb`)
+* #695 added ability to customize the name displayed in the prompt
+* #716 added `--patch` switch for `edit --ex` command
+* #736 respect the `$PAGER` environment variable
+* #497 added `disable-pry` command
+* removed "show-command" command; use "show-source" command instead
+* exec switch chaining (`pry -e ':one' -e ':two'`)
+* added two new hooks: "before_eval" and "after_eval"
+* added tabcompletion for "show-source", "show-doc" commands and "Array#<tab>" cases
+* immediately require gems after gem-install
+* added `-l` switch for `ls` command (displays local variables)
+* added "gem-open" command
+* added "fix-indent" command
+* added subcommands API
+* exposed the test API for plugin writers (d1489a)
+* tablifed ls output
+* added `--no-line-numbers` switch for "whereami" command
+* added `--lines` switch for "play" command
+
+bug fixes:
+* #652 find-method uses single escape instead of double
+* #657 fixed blank string delimiters
+* #622 fixed "unwanted 'binding_impl_method' local now exists in scratch bindings"
+* #645 fixed "edit-method -p changes constant lookup"
+* #682 fixed ".pryrc" loading twice when invoked from `$HOME` directory
+* #675 fixed pry not remembering initial "pwd"
+* #717 fixed multiline object coloring
+* #719 fixed "show-method" not supporting `String::new` notation
+* #754 fixed "whereami" command not showing correct line numbers
+* #751 fixed buggy Cucumber AST output
+* #787 fixed `while/until do` loops indentation
+* #526 fixed buggy `--no-plugins` switch of pry
+* #774 ensure all errors go to the error handler
+* fixed ".pryrc" loading with wrong `__FILE__`
+* fixed bug when pager doesn't work if "less" is not available on system
+* fixed "Control-D" press in nested REPL
+* many small improvements of unclear error messages and formatting of documentation
+
 14/07/2012 version 0.9.10
 dependency changes:
 * #561 upgrade the slop gem to version 3
@@ -421,4 +481,3 @@ complete CHANGELOG:
 * now rescuing SyntaxError as well as Racc::Parser error in valid_expression?
 8/12/2010 version 0.1.0
 * release!
-

data/CONTRIBUTORS

@@ -1,37 +1,55 @@
-   938	banisterfiend
-   290	cirwin
-   140	ryanf
-    93	robgleeson
-    51	injekt
-    49	Mon_Ouie
-    39	envygeeks
-    28	yorickpeterse
+  1068	John Mair
+   372	Conrad Irwin
+   215	Ryan Fitzgerald
+   108	Kyrylo Silin
+    92	Rob Gleeson
+    54	Mon ouïe
+    51	Lee Jarvis
+    47	☈king
+    40	Jordon Bedwell
+    28	Yorick Peterse
     18	David Palm
+    18	Robert Gleeson
     15	epitron
-    15	kyrylo
-    10	swarley
-     8	rue
-     3	Darrick Wiebe
-     3	fowl
+    12	Andrew Vos
+    11	Reginald Tan
+    10	Matt Carey
+     8	Eero Saynatkari
+     8	Trey Lawrence
+     6	Jason Laster
      3	misfo
-     2	Ben Langfeld
-     2	Eric Christopherson
+     3	fowlmouth
+     3	Darrick Wiebe
      2	Kelsey Judson
+     2	Ben Langfeld
+     2	Bram Swenson
+     2	Erik Michaels-Ober
+     2	Ingrid
+     2	Vít Ondruch
      2	Xavier Shay
-     2	sferic
-     2	shadowshell
-     1	Gerbert Olivé
-     1	Gosha Arinich
+     2	Jonathan Soeder
+     2	Eric Christopherson
+     2	robgleeson
+     1	Ben Pickles
+     1	Zeh Rizzatti
+     1	shirmung
+     1	sonnym
+     1	Shawn Anderson
      1	Joe Peduto
+     1	Greg Stearns
      1	Jonathan Jackson
-     1	Jonathan Soeder
      1	Jordan Running
+     1	Gosha Arinich
      1	Josh Cheek
-     1	KL-7
+     1	Kirill Lashuk
+     1	Gerbert Olivé
+     1	Larry Gilbert
      1	Lars Haugseth
-     1	Reginald Tan
+     1	Loic Nageleisen
+     1	Matthew Carey
+     1	Michael Bensoussan
      1	Renato Mascarenhas
-     1	Shawn Anderson
+     1	Havenwood
      1	Sherin C
-     1	sonnym
-     1	tpope
+     1	Sonali Sridhar
+     1	Tim Pope

data/Gemfile

@@ -1,2 +1,9 @@
 source :rubygems
 gemspec
+
+# For Guard
+group :development do
+  gem 'jist'
+  gem 'rb-inotify', :require => 'false'
+  gem 'rb-fsevent', :require => 'false'
+end

data/Guardfile

@@ -0,0 +1,62 @@
+require 'guard/guard'
+
+module ::Guard
+  class Bacon < Guard
+    def run_all
+      system "rake spec"
+      puts
+      true
+    end
+
+    def run_on_changes(paths)
+      paths.delete('some_lib')
+      puts "Running: #{paths.join ' '}"
+      if paths.size.zero?
+        warn 'Running all tests'
+        system 'rake recspec'
+      else
+        paths.each do |path|
+          warn "Running #{path}"
+          system "rake spec run=#{path}" or return
+          warn "\e[32;1mNice!!\e[0m  Now running all specs, just to be sure."
+          run_all
+        end
+      end
+    end
+  end
+end
+
+guard 'bacon' do
+  def deduce_spec_from(token)
+    %W(
+      spec/#{token}_spec.rb
+      spec/pry_#{token}_spec.rb
+      spec/commands/#{token}_spec.rb
+    ).each do |e|
+      return e if File.exists? e
+    end
+    nil
+  end
+
+  Dir['lib/pry/**/*.rb'].each do |rb|
+    rb[%r(lib/pry/(.+)\.rb$)]
+    spec_rb = deduce_spec_from($1)
+    if spec_rb
+      # run as 'bundle exec guard -d' to see these.
+      ::Guard::UI.debug "'#{rb}' maps to '#{spec_rb}'"
+    else
+      ::Guard::UI.debug "No map, so run all for: '#{rb}'"
+    end
+    next unless spec_rb
+    watch(rb) do |m| spec_rb end
+  end
+
+  watch(%r{^lib/.+\.rb$}) do |m|
+    return if deduce_spec_from(m[0])
+    'some_lib'
+  end
+
+  watch(%r{^spec/.+\.rb$}) do |m| m end
+end
+
+# vim:ft=ruby

data/README.markdown

@@ -1,10 +1,9 @@
 [![Build Status](https://secure.travis-ci.org/pry/pry.png)](http://travis-ci.org/pry/pry)
 
 <center>
-![Alt text](http://dl.dropbox.com/u/26521875/pry_logo_350.png)
-
-(C) John Mair (banisterfiend) 2011<br>
+![The Pry Logo](https://dl.dropbox.com/u/26521875/pry%20stuff/logo/pry_logo_350.png)
 
+© John Mair (banisterfiend) 2012<br>
 
 **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!
 
@@ -13,6 +12,7 @@
 [Atomic Object](http://www.atomicobject.com/)<br/>
 [Bendyworks](http://bendyworks.com/)<br/>
 [Intridea](http://intridea.com/)<br/>
+[Gaslight](http://gaslight.co/home)<br/>
 
 **Other Resources**
 
@@ -395,6 +395,6 @@ Problems or questions? file an issue at [github](https://github.com/pry/pry/issu
 
 ### Contributors
 
-Pry is primarily the work of [John Mair (banisterfiend)]((http://github.com/banister)), for full list
+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

@@ -7,26 +7,6 @@ require 'pry/version'
 CLOBBER.include('**/*~', '**/*#*', '**/*.log')
 CLEAN.include('**/*#*', '**/*#*.*', '**/*_flymake*.*', '**/*_flymake', '**/*.rbc', '**/.#*.*')
 
-def apply_spec_defaults(s)
-  s.name = 'pry'
-  s.summary = "An IRB alternative and runtime developer console"
-  s.version = Pry::VERSION
-  s.date = Time.now.strftime '%Y-%m-%d'
-  s.authors = ["John Mair (banisterfiend)", "Conrad Irwin"]
-  s.email = ['jrmair@gmail.com', 'conrad.irwin@gmail.com']
-  s.description = s.summary
-  s.homepage = 'http://pry.github.com'
-  s.executables = ['pry']
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- test/*`.split("\n")
-  s.add_dependency('coderay', '~> 1.0.5')
-  s.add_dependency('slop', ['~> 3.3.1'])
-  s.add_dependency('method_source','~> 0.8')
-  s.add_development_dependency('bacon', '~> 1.1')
-  s.add_development_dependency('open4', '~> 1.3')
-  s.add_development_dependency('rake', '~> 0.9')
-end
-
 def check_dependencies
   require 'bundler'
   Bundler.definition.missing_specs
@@ -41,10 +21,37 @@ end
 desc "Set up and run tests"
 task :default => [:test]
 
+unless [].respond_to? :shuffle!
+  class Array
+    def shuffle!
+      # TODO: fill this in if anyone cares
+      self
+    end
+  end
+end
+
+def run_specs paths
+  quiet = ENV['VERBOSE'] ? '' : '-q'
+  exec "bacon -Ispec -rubygems #{quiet} #{paths.join ' '}"
+end
+
 desc "Run tests"
 task :test do
   check_dependencies unless ENV['SKIP_DEP_CHECK']
-  sh "bacon -Itest -rubygems -a -q"
+  paths =
+    if explicit_list = ENV['run']
+      explicit_list.split(',')
+    else
+      Dir['spec/**/*_spec.rb'].shuffle!
+    end
+  run_specs paths
+end
+task :spec => :test
+
+task :recspec do
+  all = Dir['spec/**/*_spec.rb'].sort_by{|path| File.mtime(path)}.reverse
+  warn "Running all, sorting by mtime: #{all[0..2].join(' ')} ...etc."
+  run_specs all
 end
 
 desc "Run pry"
@@ -65,12 +72,12 @@ task :profile do
   Pry.start(TOPLEVEL_BINDING, :input => StringIO.new('exit'))
 end
 
-desc "Build the gemspec file"
-task :gemspec => "ruby:gemspec"
+def modify_base_gemspec
+  eval(File.read('pry.gemspec')).tap { |s| yield s }
+end
 
 namespace :ruby do
-  spec = Gem::Specification.new do |s|
-    apply_spec_defaults(s)
+  spec = modify_base_gemspec do |s|
     s.platform = Gem::Platform::RUBY
   end
 
@@ -78,17 +85,10 @@ namespace :ruby do
     pkg.need_zip = false
     pkg.need_tar = false
   end
-
-  task :gemspec do
-    File.open("#{spec.name}.gemspec", "w") do |f|
-      f << spec.to_ruby
-    end
-  end
 end
 
 namespace :jruby do
-  spec = Gem::Specification.new do |s|
-    apply_spec_defaults(s)
+  spec = modify_base_gemspec do |s|
     s.add_dependency('spoon', '~> 0.0')
     s.platform = 'java'
   end
@@ -102,8 +102,7 @@ end
 
 [:mingw32, :mswin32].each do |v|
   namespace v do
-    spec = Gem::Specification.new do |s|
-      apply_spec_defaults(s)
+    spec = modify_base_gemspec do |s|
       s.add_dependency('win32console', '~> 1.3')
       s.platform = "i386-#{v}"
     end

data/lib/pry.rb

@@ -15,6 +15,10 @@ class Pry
 
   # The default print
   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
@@ -22,53 +26,65 @@ class Pry
                   end
 
     unless String === stringified
-      # Read the class name off of the singleton class to provide a default inspect.
+      # 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)}>"
     end
 
     nonce = rand(0x100000000).to_s(16) # whatever
 
-    colorized = Helpers::BaseHelpers.colorize_code(stringified.gsub(/#</, "%<#{nonce}"))
+    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*)$/, "\e[0m\\1") if Pry.color
+    colorized = colorized.sub(/(\n*)\z/, "\e[0m\\1") if Pry.color
 
-    Helpers::BaseHelpers.stagger_output("=> #{colorized.gsub(/%<(.*?)#{nonce}/, '#<\1')}", output)
+    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
   # pretty_print is too slow
   SIMPLE_PRINT = proc do |output, value|
     begin
-      output.puts "=> #{value.inspect}"
+      output.puts value.inspect
     rescue RescuableException
-      output.puts "=> unknown"
+      output.puts "unknown"
     end
   end
 
   # useful when playing with truly enormous objects
   CLIPPED_PRINT = proc do |output, value|
-    output.puts "=> #{Pry.view_clip(value)}"
+    output.puts Pry.view_clip(value)
   end
 
   # Will only show the first line of the backtrace
   DEFAULT_EXCEPTION_HANDLER = proc do |output, exception, _|
-    output.puts "#{exception.class}: #{exception.message}"
-    output.puts "from #{exception.backtrace.first}"
+    if UserError === exception && SyntaxError === exception
+      output.puts "SyntaxError: #{exception.message.sub(/.*syntax error, */m, '')}"
+    else
+      output.puts "#{exception.class}: #{exception.message}"
+      output.puts "from #{exception.backtrace.first}"
+    end
   end
 
-  # Don't catch these exceptions
-  DEFAULT_EXCEPTION_WHITELIST = [SystemExit, SignalException]
+  DEFAULT_PROMPT_NAME = 'pry'
 
   # The default prompt; includes the target and nesting level
   DEFAULT_PROMPT = [
                     proc { |target_self, nest_level, pry|
-                      "[#{pry.input_array.size}] pry(#{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(#{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?}* "
                     }
                    ]
 
@@ -76,8 +92,8 @@ class Pry
   SIMPLE_PROMPT = [proc { ">> " }, proc { " | " }]
 
   SHELL_PROMPT = [
-                  proc { |target_self, _, _| "pry #{Pry.view_clip(target_self)}:#{Dir.pwd} $ " },
-                  proc { |target_self, _, _| "pry #{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
@@ -85,31 +101,30 @@ class Pry
   NAV_PROMPT = [
                 proc do |conf|
                   tree = conf.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{conf.expr_number}] (pry) #{tree}: #{conf.nesting_level}> "
+                  "[#{conf.expr_number}] (#{Pry.config.prompt_name}) #{tree}: #{conf.nesting_level}> "
                 end,
                 proc do |conf|
                   tree = conf.binding_stack.map { |b| Pry.view_clip(b.eval("self")) }.join " / "
-                  "[#{conf.expr_number}] (pry) #{tree}: #{conf.nesting_level}* "
+                  "[#{conf.expr_number}] (#{ Pry.config.prompt_name}) #{tree}: #{conf.nesting_level}* "
                 end,
                ]
 
-  # Deal with the ^D key being pressed, different behaviour in
-  # different cases:
-  # 1) In an expression     - behave like `!` command   (clear input buffer)
-  # 2) At top-level session - behave like `exit command (break out of repl loop)
-  # 3) In a nested session  - behave like `cd ..`       (pop a binding)
+  # Deal with the ^D key being pressed. Different behaviour in different cases:
+  #   1. In an expression behave like `!` command.
+  #   2. At top-level session behave like `exit` command.
+  #   3. In a nested session behave like `cd ..`.
   DEFAULT_CONTROL_D_HANDLER = proc do |eval_string, _pry_|
     if !eval_string.empty?
-      # Clear input buffer.
-      eval_string.replace("")
+      eval_string.replace('') # Clear input buffer.
     elsif _pry_.binding_stack.one?
-      # ^D at top-level breaks out of a REPL loop.
       _pry_.binding_stack.clear
       throw(:breakout)
     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"].old_stack = _pry_.binding_stack.dup
+      # Store the entire binding stack before popping. Useful for `cd -`.
+      if _pry_.command_state['cd'].nil?
+        _pry_.command_state['cd'] = OpenStruct.new
+      end
+      _pry_.command_state['cd'].old_stack = _pry_.binding_stack.dup
       _pry_.binding_stack.pop
     end
   end
@@ -120,6 +135,10 @@ class Pry
     end
   end
 
+  # Store the current working directory. This allows show-source etc. to work if
+  # 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.
@@ -141,10 +160,34 @@ class Pry
     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 NonMethodContextError < CommandError; end
+  class MethodNotFound < CommandError; end
 
   # indicates obsolete API
   class ObsoleteError < StandardError; end
@@ -162,13 +205,13 @@ if Pry::Helpers::BaseHelpers.mri_18?
   end
 end
 
-require "method_source"
+require 'method_source'
 require 'shellwords'
-require "stringio"
-require "coderay"
-require "optparse"
-require "slop"
-require "rbconfig"
+require 'stringio'
+require 'coderay'
+require 'slop'
+require 'rbconfig'
+require 'tempfile'
 
 begin
   require 'readline'
@@ -197,22 +240,32 @@ if Pry::Helpers::BaseHelpers.windows? && !Pry::Helpers::BaseHelpers.windows_ansi
   end
 end
 
-require "pry/version"
-require "pry/rbx_method"
-require "pry/rbx_path"
-require "pry/code"
-require "pry/method"
-require "pry/wrapped_module"
-require "pry/history_array"
-require "pry/helpers"
-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"
+begin
+  require 'bond'
+rescue LoadError
+end
+
+require 'pry/version'
+require 'pry/rbx_method'
+require 'pry/rbx_path'
+require 'pry/code'
+require 'pry/history_array'
+require 'pry/helpers'
+require 'pry/code_object'
+require 'pry/method'
+require 'pry/wrapped_module'
+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/pager'
+require 'pry/terminal_info'
+require 'pry/editor'
+require 'pry/rubygem'