pry 0.9.8pre5-i386-mingw32 → 0.9.8pre6-i386-mingw32

data/lib/pry/default_commands/shell.rb

@@ -28,67 +28,94 @@ class Pry
           _pry_.instance_eval(&Pry::FILE_COMPLETIONS)
         end
       end
-
       alias_command "file-mode", "shell-mode"
 
-      command "cat", "Show code from a file or Pry's input buffer. Type `cat --help` for more information." do |*args|
-        start_line = 0
-        end_line = -1
-        file_name = nil
-        bt_index = 0
+      command_class "cat", "Show code from a file, Pry's input buffer, or the last exception." do
+        banner <<-USAGE
+          Usage: cat FILE
+                 cat --ex [STACK_INDEX]
+                 cat --in [INPUT_INDEX_OR_RANGE]
 
-        opts = Slop.parse!(args) do |opt|
-          opt.on :s, :start, "Start line (defaults to start of file)Line 1 is the first line.", true, :as => Integer do |line|
-            start_line = line - 1
-          end
+          cat is capable of showing part or all of a source file, the context of the
+          last exception, or an expression from Pry's input history.
 
-          opt.on :e, :end, "End line (defaults to end of file). Line -1 is the last line", true, :as => Integer do |line|
-            end_line = line - 1
-          end
+          cat --ex defaults to showing the lines surrounding the location of the last
+          exception. Invoking it more than once travels up the exception's backtrace,
+          and providing a number shows the context of the given index of the backtrace.
+        USAGE
 
-          opt.on :ex, "Show a window of N lines either side of the last exception (defaults to 5).", :optional => true, :as => Integer do |bt_index_arg|
-            window_size = Pry.config.exception_window_size || 5
-            ex = _pry_.last_exception
-            next if !ex
-            if bt_index_arg
-              bt_index = bt_index_arg
-            else
-              bt_index = ex.bt_index
-            end
-            ex.bt_index = (bt_index + 1) % ex.backtrace.size
-
-            ex_file, ex_line = ex.bt_source_location_for(bt_index)
-            start_line = (ex_line - 1) - window_size
-            start_line = start_line < 0 ? 0 : start_line
-            end_line = (ex_line - 1) + window_size
-            if ex_file && RbxPath.is_core_path?(ex_file)
-              file_name = RbxPath.convert_path_to_full(ex_file)
+        def options(opt)
+          opt.on :ex,        "Show the context of the last exception.", :optional => true, :as => Integer
+          opt.on :i, :in,    "Show one or more entries from Pry's expression history.", :optional => true, :as => Range, :default => -5..-1
+
+          opt.on :s, :start, "Starting line (defaults to the first line).", :optional => true, :as => Integer
+          opt.on :e, :end,   "Ending line (defaults to the last line).", :optional => true, :as => Integer
+          opt.on :l, :'line-numbers', "Show line numbers."
+          opt.on :t, :type,  "The file type for syntax highlighting (e.g., 'ruby' or 'python').", true, :as => Symbol
+
+          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
+        end
+
+        def process
+          handler = case
+            when opts.present?(:ex)
+              method :process_ex
+            when opts.present?(:in)
+              method :process_in
             else
-              file_name = ex_file
+              method :process_file
             end
-          end
 
-          opt.on :i, :in, "Show entries from Pry's input expression history. Takes an index or range.", :optional => true, :as => Range, :default => -5..-1
+          output = handler.call do |code|
+            code.code_type = opts[:type] || :ruby
 
-          opt.on :l, "line-numbers", "Show line numbers."
-          opt.on :t, :type, "The specific file type for syntax higlighting (e.g ruby, python)", true, :as => Symbol
-          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
-          opt.on :h, :help, "This message." do
-            output.puts opt.help
+            code.between(opts[:start] || 1, opts[:end] || -1).
+              with_line_numbers(opts.present?(:'line-numbers') || opts.present?(:ex))
           end
+
+          render_output(output, opts)
         end
 
-        next if opts.present?(:help)
+        def process_ex
+          window_size = Pry.config.default_window_size || 5
+          ex = _pry_.last_exception
+
+          raise CommandError, "No exception found." unless ex
 
-        if opts.present?(:ex)
-          if file_name.nil?
-            raise CommandError, "No Exception or Exception has no associated file."
+          if opts[:ex].nil?
+            bt_index = ex.bt_index
+            ex.inc_bt_index
+          else
+            bt_index = opts[:ex]
           end
-        else
-          file_name = args.shift
+
+          ex_file, ex_line = ex.bt_source_location_for(bt_index)
+
+          raise CommandError, "The given backtrace level is out of bounds." unless ex_file
+
+          if RbxPath.is_core_path?(ex_file)
+            ex_file = RbxPath.convert_path_to_full(ex_file)
+          end
+
+          start_line = ex_line - window_size
+          start_line = 1 if start_line < 1
+          end_line = ex_line + window_size
+
+          header = unindent <<-HEADER
+            #{text.bold 'Exception:'} #{ex.class}: #{ex.message}
+            --
+            #{text.bold('From:')} #{ex_file} @ line #{ex_line} @ #{text.bold("level: #{bt_index}")} of backtrace (of #{ex.backtrace.size - 1}).
+
+          HEADER
+
+          code = yield(Pry::Code.from_file(ex_file).
+                         between(start_line, end_line).
+                         with_marker(ex_line))
+
+          "#{header}#{code}"
         end
 
-        if opts.present?(:in)
+        def process_in
           normalized_range = absolute_index_range(opts[:i], _pry_.input_array.length)
           input_items = _pry_.input_array[normalized_range] || []
 
@@ -98,66 +125,37 @@ class Pry
             raise CommandError, "No expressions found."
           end
 
-          if opts[:i].is_a?(Range)
+          if zipped_items.length > 1
             contents = ""
-
             zipped_items.each do |i, s|
               contents << "#{text.bold(i.to_s)}:\n"
-
-              code = syntax_highlight_by_file_type_or_specified(s, nil, :ruby)
-
-              if opts.present?(:'line-numbers')
-                contents << text.indent(text.with_line_numbers(code, 1), 2)
-              else
-                contents << text.indent(code, 2)
-              end
+              contents << yield(Pry::Code(s).with_indentation(2)).to_s
             end
           else
-            contents = syntax_highlight_by_file_type_or_specified(zipped_items.first.last, nil, :ruby)
-          end
-        else
-          unless file_name
-            raise CommandError, "Must provide a file name."
+            contents = yield(Pry::Code(zipped_items.first.last))
           end
 
-          begin
-            contents, _, _ = read_between_the_lines(file_name, start_line, end_line)
-          rescue Errno::ENOENT
-            raise CommandError, "Could not find file: #{file_name}"
-          end
+          contents
+        end
 
-          contents = syntax_highlight_by_file_type_or_specified(contents, file_name, opts[:type])
+        def process_file
+          file_name = args.shift
 
-          if opts.present?(:'line-numbers')
-            contents = text.with_line_numbers contents, start_line + 1
+          unless file_name
+            raise CommandError, "Must provide a filename, --in, or --ex."
           end
-        end
 
-        # add the arrow pointing to line that caused the exception
-        if opts.present?(:ex)
-          ex_file, ex_line = _pry_.last_exception.bt_source_location_for(bt_index)
-          contents = text.with_line_numbers contents, start_line + 1, :bright_red
+          file_name, line_num = file_name.split(':')
+          set_file_and_dir_locals(file_name)
 
-          contents = contents.lines.each_with_index.map do |line, idx|
-            l = idx + start_line
-            if l == (ex_line - 1)
-              " =>#{line}"
-            else
-              "   #{line}"
-            end
-          end.join
-
-          # header for exceptions
-          output.puts "\n#{Pry::Helpers::Text.bold('Exception:')} #{_pry_.last_exception.class}: #{_pry_.last_exception.message}\n--"
-          output.puts "#{Pry::Helpers::Text.bold('From:')} #{ex_file} @ line #{ex_line} @ #{text.bold('level: ')} #{bt_index} of backtrace (of #{_pry_.last_exception.backtrace.size - 1}).\n\n"
-        end
+          code = yield(Pry::Code.from_file(file_name))
 
-        set_file_and_dir_locals(file_name)
+          if line_num
+            code = code.around(line_num.to_i,
+                               Pry.config.default_window_size || 7)
+          end
 
-        if opts.present?(:flood)
-          output.puts contents
-        else
-          stagger_output(contents)
+          code
         end
       end
     end

data/lib/pry/helpers/command_helpers.rb

@@ -6,26 +6,21 @@ class Pry
 
       module_function
 
-      # if start_line is not false then add line numbers starting with start_line
-      def render_output(should_flood, start_line, text, color=:blue)
-        if start_line
-          text = Pry::Helpers::Text.with_line_numbers text, start_line, color
-        end
-
-        if should_flood
-          output.puts text
-        else
-          stagger_output(text)
-        end
-      end
-
       # Open a temp file and yield it to the block, closing it after
       # @return [String] The path of the temp file
-      def temp_file
-        file = Tempfile.new(['pry', '.rb'])
+      def temp_file(ext='.rb')
+        file = Tempfile.new(['pry', ext])
         yield file
       ensure
-        file.close(true)
+        file.close(true) if file
+      end
+
+      def render_output(str, opts={})
+        if opts[:flood]
+          output.puts str
+        else
+          stagger_output str
+        end
       end
 
       def get_method_or_raise(name, target, opts={}, omit_help=false)
@@ -34,7 +29,7 @@ class Pry
         if name && !meth
           command_error("The method '#{name}' could not be found.", omit_help)
         elsif !meth
-          command_error("No method name given, and context is not a method.", omit_help)
+          command_error("No method name given, and context is not a method.", omit_help, NonMethodContextError)
         end
 
         (opts[:super] || 0).times do
@@ -49,9 +44,9 @@ class Pry
         meth
       end
 
-      def command_error(message, omit_help)
+      def command_error(message, omit_help, klass=CommandError)
         message += " Type `#{command_name} --help` for help." unless omit_help
-        raise CommandError, message
+        raise klass, message
       end
 
       def make_header(meth, content=meth.source)
@@ -66,63 +61,6 @@ class Pry
         header << "#{Pry::Helpers::Text.bold("Number of lines:")} #{content.each_line.count.to_s}\n"
       end
 
-      def file_map
-        {
-          [".c", ".h"] => :c,
-          [".cpp", ".hpp", ".cc", ".h", "cxx"] => :cpp,
-          [".rb", "Rakefile", ".irbrc", ".gemspec", ".pryrc"] => :ruby,
-          ".py" => :python,
-          ".diff" => :diff,
-          ".css" => :css,
-          ".html" => :html,
-          [".yaml", ".yml"] => :yaml,
-          ".xml" => :xml,
-          ".php" => :php,
-          ".js" => :javascript,
-          ".java" => :java,
-          ".rhtml" => :rhtml,
-          ".json" => :json
-        }
-      end
-
-      def syntax_highlight_by_file_type_or_specified(contents, file_name, file_type)
-        if file_type
-          language_detected = file_type
-        else
-          _, language_detected = file_map.find do |k, v|
-            Array(k).any? do |matcher|
-              matcher == File.extname(file_name) || matcher == File.basename(file_name)
-            end
-          end
-        end
-
-        if Pry.color
-          CodeRay.scan(contents, language_detected).term
-        else
-          contents
-        end
-      end
-
-      # convert negative line numbers to positive by wrapping around
-      # last line (as per array indexing with negative numbers)
-      def normalized_line_number(line_number, total_lines)
-        line_number < 0 ? line_number + total_lines : line_number
-      end
-
-      # returns the file content between the lines and the normalized
-      # start and end line numbers.
-      def read_between_the_lines(file_name, start_line, end_line)
-        if file_name == Pry.eval_path
-          content = Pry.line_buffer.drop(1).join
-        else
-          content = File.read(File.expand_path(file_name))
-        end
-        lines_array = content.each_line.to_a
-
-        [lines_array[start_line..end_line].join, normalized_line_number(start_line, lines_array.size),
-         normalized_line_number(end_line, lines_array.size)]
-      end
-
       def process_rdoc(comment, code_type)
         comment = comment.dup
         comment.gsub(/<code>(?:\s*\n)?(.*?)\s*<\/code>/m) { Pry.color ? CodeRay.scan($1, code_type).term : $1 }.

data/lib/pry/hooks.rb

@@ -20,6 +20,10 @@ class Pry
     end
     protected :hooks
 
+    def errors
+      @errors ||= []
+    end
+
     # Destructively merge the contents of two `Pry:Hooks` instances.
     # @param [Pry::Hooks] other The `Pry::Hooks` instance to merge
 
@@ -89,7 +93,14 @@ class Pry
       # silence warnings to get rid of 1.8's "warning: multiple values
       # for a block parameter" warnings
       Pry::Helpers::BaseHelpers.silence_warnings do
-        @hooks[event_name].map { |hook_name, callable| callable.call(*args, &block) }.last
+        @hooks[event_name].map do |hook_name, callable|
+          begin
+            callable.call(*args, &block)
+          rescue RescuableException => e
+            errors << e
+            e
+          end
+        end.last
       end
     end
 

data/lib/pry/pry_class.rb

@@ -116,7 +116,7 @@ class Pry
     pry_instance.backtrace = caller.tap(&:shift)
 
     # yield the binding_stack to the hook for modification
-    Pry.config.hooks.exec_hook(
+    pry_instance.exec_hook(
       :when_started,
       binding_stack = [target],
       options,
@@ -220,8 +220,8 @@ class Pry
     config.prompt = DEFAULT_PROMPT
     config.print = DEFAULT_PRINT
     config.exception_handler = DEFAULT_EXCEPTION_HANDLER
-    config.exception_window_size = 5
     config.exception_whitelist = DEFAULT_EXCEPTION_WHITELIST
+    config.default_window_size = 5
     config.hooks = DEFAULT_HOOKS
     config.input_stack = []
     config.color = Helpers::BaseHelpers.use_ansi_codes?
@@ -237,7 +237,7 @@ class Pry
     config.collision_warning = false
 
     config.gist ||= OpenStruct.new
-    config.gist.inspecter = proc &:pretty_inspect
+    config.gist.inspecter = proc(&:pretty_inspect)
 
     config.plugins ||= OpenStruct.new
     config.plugins.enabled = true

data/lib/pry/pry_instance.rb

@@ -15,10 +15,11 @@ class Pry
   attr_accessor :binding_stack
 
   attr_accessor :last_result
-  attr_accessor :last_exception
   attr_accessor :last_file
   attr_accessor :last_dir
 
+  attr_reader :last_exception
+
   attr_reader :input_array
   attr_reader :output_array
 
@@ -142,7 +143,7 @@ class Pry
   # Initialize the repl session.
   # @param [Binding] target The target binding for the session.
   def repl_prologue(target)
-    hooks.exec_hook :before_session, output, target, self
+    exec_hook :before_session, output, target, self
     initialize_special_locals(target)
 
     @input_array << nil # add empty input so _in_ and _out_ match
@@ -154,7 +155,7 @@ class Pry
   # Clean-up after the repl session.
   # @param [Binding] target The target binding for the session.
   def repl_epilogue(target)
-    hooks.exec_hook :after_session, output, target, self
+    exec_hook :after_session, output, target, self
 
     Pry.active_sessions -= 1
     binding_stack.pop
@@ -231,10 +232,11 @@ class Pry
 
     result
   rescue RescuableException => e
-    result = set_last_exception(e, target)
+    self.last_exception = e
+    e
   ensure
     update_input_history(code)
-    hooks.exec_hook :after_eval, result, self
+    exec_hook :after_eval, result, self
   end
 
   # Perform a read.
@@ -270,7 +272,7 @@ class Pry
 
     @suppress_output = true if eval_string =~ /;\Z/ || eval_string.empty?
 
-    hooks.exec_hook :after_read, eval_string, self
+    exec_hook :after_read, eval_string, self
     eval_string
   end
 
@@ -337,6 +339,7 @@ class Pry
 
       if original_val != indented_val && output.tty? && Pry::Helpers::BaseHelpers.use_ansi_codes? && Pry.config.correct_indent
         output.print @indent.correct_indentation(current_prompt + indented_val, original_val.length - indented_val.length)
+        output.flush
       end
     else
       indented_val = val
@@ -402,6 +405,25 @@ class Pry
     Pry::Command::VOID_VALUE
   end
 
+  # Execute the specified hook.
+  # @param [Symbol] name The hook name to execute
+  # @param [*Object] args The arguments to pass to the hook
+  # @return [Object, Exception] The return value of the hook or the exception raised
+  #
+  # If executing a hook raises an exception, we log that and then continue sucessfully.
+  # To debug such errors, use the global variable $pry_hook_error, which is set as a
+  # result.
+  def exec_hook(name, *args, &block)
+    e_before = hooks.errors.size
+    hooks.exec_hook(name, *args, &block).tap do
+      hooks.errors[e_before..-1].each do |e|
+        output.puts "#{name} hook failed: #{e.class}: #{e.message}"
+        output.puts "#{e.backtrace.first}"
+        output.puts "(see _pry_.hooks.errors to debug)"
+      end
+    end
+  end
+
   # Set the last result of an eval.
   # This method should not need to be invoked directly.
   # @param [Object] result The result.
@@ -415,16 +437,18 @@ class Pry
   end
 
   # Set the last exception for a session.
-  # This method should not need to be invoked directly.
-  # @param [Exception] ex The exception.
-  # @param [Binding] target The binding to set `_ex_` on.
-  def set_last_exception(ex, target)
+  # @param [Exception] ex
+  def last_exception=(ex)
     class << ex
       attr_accessor :file, :line, :bt_index
       def bt_source_location_for(index)
         backtrace[index] =~ /(.*):(\d+)/
         [$1, $2.to_i]
       end
+
+      def inc_bt_index
+        @bt_index = (@bt_index + 1) % backtrace.size
+      end
     end
 
     ex.bt_index = 0
@@ -432,8 +456,7 @@ class Pry
 
     @last_result_is_exception = true
     @output_array << ex
-
-    self.last_exception = ex
+    @last_exception = ex
   end
 
   # Update Pry's internal state after evalling code.
@@ -569,9 +592,11 @@ class Pry
     elsif defined?(Rubinius::Melbourne)
       Rubinius::Melbourne.parse_string(str, Pry.eval_path)
     else
-      catch(:valid) {
-        eval("BEGIN{throw :valid}\n#{str}", binding, Pry.eval_path)
-      }
+      catch(:valid) do
+        Helpers::BaseHelpers.silence_warnings do
+          eval("BEGIN{throw :valid}\n#{str}", binding, Pry.eval_path)
+        end
+      end
     end
 
     # Assert that a line which ends with a , is incomplete.