pry 0.9.11.4 → 0.9.12pre1

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ruby-head
   - ree
   - rbx-18mode
   - rbx-19mode
@@ -17,3 +18,4 @@ notifications:
 branches:
   only:
     - master
+    - 0-9-11-stable

data/Rakefile

@@ -119,6 +119,8 @@ task :gems => [:clean, :rmgems, 'ruby:gem', 'mswin32:gem', 'mingw32:gem', 'jruby
 
 desc "remove all platform gems"
 task :rmgems => ['ruby:clobber_package']
+task :rm_gems => :rmgems
+task :rm_pkgs => :rmgems
 
 desc "reinstall gem"
 task :reinstall => :gems do
@@ -126,6 +128,8 @@ task :reinstall => :gems do
   sh "gem install #{File.dirname(__FILE__)}/pkg/pry-#{Pry::VERSION}.gem"
 end
 
+task :install => :reinstall
+
 desc "build and push latest gems"
 task :pushgems => :gems do
   chdir("#{File.dirname(__FILE__)}/pkg") do

data/lib/pry.rb

@@ -266,6 +266,6 @@ require 'pry/pry_class'
 require 'pry/pry_instance'
 require 'pry/cli'
 require 'pry/pager'
-require 'pry/terminal_info'
+require 'pry/terminal'
 require 'pry/editor'
 require 'pry/rubygem'

data/lib/pry/cli.rb

@@ -99,10 +99,10 @@ Pry::CLI.add_options do
   banner %{Usage: pry [OPTIONS]
 Start a Pry session.
 See: `https://github.com/pry` for more information.
-Copyright (c) 2011 John Mair (banisterfiend)
+Copyright (c) 2013 John Mair (banisterfiend)
 --
 }
-  on :e, :exec, "A line of code to execute in context before the session starts", :argument => true do |input|
+  on :e, :exec=, "A line of code to execute in context before the session starts" do |input|
     exec_string << input + "\n"
   end
 
@@ -123,12 +123,12 @@ Copyright (c) 2011 John Mair (banisterfiend)
     Pry.config.should_load_local_rc = false
   end
 
-  on :s, "select-plugin", "Only load specified plugin (and no others).", :argument => true do |plugin_name|
+  on :s, "select-plugin=", "Only load specified plugin (and no others)." do |plugin_name|
     Pry.config.should_load_plugins = false
     Pry.plugins[plugin_name].activate!
   end
 
-  on :d, "disable-plugin", "Disable a specific plugin.", :argument => true do |plugin_name|
+  on :d, "disable-plugin=", "Disable a specific plugin." do |plugin_name|
     Pry.plugins[plugin_name].disable!
   end
 
@@ -149,11 +149,11 @@ Copyright (c) 2011 John Mair (banisterfiend)
     Pry.config.prompt = Pry::SIMPLE_PROMPT
   end
 
-  on :r, :require, "`require` a Ruby script at startup", :argument => true do |file|
+  on :r, :require=, "`require` a Ruby script at startup" do |file|
     Pry.config.requires << file
   end
 
-  on :I, "Add a path to the $LOAD_PATH", :argument => true, :as => Array, :delimiter => ":" do |load_path|
+  on :I=, "Add a path to the $LOAD_PATH", :as => Array, :delimiter => ":" do |load_path|
     load_path.map! do |path|
       /\A\.\// =~ path ? path : File.expand_path(path)
     end
@@ -161,14 +161,20 @@ Copyright (c) 2011 John Mair (banisterfiend)
     $LOAD_PATH.unshift(*load_path)
   end
 
+  on "gem", "Shorthand for -I./lib -rgemname" do |load_path|
+    $LOAD_PATH.unshift("./lib")
+    Dir["./lib/*.rb"].each do |file|
+      Pry.config.requires << file
+    end
+  end
+
   on :v, :version, "Display the Pry version" do
     puts "Pry version #{Pry::VERSION} on Ruby #{RUBY_VERSION}"
     exit
   end
 
-  on(:c, :context,
+  on(:c, :context=,
      "Start the session in the specified context. Equivalent to `context.pry` in a session.",
-     :argument => true,
      :default => "Pry.toplevel_binding"
      )
 end.process_options do |opts|

data/lib/pry/code.rb

@@ -84,12 +84,12 @@ class Pry
       # Attempt to extract the source code for module (or class) `mod`.
       #
       # @param [Module, Class] mod The module (or class) of interest.
-      # @param [Integer, nil] start_line The line number to start on, or nil to
-      #   use the method's original line numbers.
       # @param [Integer] candidate_rank The module candidate (by rank)
       #   to use (see `Pry::WrappedModule::Candidate` for more information).
+      # @param [Integer, nil] start_line The line number to start on, or nil to
+      #   use the method's original line numbers.
       # @return [Code]
-      def from_module(mod, start_line = nil, candidate_rank = 0)
+      def from_module(mod, candidate_rank = 0, start_line=nil)
         candidate = Pry::WrappedModule(mod).candidate(candidate_rank)
         start_line ||= candidate.line
         new(candidate.source, start_line, :ruby)

data/lib/pry/command.rb

@@ -520,7 +520,7 @@ class Pry
       end
 
       def source
-        Pry::WrappedModule(self).source
+        source_object.source
       end
 
       def doc
@@ -528,18 +528,33 @@ class Pry
       end
 
       def source_location
-        Pry::WrappedModule(self).source_location
+        source_object.source_location
       end
 
       def source_file
-        Pry::WrappedModule(self).source_file
+        source_object.source_file
       end
       alias_method :file, :source_file
 
       def source_line
-        Pry::WrappedModule(self).source_line
+        source_object.source_line
       end
       alias_method :line, :source_line
+
+      private
+
+      # The object used to extract the source for the command.
+      #
+      # This should be a `Pry::Method(block)` for a command made with `create_command`
+      # and a `Pry::WrappedModule(self)` for a command that's a standard class.
+      # @return [Pry::WrappedModule, Pry::Method]
+      def source_object
+        @source_object ||= if name =~ /^[A-Z]/
+                             Pry::WrappedModule(self)
+                           else
+                             Pry::Method(block)
+                           end
+      end
     end
 
     attr_accessor :opts
@@ -573,7 +588,7 @@ class Pry
     # Return an instance of Slop that can parse either subcommands or the
     # options that this command accepts.
     def slop
-      Slop.parse do |opt|
+      Slop.new do |opt|
         opt.banner(unindent(self.class.banner))
         subcommands(opt)
         options(opt)

data/lib/pry/command_set.rb

@@ -263,13 +263,13 @@ class Pry
       commands.delete(cmd.match)
     end
 
-    def deprecated_command(name_of_deprecated_command, deprecation_message, matcher=name_of_deprecated_command)
-      create_command name_of_deprecated_command do
+    def disabled_command(name_of_disabled_command, message, matcher=name_of_disabled_command)
+      create_command name_of_disabled_command do
         match matcher
         description ""
 
         define_method(:process) do
-          output.puts "DEPRECATED: #{deprecation_message}"
+          output.puts "DISABLED: #{message}"
         end
       end
     end

data/lib/pry/commands.rb

@@ -1,6 +1,6 @@
 # Default commands used by Pry.
 Pry::Commands = Pry::CommandSet.new
 
-Dir[File.expand_path('../commands/*.rb', __FILE__)].each do |file|
+Dir[File.expand_path('../commands', __FILE__) + '/*.rb'].each do |file|
   require file
 end

data/lib/pry/commands/disabled_commands.rb

@@ -0,0 +1,2 @@
+Pry::Commands.disabled_command("edit-method", "Use `edit` instead.")
+Pry::Commands.disabled_command("show-command", "Use show-source [command_name] instead.")

data/lib/pry/commands/ls.rb

@@ -189,8 +189,7 @@ class Pry
       return unless opts.present?(:constants) || (!has_user_specified_any_options && interrogating_a_module?)
 
       mod = interrogating_a_module? ? object_to_interrogate : Object
-      constants = mod.constants
-      constants -= (mod.ancestors - [mod]).map(&:constants).flatten unless opts.present?(:verbose)
+      constants = WrappedModule.new(mod).constants(opts.present?(:verbose))
       output_section("constants", grep[format_constants(mod, constants)])
     end
 

data/lib/pry/commands/reload_code.rb

@@ -6,6 +6,12 @@ class Pry
 
     banner <<-'BANNER'
       Reload the source file that contains the specified code object.
+
+      e.g reload-code MyClass#my_method    #=> reload a method
+          reload-code MyClass              #=> reload a class
+          reload-code my-command           #=> reload a pry command
+          reload-code self                 #=> reload the 'current' object
+          reload-code                      #=> identical to reload-code self
     BANNER
 
     def process
@@ -27,7 +33,7 @@ class Pry
     end
 
     def check_for_reloadability(code_object)
-      if !code_object
+      if !code_object || !code_object.source_file
         raise CommandError, "Cannot locate #{obj_name}!"
       elsif !File.exists?(code_object.source_file)
         raise CommandError, "Cannot reload #{obj_name} as it has no associated file on disk. File found was: #{code_object.source_file}"
@@ -36,4 +42,5 @@ class Pry
   end
 
   Pry::Commands.add_command(Pry::Command::ReloadCode)
+  Pry::Commands.alias_command 'reload-method', 'reload-code'
 end

data/lib/pry/commands/show_info.rb

@@ -13,28 +13,47 @@ class Pry
       opt.on :s, :super, "Select the 'super' method. Can be repeated to traverse the ancestors", :as => :count
       opt.on :l, "line-numbers", "Show line numbers"
       opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)"
-      opt.on :f, :flood, "Do not use a pager to view text longer than one screen"
       opt.on :a, :all,   "Show all definitions and monkeypatches of the module/class"
     end
 
     def process
       code_object = Pry::CodeObject.lookup(obj_name, _pry_, :super => opts[:super])
-      raise Pry::CommandError, "Couldn't locate #{obj_name}!" if !code_object
+      cannot_locate_source_error if !code_object
 
       if show_all_modules?(code_object)
         # show all monkey patches for a module
+
         result = content_and_headers_for_all_module_candidates(code_object)
       else
         # show a specific code object
-        result = content_and_header_for_code_object(code_object)
+
+        co = code_object_with_accessible_source(code_object)
+        result = content_and_header_for_code_object(co)
       end
 
       set_file_and_dir_locals(code_object.source_file)
       stagger_output result
     end
 
+    # This method checks whether the `code_object` is a WrappedModule,
+    # if it is, then it returns the first candidate (monkeypatch) with
+    # accessible source (or docs). If `code_object` is not a WrappedModule (i.e a
+    # method or a command) then the `code_object` itself is just
+    # returned.
+    #
+    # @return [Pry::WrappedModule, Pry::Method, Pry::Command]
+    def code_object_with_accessible_source(code_object)
+      if code_object.is_a?(WrappedModule)
+        code_object.candidates.find(&:source).tap do |candidate|
+          cannot_locate_source_error if !candidate
+        end
+      else
+        code_object
+      end
+    end
+
     def content_and_header_for_code_object(code_object)
-      header(code_object) << content_for(code_object)
+      header(code_object) + content_for(code_object)
     end
 
     def content_and_headers_for_all_module_candidates(mod)
@@ -54,6 +73,10 @@ class Pry
       result
     end
 
+    def cannot_locate_source_error
+      raise CommandError, "Couldn't locate a definition for #{obj_name}!"
+    end
+
     # Generate a header (meta-data information) for all the code
     # object types: methods, modules, commands, procs...
     def header(code_object)

data/lib/pry/commands/show_source.rb

@@ -25,7 +25,8 @@ class Pry
 
     # The source for code_object prepared for display.
     def content_for(code_object)
-      raise CommandError, "Cannot locate source!" if !code_object.source
+      cannot_locate_source_error if !code_object.source
+
       Code.new(code_object.source, start_line_for(code_object)).
         with_line_numbers(use_line_numbers?).to_s
     end

data/lib/pry/commands/whereami.rb

@@ -1,16 +1,23 @@
 class Pry
   class Command::Whereami < Pry::ClassCommand
+
+    class << self
+      attr_accessor :method_size_cutoff
+    end
+
+    @method_size_cutoff = 30
+
     match 'whereami'
     description 'Show code surrounding the current context.'
     group 'Context'
 
     banner <<-'BANNER'
-      Usage: whereami [-qn] [N]
+      Usage: whereami [-qn] [LINES]
 
       Describe the current location. If you use `binding.pry` inside a method then
       whereami will print out the source for that method.
 
-      If a number is passed, then N lines before and after the current line will be
+      If a number is passed, then LINES lines before and after the current line will be
       shown instead of the method itself.
 
       The `-q` flag can be used to suppress error messages in the case that there's
@@ -25,29 +32,53 @@ class Pry
     BANNER
 
     def setup
-      @method = Pry::Method.from_binding(target)
-      @file = target.eval('__FILE__')
+      @file = expand_path(target.eval('__FILE__'))
       @line = target.eval('__LINE__')
+      @method = Pry::Method.from_binding(target)
     end
 
     def options(opt)
       opt.on :q, :quiet,             "Don't display anything in case of an error"
       opt.on :n, :"no-line-numbers", "Do not display line numbers"
+      opt.on :m, :"method", "Show the complete source for the current method."
+      opt.on :c, :"class", "Show the complete source for the current class or module."
+      opt.on :f, :"file", "Show the complete source for the current file."
     end
 
     def code
-      @code ||= if show_method?
-                  Pry::Code.from_method(@method)
+      @code ||= if opts.present?(:m)
+                  method_code or raise CommandError, "Cannot find method code."
+                elsif opts.present?(:c)
+                  class_code or raise CommandError, "Cannot find class code."
+                elsif opts.present?(:f)
+                  Pry::Code.from_file(@file)
+                elsif args.any?
+                  code_window
                 else
-                  Pry::Code.from_file(@file).around(@line, window_size)
+                  default_code
                 end
     end
 
+    def code?
+      !!code
+    rescue MethodSource::SourceNotFoundError
+      false
+    end
+
+    def bad_option_combination?
+      [opts.present?(:m), opts.present?(:f),
+       opts.present?(:c), args.any?].count(true) > 1
+    end
+
     def location
       "#{@file} @ line #{@line} #{@method && @method.name_with_owner}"
     end
 
     def process
+      if bad_option_combination?
+        raise CommandError, "Only one of -m, -c, -f, and  LINES may be specified."
+      end
+
       if nothing_to_do?
         return
       elsif internal_binding?(target)
@@ -57,9 +88,10 @@ class Pry
 
       set_file_and_dir_locals(@file)
 
-      output.puts "\n#{text.bold('From:')} #{location}:\n\n"
-      output.puts code.with_line_numbers(use_line_numbers?).with_marker(marker)
-      output.puts
+      out = "\n#{text.bold('From:')} #{location}:\n\n" +
+        code.with_line_numbers(use_line_numbers?).with_marker(marker).to_s + "\n"
+
+      stagger_output(out)
     end
 
     private
@@ -88,17 +120,53 @@ class Pry
       end
     end
 
-    def show_method?
-      args.empty? && @method && @method.source? && @method.source_range.count < 20 &&
-      # These checks are needed in case of an eval with a binding and file/line
-      # numbers set to outside the function. As in rails' use of ERB.
-      @method.source_file == @file && @method.source_range.include?(@line)
+    def small_method?
+      @method.source_range.count < self.class.method_size_cutoff
     end
 
-    def code?
-      !!code
-    rescue MethodSource::SourceNotFoundError
-      false
+    def default_code
+      if method_code && small_method?
+        method_code
+      else
+        code_window
+      end
+    end
+
+    def code_window
+      Pry::Code.from_file(@file).around(@line, window_size)
+    end
+
+    def method_code
+      return @method_code if @method_code
+
+      if valid_method?
+        @method_code = Pry::Code.from_method(@method)
+      end
+    end
+
+    def class_code
+      return @class_code if @class_code
+
+      if valid_method?
+        mod = Pry::WrappedModule(@method.owner)
+        idx = mod.candidates.find_index { |v| expand_path(v.source_file) == @file }
+        @class_code = idx && Pry::Code.from_module(mod, idx)
+      end
+    end
+
+    def valid_method?
+      @method && @method.source? && expand_path(@method.source_file) == @file &&
+        @method.source_range.include?(@line)
+    end
+
+    def expand_path(f)
+      return if !f
+
+      if Pry.eval_path == f
+        f
+      else
+        File.expand_path(f)
+      end
     end
 
     def window_size