pry 0.9.5 → 0.9.6

data/lib/pry/history_array.rb

@@ -73,6 +73,10 @@ class Pry
       @count
     end
 
+    def empty?
+      size == 0
+    end
+
     def each
       ((@count - size)...@count).each do |n|
         yield @hash[n]

data/lib/pry/pry_class.rb

@@ -6,7 +6,7 @@ require 'pry/config'
 class Pry
 
   # The RC Files to load.
-  RC_FILES = ["~/.pryrc"]
+  RC_FILES = ["~/.pryrc", "./.pryrc"]
 
   # class accessors
   class << self
@@ -51,7 +51,7 @@ class Pry
     def_delegators :@plugin_manager, :plugins, :load_plugins, :locate_plugins
 
     delegate_accessors :@config, :input, :output, :commands, :prompt, :print, :exception_handler,
-      :hooks, :color, :pager, :editor, :memory_size
+      :hooks, :color, :pager, :editor, :memory_size, :input_stack
   end
 
   # Load the rc files given in the `Pry::RC_FILES` array.
@@ -95,17 +95,17 @@ class Pry
     new(options).repl(target)
   end
 
-  # A version of `Pry.view` that clips the output to `max_size` chars.
-  # In case of > `max_size` chars the `#<Object...> notation is used.
+  # An inspector that clips the output to `max_length` chars.
+  # In case of > `max_length` chars the `#<Object...> notation is used.
   # @param obj The object to view.
-  # @param max_size The maximum number of chars before clipping occurs.
+  # @param max_length The maximum number of chars before clipping occurs.
   # @return [String] The string representation of `obj`.
   def self.view_clip(obj, max_length = 60)
     if obj.kind_of?(Module) && obj.name.to_s != "" && obj.name.to_s.length <= max_length
       obj.name.to_s
     elsif TOPLEVEL_BINDING.eval('self') == obj
       # special case for 'main' object :)
-      obj.inspect
+      obj.to_s
     elsif [String, Numeric, Symbol, nil, true, false].any? { |v| v === obj } && obj.inspect.length <= max_length
       obj.inspect
     else
@@ -181,9 +181,13 @@ 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.hooks = DEFAULT_HOOKS
+    config.input_stack = []
     config.color = true
     config.pager = true
+    config.system = DEFAULT_SYSTEM
     config.editor = default_editor_for_platform
     config.should_load_rc = true
     config.disable_auto_reload = false

data/lib/pry/pry_instance.rb

@@ -8,6 +8,8 @@ class Pry
   attr_accessor :print
   attr_accessor :exception_handler
   attr_accessor :hooks
+  attr_accessor :input_stack
+
   attr_accessor :custom_completions
 
   attr_accessor :binding_stack
@@ -20,6 +22,7 @@ class Pry
   attr_reader :input_array
   attr_reader :output_array
 
+
   # Create a new `Pry` object.
   # @param [Hash] options The optional configuration parameters.
   # @option options [#readline] :input The object to use for input.
@@ -45,7 +48,7 @@ class Pry
     attributes = [
                    :input, :output, :commands, :print,
                    :exception_handler, :hooks, :custom_completions,
-                   :prompt, :memory_size
+                   :prompt, :memory_size, :input_stack
                  ]
 
     attributes.each do |attribute|
@@ -140,7 +143,7 @@ class Pry
     exec_hook :before_session, output, target, self
     initialize_special_locals(target)
 
-    @input_array << nil # add empty input so inp and out match
+    @input_array << nil # add empty input so _in_ and _out_ match
 
     Pry.active_sessions += 1
     binding_stack.push target
@@ -148,14 +151,12 @@ class Pry
 
   # Clean-up after the repl session.
   # @param [Binding] target The target binding for the session.
-  # @return [Object] The return value of the repl session (if one exists).
-  def repl_epilogue(target, break_data)
+  def repl_epilogue(target)
     exec_hook :after_session, output, target, self
 
     Pry.active_sessions -= 1
     binding_stack.pop
     Pry.save_history if Pry.config.history.should_save && Pry.active_sessions == 0
-    break_data
   end
 
   # Start a read-eval-print-loop.
@@ -178,8 +179,8 @@ class Pry
       end
     end
 
-    return_value = repl_epilogue(target, break_data)
-    return_value || target_self
+    repl_epilogue(target)
+    break_data || target_self
   end
 
   # Perform a read-eval-print.
@@ -254,7 +255,7 @@ class Pry
   # Output the result or pass to an exception handler (if result is an exception).
   def show_result(result)
     if last_result_is_exception?
-      exception_handler.call output, result
+      exception_handler.call output, result, self
     else
       print.call output, result
     end
@@ -263,12 +264,12 @@ class Pry
     # serialize something in the user's program, let's not assume we can serialize
     # the exception either.
     begin
-      output.puts "output error: #{e.inspect}"
+      output.puts "(pry) output error: #{e.inspect}"
     rescue RescuableException => e
       if last_result_is_exception?
-        output.puts "output error: failed to show exception"
+        output.puts "(pry) output error: failed to show exception"
       else
-        output.puts "output error: failed to show result"
+        output.puts "(pry) output error: failed to show result"
       end
     end
   end
@@ -319,6 +320,16 @@ class Pry
     end
   end
 
+  # Run the specified command.
+  # @param [String] The command (and its params) to execute.
+  # @param [Binding] The binding to use..
+  # @example
+  #   pry_instance.run_command("ls -m")
+  def run_command(val, target = binding_stack.last)
+    process_line(val, "", target)
+    Pry::CommandContext::VOID_VALUE
+  end
+
   # Set the last result of an eval.
   # This method should not need to be invoked directly.
   # @param [Object] result The result.
@@ -336,11 +347,15 @@ class Pry
   # @param [Binding] target The binding to set `_ex_` on.
   def set_last_exception(ex, target)
     class << ex
-      attr_accessor :file, :line
+      attr_accessor :file, :line, :bt_index
+      def bt_source_location_for(index)
+        backtrace[index] =~ /(.*):(\d+)/
+        [$1, $2.to_i]
+      end
     end
 
-    ex.backtrace.first =~ /(.*):(\d+)/
-    ex.file, ex.line = $1, $2.to_i
+    ex.bt_index = 0
+    ex.file, ex.line = ex.bt_source_location_for(0)
 
     @last_result_is_exception = true
     @output_array << ex
@@ -367,27 +382,44 @@ class Pry
     @last_result_is_exception
   end
 
+  # Manage switching of input objects on encountering EOFErrors
+  def handle_read_errors
+    should_retry = true
+    begin
+      yield
+    rescue EOFError
+      if input_stack.empty?
+        self.input = Pry.config.input
+        if !should_retry
+          output.puts "Error: Pry ran out of things to read from! Attempting to break out of REPL."
+          throw(:breakout)
+        end
+        should_retry = false
+      else
+        self.input = input_stack.pop
+      end
+      retry
+    end
+  end
+
+  private :handle_read_errors
+
   # Returns the next line of input to be used by the pry instance.
   # This method should not need to be invoked directly.
   # @param [String] current_prompt The prompt to use for input.
   # @return [String] The next line of input.
   def readline(current_prompt="> ")
-
-    if input == Readline
-      line = input.readline(current_prompt, false)
-      Pry.history << line.dup if line
-      line
-    else
-      begin
+    handle_read_errors do
+      if input == Readline
+        line = input.readline(current_prompt, false)
+        Pry.history << line.dup if line
+        line
+      else
         if input.method(:readline).arity == 1
           input.readline(current_prompt)
         else
           input.readline
         end
-
-      rescue EOFError
-        self.input = Pry.input
-        ""
       end
     end
   end

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/pry.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pry}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Mair (banisterfiend)"]
-  s.date = %q{2011-09-09}
+  s.authors = [%q{John Mair (banisterfiend)}]
+  s.date = %q{2011-09-19}
   s.description = %q{An IRB alternative and runtime developer console}
   s.email = %q{jrmair@gmail.com}
-  s.executables = ["pry"]
-  s.files = [".document", ".gemtest", ".gitignore", ".yardopts", "CHANGELOG", "CONTRIBUTORS", "LICENSE", "README.markdown", "Rakefile", "TODO", "bin/pry", "examples/example_basic.rb", "examples/example_command_override.rb", "examples/example_commands.rb", "examples/example_hooks.rb", "examples/example_image_edit.rb", "examples/example_input.rb", "examples/example_input2.rb", "examples/example_output.rb", "examples/example_print.rb", "examples/example_prompt.rb", "examples/helper.rb", "lib/pry.rb", "lib/pry/command_context.rb", "lib/pry/command_processor.rb", "lib/pry/command_set.rb", "lib/pry/commands.rb", "lib/pry/completion.rb", "lib/pry/config.rb", "lib/pry/core_extensions.rb", "lib/pry/custom_completions.rb", "lib/pry/default_commands/basic.rb", "lib/pry/default_commands/context.rb", "lib/pry/default_commands/documentation.rb", "lib/pry/default_commands/easter_eggs.rb", "lib/pry/default_commands/gems.rb", "lib/pry/default_commands/input.rb", "lib/pry/default_commands/introspection.rb", "lib/pry/default_commands/ls.rb", "lib/pry/default_commands/shell.rb", "lib/pry/extended_commands/experimental.rb", "lib/pry/extended_commands/user_command_api.rb", "lib/pry/helpers.rb", "lib/pry/helpers/base_helpers.rb", "lib/pry/helpers/command_helpers.rb", "lib/pry/helpers/text.rb", "lib/pry/history.rb", "lib/pry/history_array.rb", "lib/pry/plugins.rb", "lib/pry/pry_class.rb", "lib/pry/pry_instance.rb", "lib/pry/version.rb", "pry.gemspec", "test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_shell.rb", "test/test_history_array.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc", "wiki/Customizing-pry.md", "wiki/Home.md"]
+  s.executables = [%q{pry}]
+  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %q{Gemfile}, %q{LICENSE}, %q{README.markdown}, %q{Rakefile}, %q{TODO}, %q{bin/pry}, %q{examples/example_basic.rb}, %q{examples/example_command_override.rb}, %q{examples/example_commands.rb}, %q{examples/example_hooks.rb}, %q{examples/example_image_edit.rb}, %q{examples/example_input.rb}, %q{examples/example_input2.rb}, %q{examples/example_output.rb}, %q{examples/example_print.rb}, %q{examples/example_prompt.rb}, %q{examples/helper.rb}, %q{lib/pry.rb}, %q{lib/pry/command_context.rb}, %q{lib/pry/command_processor.rb}, %q{lib/pry/command_set.rb}, %q{lib/pry/commands.rb}, %q{lib/pry/completion.rb}, %q{lib/pry/config.rb}, %q{lib/pry/core_extensions.rb}, %q{lib/pry/custom_completions.rb}, %q{lib/pry/default_commands/basic.rb}, %q{lib/pry/default_commands/context.rb}, %q{lib/pry/default_commands/documentation.rb}, %q{lib/pry/default_commands/easter_eggs.rb}, %q{lib/pry/default_commands/gems.rb}, %q{lib/pry/default_commands/input.rb}, %q{lib/pry/default_commands/introspection.rb}, %q{lib/pry/default_commands/ls.rb}, %q{lib/pry/default_commands/shell.rb}, %q{lib/pry/extended_commands/experimental.rb}, %q{lib/pry/extended_commands/user_command_api.rb}, %q{lib/pry/helpers.rb}, %q{lib/pry/helpers/base_helpers.rb}, %q{lib/pry/helpers/command_helpers.rb}, %q{lib/pry/helpers/text.rb}, %q{lib/pry/history.rb}, %q{lib/pry/history_array.rb}, %q{lib/pry/plugins.rb}, %q{lib/pry/pry_class.rb}, %q{lib/pry/pry_instance.rb}, %q{lib/pry/version.rb}, %q{pry.gemspec}, %q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
   s.homepage = %q{http://pry.github.com}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{An IRB alternative and runtime developer console}
-  s.test_files = ["test/helper.rb", "test/test_command_helpers.rb", "test/test_command_processor.rb", "test/test_command_set.rb", "test/test_completion.rb", "test/test_default_commands.rb", "test/test_default_commands/test_context.rb", "test/test_default_commands/test_documentation.rb", "test/test_default_commands/test_gems.rb", "test/test_default_commands/test_input.rb", "test/test_default_commands/test_introspection.rb", "test/test_default_commands/test_shell.rb", "test/test_history_array.rb", "test/test_pry.rb", "test/test_pry_history.rb", "test/test_pry_output.rb", "test/test_special_locals.rb", "test/testrc"]
+  s.test_files = [%q{test/helper.rb}, %q{test/test_command_helpers.rb}, %q{test/test_command_processor.rb}, %q{test/test_command_set.rb}, %q{test/test_completion.rb}, %q{test/test_default_commands.rb}, %q{test/test_default_commands/test_context.rb}, %q{test/test_default_commands/test_documentation.rb}, %q{test/test_default_commands/test_gems.rb}, %q{test/test_default_commands/test_input.rb}, %q{test/test_default_commands/test_introspection.rb}, %q{test/test_default_commands/test_shell.rb}, %q{test/test_exception_whitelist.rb}, %q{test/test_history_array.rb}, %q{test/test_input_stack.rb}, %q{test/test_pry.rb}, %q{test/test_pry_history.rb}, %q{test/test_pry_output.rb}, %q{test/test_special_locals.rb}, %q{test/testrc}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/helper.rb

@@ -3,6 +3,8 @@ unless Object.const_defined? 'Pry'
   require 'pry'
 end
 
+puts "Ruby v#{RUBY_VERSION} (#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"}), Pry v#{Pry::VERSION}, method_source v#{MethodSource::VERSION}"
+
 require 'bacon'
 require 'open4'
 
@@ -25,6 +27,25 @@ class << Pry
   end
 end
 
+class MockPryException
+  attr_accessor :bt_index
+  attr_accessor :backtrace
+
+  def initialize(*backtrace)
+    @backtrace = backtrace
+    @bt_index = 0
+  end
+
+  def message
+    "mock exception"
+  end
+
+  def bt_source_location_for(index)
+    backtrace[index] =~ /(.*):(\d+)/
+    [$1, $2.to_i]
+  end
+end
+
 # are we on Jruby platform?
 def jruby?
   defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
@@ -52,7 +73,11 @@ def another_sample_method
   :another_sample
 end
 
-def redirect_pry_io(new_in, new_out)
+# Set I/O streams.
+#
+# Out defaults to an anonymous StringIO.
+#
+def redirect_pry_io(new_in, new_out = StringIO.new)
   old_in = Pry.input
   old_out = Pry.output
 
@@ -130,6 +155,15 @@ class Pry
   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("tmp")
+  yield file
+ensure
+  file.close
+end
+
 
 CommandTester = Pry::CommandSet.new do
   command "command1", "command 1 test" do

data/test/test_command_set.rb

@@ -99,7 +99,7 @@ describe Pry::CommandSet do
 
     @set.alias_command 'bar', 'foo'
     @set.commands['bar'].name.should == 'bar'
-    @set.commands['bar'].description.should == 'stuff'
+    @set.commands['bar'].description.should == ''
 
     @set.run_command nil, 'bar'
     run.should == true

data/test/test_default_commands/test_input.rb

@@ -55,7 +55,7 @@ describe "Pry::DefaultCommands::Input" do
         pry
       end
 
-      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts \"\#{goodbye}\"/
+      str_output.string.should =~ /\A\d+: def hello\n\d+: puts :bing\n\d+: puts \"\#\{goodbye\}\"/
     end
 
     it 'should display error if nothing to amend' do
@@ -184,35 +184,54 @@ describe "Pry::DefaultCommands::Input" do
       $o = nil
     end
 
+    it 'should APPEND to the input buffer when playing a line with play -m, not replace it' do
+      $o = Object.new
+      def $o.test_method
+        :test_method_content
+      end
+
+      redirect_pry_io(InputTester.new('def another_test_method', 'play -m $o.test_method --lines 2', 'show-input', 'exit-all'), str_output = StringIO.new) do
+        pry
+      end
+      str_output.string.should =~ /def another_test_method/
+      str_output.string.should =~ /:test_method_content/
+      $o = nil
+    end
+
+
     it 'should play a method with the -m switch (multiple line)' do
       $o = Object.new
+      class << $o
+        attr_accessor :var1, :var2
+      end
+
       def $o.test_method
-        1 + 102
-        5 * 6
+        @var1 = 20
+        @var2 = 30
       end
 
+      obj = Object.new
+      b = Pry.binding_for(obj)
+
       redirect_pry_io(InputTester.new('play -m $o.test_method --lines 2..3', "exit-all"), str_output = StringIO.new) do
-        pry
+        b.pry
       end
 
-      str_output.string.should =~ /103\n.*30/
-      $o = nil
+      obj.instance_variable_get(:@var1).should == 20
+      obj.instance_variable_get(:@var2).should == 30
+      str_output.string.should =~ /30/
+      str_output.string.should.not =~ /20/
     end
 
   end
 
   describe "hist" do
-    push_first_hist_line = lambda do |hist, line|
-      hist.push line
-    end
-
     before do
       Pry.history.clear
       @hist = Pry.history
     end
 
     it 'should display the correct history' do
-      push_first_hist_line.call(@hist, "'bug in 1.8 means this line is ignored'")
       @hist.push "hello"
       @hist.push "world"
       str_output = StringIO.new
@@ -223,7 +242,6 @@ describe "Pry::DefaultCommands::Input" do
     end
 
     it 'should replay history correctly (single item)' do
-      push_first_hist_line.call(@hist, ":hello")
       @hist.push ":blah"
       @hist.push ":bucket"
       @hist.push ":ostrich"
@@ -235,7 +253,6 @@ describe "Pry::DefaultCommands::Input" do
     end
 
     it 'should replay a range of history correctly (range of items)' do
-      push_first_hist_line.call(@hist, "'bug in 1.8 means this line is ignored'")
       @hist.push ":hello"
       @hist.push ":carl"
       str_output = StringIO.new
@@ -246,7 +263,6 @@ describe "Pry::DefaultCommands::Input" do
     end
 
     it 'should grep for correct lines in history' do
-      push_first_hist_line.call(@hist, "apple")
       @hist.push "abby"
       @hist.push "box"
       @hist.push "button"
@@ -279,7 +295,6 @@ describe "Pry::DefaultCommands::Input" do
     end
 
     it 'should return last N lines in history with --tail switch' do
-      push_first_hist_line.call(@hist, "0")
       ("a".."z").each do |v|
         @hist.push v
       end
@@ -296,7 +311,6 @@ describe "Pry::DefaultCommands::Input" do
     # strangeness in this test is due to bug in Readline::HISTORY not
     # always registering first line of input
     it 'should return first N lines in history with --head switch' do
-      push_first_hist_line.call(@hist, "0")
       ("a".."z").each do |v|
         @hist.push v
       end
@@ -313,7 +327,6 @@ describe "Pry::DefaultCommands::Input" do
     # strangeness in this test is due to bug in Readline::HISTORY not
     # always registering first line of input
     it 'should show lines between lines A and B with the --show switch' do
-      push_first_hist_line.call(@hist, "0")
       ("a".."z").each do |v|
         @hist.push v
       end