pry 0.10.4 → 0.11.0.pre

data/lib/pry/code/code_file.rb

@@ -17,8 +17,12 @@ class Pry
       %w(.c .h)      => :c,
       %w(.rhtml)     => :rhtml,
       %w(.yaml .yml) => :yaml,
-      %w(.cpp .hpp .cc .h cxx) => :cpp,
-      %w(.rb .ru .irbrc .gemspec .pryrc) => :ruby,
+      %w(.cpp .hpp .cc .h .cxx) => :cpp,
+      %w(.rb .ru .irbrc .gemspec .pryrc .rake) => :ruby,
+    }
+
+    FILES = {
+      %w(Gemfile Rakefile Guardfile Capfile) => :ruby
     }
 
     # @return [Symbol] The type of code stored in this wrapper.
@@ -79,6 +83,8 @@ class Pry
     def type_from_filename(filename, default = :unknown)
       _, @code_type = EXTENSIONS.find do |k, _|
         k.any? { |ext| ext == File.extname(filename) }
+      end || FILES.find do |k, _|
+        k.any? { |file_name| file_name == File.basename(filename) }
       end
 
       code_type || default

data/lib/pry/code_object.rb

@@ -37,6 +37,28 @@ class Pry
       def command?
         is_a?(Module) && self <= Pry::Command
       end
+
+      # @return [Boolean] `true` if this module was defined by means of the C API,
+      #   `false` if it's a Ruby module.
+      # @note If a module defined by C was extended with a lot of methods written
+      #   in Ruby, this method would fail.
+      def c_module?
+        if is_a?(WrappedModule)
+
+          method_locations = wrapped.methods(false).map do |m|
+            wrapped.method(m).source_location
+          end
+
+          method_locations.concat(wrapped.instance_methods(false).map do |m|
+                                    wrapped.instance_method(m).source_location
+                                  end)
+
+          c_methods = method_locations.grep(nil).count
+          ruby_methods = method_locations.count - c_methods
+
+          c_methods > ruby_methods
+        end
+      end
     end
 
     include Pry::Helpers::CommandHelpers
@@ -147,6 +169,7 @@ class Pry
     # @return [Boolean]
     def safe_to_evaluate?(str)
       return true if str.strip == "self"
+      return false if str =~ /%/
       kind = target.eval("defined?(#{str})")
       kind =~ /variable|constant/
     end

data/lib/pry/color_printer.rb

@@ -34,14 +34,17 @@ class Pry
       super
     rescue => e
       raise if e.is_a? Pry::Pager::StopPaging
-
-      # Read the class name off of the singleton class to provide a default
-      # inspect.
-      singleton = class << obj; self; end
-      ancestors = Pry::Method.safe_send(singleton, :ancestors)
-      klass  = ancestors.reject { |k| k == singleton }.first
-      obj_id = obj.__id__.to_s(16) rescue 0
-      str    = "#<#{klass}:0x#{obj_id}>"
+      begin
+        str = obj.inspect
+      rescue Exception 
+        # Read the class name off of the singleton class to provide a default
+        # inspect.
+        singleton = class << obj; self; end
+        ancestors = Pry::Method.safe_send(singleton, :ancestors)
+        klass  = ancestors.reject { |k| k == singleton }.first
+        obj_id = obj.__id__.to_s(16) rescue 0
+        str    = "#<#{klass}:0x#{obj_id}>"
+      end
 
       text highlight_object_literal(str)
     end

data/lib/pry/command.rb

@@ -52,7 +52,7 @@ class Pry
       # Define or get the command's banner
       def banner(arg=nil)
         @banner = arg if arg
-        @banner || description
+        @banner ||= description
       end
 
       def block
@@ -167,11 +167,12 @@ class Pry
         end
       end
 
+      # @deprecated Replaced with {Pry::Hooks#add_hook}. Left for compatibility.
       # Store hooks to be run before or after the command body.
       # @see {Pry::CommandSet#before_command}
       # @see {Pry::CommandSet#after_command}
       def hooks
-        @hooks ||= {:before => [], :after => []}
+        Pry.hooks
       end
 
       def command_regex
@@ -223,6 +224,7 @@ class Pry
     attr_accessor :arg_string
     attr_accessor :context
     attr_accessor :command_set
+    attr_accessor :hooks
     attr_accessor :_pry_
 
     # The block we pass *into* a command so long as `:takes_block` is
@@ -271,6 +273,7 @@ class Pry
       self.output       = context[:output]
       self.eval_string  = context[:eval_string]
       self.command_set  = context[:command_set]
+      self.hooks        = context[:hooks]
       self._pry_        = context[:pry_instance]
     end
 
@@ -424,10 +427,20 @@ class Pry
         raise CommandError, "The command '#{command_name}' requires an argument."
       end
 
-      ret = call_with_hooks(*args)
+      ret = use_unpatched_symbol do
+        call_with_hooks(*args)
+      end
       command_options[:keep_retval] ? ret : void
     end
 
+    def use_unpatched_symbol
+      call_method = Symbol.method_defined?(:call) && Symbol.instance_method(:call)
+      Symbol.class_eval { undef :call } if call_method
+      yield
+    ensure
+      Symbol.instance_eval { define_method(:call, call_method) } if call_method
+    end
+
     # Are all the gems required to use this command installed?
     #
     # @return  Boolean
@@ -445,17 +458,28 @@ class Pry
 
     private
 
+    def find_hooks(event)
+      event_name = "#{event}_#{command_name}"
+      (self.hooks || self.class.hooks).get_hooks(event_name).values
+    end
+
+    def before_hooks
+      find_hooks('before')
+    end
+
+    def after_hooks
+      find_hooks('after')
+    end
+
     # Run the `#call` method and all the registered hooks.
     # @param [Array<String>] args The arguments to `#call`
     # @return [Object] The return value from `#call`
     def call_with_hooks(*args)
-      self.class.hooks[:before].each do |block|
-        instance_exec(*args, &block)
-      end
+      before_hooks.each { |block| instance_exec(*args, &block) }
 
       ret = call(*args)
 
-      self.class.hooks[:after].each do |block|
+      after_hooks.each do |block|
         ret = instance_exec(*args, &block)
       end
 
@@ -507,7 +531,7 @@ class Pry
   # subclasses.
   #
   # Create subclasses using {Pry::CommandSet#create_command}, and override the
-  # `options(opt)` method to set up an instance of Slop, and the `process`
+  # `options(opt)` method to set up an instance of Pry::Slop, and the `process`
   # method to actually run the command. If necessary, you can also override
   # `setup` which will be called before `options`, for example to require any
   # gems your command needs to run, or to set up state.
@@ -583,15 +607,15 @@ class Pry
       end
     end
 
-    # Return the help generated by Slop for this command.
+    # Return the help generated by Pry::Slop for this command.
     def help
       slop.help
     end
 
-    # Return an instance of Slop that can parse either subcommands or the
+    # Return an instance of Pry::Slop that can parse either subcommands or the
     # options that this command accepts.
     def slop
-      Slop.new do |opt|
+      Pry::Slop.new do |opt|
         opt.banner(unindent(self.class.banner))
         subcommands(opt)
         options(opt)
@@ -603,9 +627,9 @@ class Pry
     # @param [String] search  The line typed so far
     # @return [Array<String>]  the words to complete
     def complete(search)
-      slop.map do |opt|
+      slop.flat_map do |opt|
         [opt.long && "--#{opt.long} " || opt.short && "-#{opt.short}"]
-      end.flatten(1).compact + super
+      end.compact + super
     end
 
     # A method called just before `options(opt)` as part of `call`.
@@ -620,7 +644,7 @@ class Pry
     #   end
     def setup; end
 
-    # A method to setup Slop commands so it can parse the subcommands your
+    # A method to setup Pry::Slop commands so it can parse the subcommands your
     # command expects. If you need to set up default values, use `setup`
     # instead.
     #
@@ -655,7 +679,7 @@ class Pry
     #   end
     def subcommands(cmd); end
 
-    # A method to setup Slop so it can parse the options your command expects.
+    # A method to setup Pry::Slop so it can parse the options your command expects.
     #
     # @note Please don't do anything side-effecty in the main part of this
     # method, as it may be called by Pry at any time for introspection reasons.
@@ -672,7 +696,7 @@ class Pry
 
     # The actual body of your command should go here.
     #
-    # The `opts` mehod can be called to get the options that Slop has passed,
+    # The `opts` mehod can be called to get the options that Pry::Slop has passed,
     # and `args` gives the remaining, unparsed arguments.
     #
     # The return value of this method is discarded unless the command was

data/lib/pry/command_set.rb

@@ -125,9 +125,10 @@ class Pry
     #   Pry.config.commands.before_command("whereami") do |n|
     #     output.puts "parameter passed was #{n}"
     #   end
+    # @deprecated Use {Pry::Hooks#add_hook} instead.
     def before_command(search, &block)
       cmd = find_command_by_match_or_listing(search)
-      cmd.hooks[:before].unshift block
+      cmd.hooks.add_hook("before_#{cmd.command_name}", random_hook_name, block)
     end
 
     # Execute a block of code after a command is invoked. The block also
@@ -139,11 +140,17 @@ class Pry
     #   Pry.config.commands.after_command("whereami") do |n|
     #     output.puts "command complete!"
     #   end
+    # @deprecated Use {Pry::Hooks#add_hook} instead.
     def after_command(search, &block)
       cmd = find_command_by_match_or_listing(search)
-      cmd.hooks[:after] << block
+      cmd.hooks.add_hook("after_#{cmd.command_name}", random_hook_name, block)
     end
 
+    def random_hook_name
+      (0...8).map { ('a'..'z').to_a[rand(26)] }.join
+    end
+    private :random_hook_name
+
     def each(&block)
       @commands.each(&block)
     end

data/lib/pry/commands/cat/exception_formatter.rb

@@ -27,16 +27,17 @@ class Pry
       end
 
       def backtrace_level
-        return @backtrace_level if @backtrace_level
-
-        bl =  if opts[:ex].nil?
-                ex.bt_index
-              else
-                ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
-              end
-
-        increment_backtrace_level
-        @backtrace_level = bl
+        @backtrace_level ||=
+          begin
+            bl =  if opts[:ex].nil?
+                    ex.bt_index
+                  else
+                    ex.bt_index = absolute_index_number(opts[:ex], ex.backtrace.size)
+                  end
+
+            increment_backtrace_level
+            bl
+          end
       end
 
       def increment_backtrace_level

data/lib/pry/commands/cat/file_formatter.rb

@@ -6,6 +6,8 @@ class Pry
       attr_reader :_pry_
 
       def initialize(file_with_embedded_line, _pry_, opts)
+        raise CommandError, "Must provide a filename, --in, or --ex." if !file_with_embedded_line
+
         @file_with_embedded_line = file_with_embedded_line
         @opts = opts
         @_pry_ = _pry_
@@ -13,8 +15,6 @@ class Pry
       end
 
       def format
-        raise CommandError, "Must provide a filename, --in, or --ex." if !file_with_embedded_line
-
         set_file_and_dir_locals(file_name, _pry_, _pry_.current_context)
         decorate(@code_from_file)
       end
@@ -40,7 +40,11 @@ class Pry
       end
 
       def decorate(content)
-        line_number ? super.around(line_number, code_window_size) : super
+        if line_number
+          super(content.around(line_number, code_window_size))
+        else
+          super
+        end
       end
 
       def code_type

data/lib/pry/commands/code_collector.rb

@@ -51,21 +51,23 @@ class Pry
     #
     # @return [String]
     def content
-      return @content if @content
-      raise CommandError, "Only one of --out, --in, --doc and CODE_OBJECT may be specified." if bad_option_combination?
+      @content ||=
+        begin
+          raise CommandError, "Only one of --out, --in, --doc and CODE_OBJECT may be specified." if bad_option_combination?
 
-      content = case
-                when opts.present?(:o)
-                  pry_output_content
-                when opts.present?(:i)
-                  pry_input_content
-                when opts.present?(:d)
-                  code_object_doc
-                else
-                  code_object_source_or_file
-                end
+          content = case
+                    when opts.present?(:o)
+                      pry_output_content
+                    when opts.present?(:i)
+                      pry_input_content
+                    when opts.present?(:d)
+                      code_object_doc
+                    else
+                      code_object_source_or_file
+                    end
 
-      @content ||= restrict_to_lines(content, line_range)
+          restrict_to_lines(content, line_range)
+        end
     end
 
     # The code object
@@ -141,7 +143,7 @@ class Pry
     end
 
     def file_content
-      if File.exists?(obj_name)
+      if File.exist?(obj_name)
         # Set the file accessor.
         self.file = obj_name
         File.read(obj_name)

data/lib/pry/commands/easter_eggs.rb

@@ -10,17 +10,17 @@ class Pry
     end
 
     command "get-naked", "" do
-      text = %{
+      txt = %{
   --
   We dont have to take our clothes off to have a good time.
   We could dance & party all night And drink some cherry wine.
   -- Jermaine Stewart }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "east-coker", "" do
-      text = %{
+      txt = %{
   --
   Now the light falls
   Across the open field, leaving the deep lane
@@ -34,12 +34,12 @@ class Pry
   Wait for the early owl.
                 -- T.S Eliot
           }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "cohen-poem", "" do
-      text = %{
+      txt = %{
   --
   When this American woman,
   whose thighs are bound in casual red cloth,
@@ -57,8 +57,8 @@ class Pry
   they are lost for hours.
                 -- Leonard Cohen
               }
-      output.puts text
-      text
+      output.puts txt
+      txt
     end
 
     command "pessoa-poem", "" do

data/lib/pry/commands/edit.rb

@@ -46,7 +46,7 @@ class Pry
         # code defined in pry, eval'd within pry.
         repl_edit
       elsif runtime_patch?
-        # patch code without persisting changes
+        # patch code without persisting changes, implies future changes are patches
         apply_runtime_patch
       else
         # code stored in actual files, eval'd at top-level
@@ -72,7 +72,7 @@ class Pry
     end
 
     def runtime_patch?
-       !file_based_exception? && (opts.present?(:patch) || pry_method?(code_object))
+       !file_based_exception? && (opts.present?(:patch) || previously_patched?(code_object) || pry_method?(code_object))
     end
 
     def apply_runtime_patch
@@ -140,6 +140,10 @@ class Pry
         code_object.pry_method?
     end
 
+    def previously_patched?(code_object)
+      code_object.is_a?(Pry::Method) && Pry::Method::Patcher.code_for(code_object.source_location.first)
+    end
+
     def patch_exception?
       opts.present?(:ex) && opts.present?(:patch)
     end