pry 0.9.3pre1-i386-mingw32 → 0.9.4-i386-mingw32

data/lib/pry/pry_instance.rb

@@ -10,10 +10,15 @@ class Pry
   attr_accessor :hooks
   attr_accessor :custom_completions
 
-  # Returns the target binding for the session. Note that altering this
-  # attribute will not change the target binding.
-  # @return [Binding] The target object for the session
-  attr_accessor :session_target
+  attr_accessor :binding_stack
+
+  attr_accessor :last_result
+  attr_accessor :last_exception
+  attr_accessor :last_file
+  attr_accessor :last_dir
+
+  attr_reader :input_array
+  attr_reader :output_array
 
   # Create a new `Pry` object.
   # @param [Hash] options The optional configuration parameters.
@@ -28,6 +33,7 @@ class Pry
     refresh(options)
 
     @command_processor = CommandProcessor.new(self)
+    @binding_stack     = []
   end
 
   # Refresh the Pry instance settings from the Pry class.
@@ -73,6 +79,18 @@ class Pry
     end
   end
 
+  # Injects a local variable into the provided binding.
+  # @param [String] name The name of the local to inject.
+  # @param [Object] value The value to set the local to.
+  # @param [Binding] b The binding to set the local on.
+  # @return [Object] The value the local was set to.
+  def inject_local(name, value, b)
+    Thread.current[:__pry_local__] = value
+    b.eval("#{name} = Thread.current[:__pry_local__]")
+  ensure
+    Thread.current[:__pry_local__] = nil
+  end
+
   # @return [Integer] The maximum amount of objects remembered by the inp and
   #   out arrays. Defaults to 100.
   def memory_size
@@ -84,32 +102,6 @@ class Pry
     @output_array = Pry::HistoryArray.new(size)
   end
 
-  # Get nesting data.
-  # This method should not need to be accessed directly.
-  # @return [Array] The unparsed nesting information.
-  def nesting
-    self.class.nesting
-  end
-
-  # Set nesting data.
-  # This method should not need to be accessed directly.
-  # @param v nesting data.
-  def nesting=(v)
-    self.class.nesting = v
-  end
-
-  # @return [Boolean] Whether top-level session has ended.
-  def finished_top_level_session?
-    nesting.empty?
-  end
-
-  # Return parent of current Pry session.
-  # @return [Pry] The parent of the current Pry session.
-  def parent
-    idx = Pry.sessions.index(self)
-    Pry.sessions[idx - 1] if idx && idx > 0
-  end
-
   # Execute the hook `hook_name`, if it is defined.
   # @param [Symbol] hook_name The hook to execute
   # @param [Array] args The arguments to pass to the hook.
@@ -117,41 +109,53 @@ class Pry
     hooks[hook_name].call(*args, &block) if hooks[hook_name]
   end
 
+  # Make sure special locals exist at start of session
+  def initialize_special_locals(target)
+    inject_local("_in_", @input_array, target)
+    inject_local("_out_", @output_array, target)
+    inject_local("_pry_", self, target)
+    inject_local("_ex_", nil, target)
+    inject_local("_file_", nil, target)
+    inject_local("_dir_", nil, target)
+
+    # without this line we get 1 test failure, ask Mon_Ouie
+    set_last_result(nil, target)
+    inject_local("_", nil, target)
+  end
+  private :initialize_special_locals
+
+  def inject_special_locals(target)
+    inject_local("_in_", @input_array, target)
+    inject_local("_out_", @output_array, target)
+    inject_local("_pry_", self, target)
+    inject_local("_ex_", self.last_exception, target)
+    inject_local("_file_", self.last_file, target)
+    inject_local("_dir_", self.last_dir, target)
+    inject_local("_", self.last_result, target)
+  end
+
   # Initialize the repl session.
   # @param [Binding] target The target binding for the session.
   def repl_prologue(target)
-    exec_hook :before_session, output, target
-    Pry.active_instance = self
+    exec_hook :before_session, output, target, self
+    initialize_special_locals(target)
 
-    # Make sure special locals exist
-    target.eval("inp  = ::Pry.active_instance.instance_eval { @input_array }")
-    target.eval("out = ::Pry.active_instance.instance_eval { @output_array }")
-
-    set_active_instance(target)
     @input_array << nil # add empty input so inp and out match
-    set_last_result(Pry.last_result, target)
 
-    self.session_target = target
+    Pry.active_sessions += 1
+    binding_stack.push target
   end
 
   # 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, nesting_level, break_data)
-    nesting.pop
-    exec_hook :after_session, output, target
-
-    # If break_data is an array, then the last element is the return value
-    break_level, return_value = Array(break_data)
-
-    # keep throwing until we reach the desired nesting level
-    if nesting_level != break_level
-      throw :breakout, break_data
-    end
-
-    save_history if Pry.config.history.should_save && finished_top_level_session?
+  def repl_epilogue(target, break_data)
+    exec_hook :after_session, output, target, self
 
-    return_value
+    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.
@@ -168,18 +172,13 @@ class Pry
 
     repl_prologue(target)
 
-    # cannot rely on nesting.level as
-    # nesting.level changes with new sessions
-    nesting_level = nesting.size
-
     break_data = catch(:breakout) do
-      nesting.push [nesting.size, target_self, self]
       loop do
-        rep(target)
+        rep(binding_stack.last)
       end
     end
 
-    return_value = repl_epilogue(target, nesting_level, break_data)
+    return_value = repl_epilogue(target, break_data)
     return_value || target_self
   end
 
@@ -211,29 +210,18 @@ class Pry
       Readline.completion_proc = Pry::InputCompleter.build_completion_proc target, instance_eval(&custom_completions)
     end
 
-    # save the pry instance to active_instance
-    Pry.active_instance = self
-
-    target.eval("inp = ::Pry.active_instance.instance_eval { @input_array }")
-    target.eval("out = ::Pry.active_instance.instance_eval { @output_array }")
-
-    @last_result_is_exception = false
-    set_active_instance(target)
+    # It's not actually redundant to inject them continually as we may have
+    # moved into the scope of a new Binding (e.g the user typed `cd`)
+    inject_special_locals(target)
 
     code = r(target)
 
-    Pry.line_buffer.push(*code.each_line)
-    res = set_last_result(target.eval(code, Pry.eval_path, Pry.current_line), target)
-    res
-  rescue SystemExit => e
-    exit
-  rescue Exception => e
-    @last_result_is_exception = true
-    @output_array << e
+    result = set_last_result(target.eval(code, Pry.eval_path, Pry.current_line), target)
+    result
+  rescue RescuableException => e
     set_last_exception(e, target)
   ensure
-    @input_array << code
-    Pry.current_line += code.each_line.count if code
+    update_input_history(code)
   end
 
   # Perform a read.
@@ -258,7 +246,7 @@ class Pry
       break if valid_expression?(eval_string)
     end
 
-    @suppress_output = true if eval_string =~ /;\Z/ || null_input?(val)
+    @suppress_output = true if eval_string =~ /;\Z/ || eval_string.empty?
 
     eval_string
   end
@@ -270,14 +258,19 @@ class Pry
     else
       print.call output, result
     end
-  end
-
-  # Returns true if input is "" and a command is not returning a
-  # value.
-  # @param [String] val The input string.
-  # @return [Boolean] Whether the input is null.
-  def null_input?(val)
-    val.empty? && !Pry.cmd_ret_value
+  rescue RescuableException => e
+    # Being uber-paranoid here, given that this exception arose because we couldn't
+    # serialize something in the user's program, let's not assume we can serialize
+    # the exception either.
+    begin
+      output.puts "output error: #{e.inspect}"
+    rescue RescuableException => e
+      if last_result_is_exception?
+        output.puts "output error: failed to show exception"
+      else
+        output.puts "output error: failed to show result"
+      end
+    end
   end
 
   # Read a line of input and check for ^d, also determine prompt to use.
@@ -289,13 +282,14 @@ class Pry
     current_prompt = select_prompt(eval_string.empty?, target.eval('self'))
     val = readline(current_prompt)
 
-    # exit session if we receive EOF character
+    # exit session if we receive EOF character (^D)
     if !val
-      output.puts
-      throw(:breakout, nesting.level)
+      output.puts ""
+      Pry.config.control_d_handler.call(eval_string, self)
+      ""
+    else
+      val
     end
-
-    val
   end
 
   # Process the line received.
@@ -304,12 +298,23 @@ class Pry
   # @param [String] eval_string The cumulative lines of input.
   # @param [Binding] target The target of the Pry session.
   def process_line(val, eval_string, target)
-    Pry.cmd_ret_value = @command_processor.process_commands(val, eval_string, target)
+    result = @command_processor.process_commands(val, eval_string, target)
+
+    # set a temporary (just so we can inject the value we want into eval_string)
+    Thread.current[:__pry_cmd_result__] = result
 
-    if Pry.cmd_ret_value
-      eval_string << "Pry.cmd_ret_value\n"
+    # note that `result` wraps the result of command processing; if a
+    # command was matched and invoked then `result.command?` returns true,
+    # otherwise it returns false.
+    if result.command? && !result.void_command?
+
+      # the command that was invoked was non-void (had a return value) and so we make
+      # the value of the current expression equal to the return value
+      # of the command.
+      eval_string.replace "Thread.current[:__pry_cmd_result__].retval\n"
     else
-      # only commands (with no ret_value) should have an empty `val` so this ignores their result
+      # only commands should have an empty `val`
+      # so this ignores their result
       eval_string << "#{val.rstrip}\n" if !val.empty?
     end
   end
@@ -319,9 +324,10 @@ class Pry
   # @param [Object] result The result.
   # @param [Binding] target The binding to set `_` on.
   def set_last_result(result, target)
-    Pry.last_result = result
+    @last_result_is_exception = false
     @output_array << result
-    target.eval("_ = ::Pry.last_result")
+
+    self.last_result = result
   end
 
   # Set the last exception for a session.
@@ -336,16 +342,22 @@ class Pry
     ex.backtrace.first =~ /(.*):(\d+)/
     ex.file, ex.line = $1, $2.to_i
 
-    Pry.last_exception = ex
-    target.eval("_ex_ = ::Pry.last_exception")
+    @last_result_is_exception = true
+    @output_array << ex
+
+    self.last_exception = ex
   end
 
-  # Set the active instance for a session.
+  # Update Pry's internal state after evalling code.
   # This method should not need to be invoked directly.
-  # @param [Binding] target The binding to set `_ex_` on.
-  def set_active_instance(target)
-    Pry.active_instance = self
-    target.eval("_pry_ = ::Pry.active_instance")
+  # @param [String] code The code we just eval'd
+  def update_input_history(code)
+    # Always push to the @input_array as the @output_array is always pushed to.
+    @input_array << code
+    if code
+      Pry.line_buffer.push(*code.each_line)
+      Pry.current_line += code.each_line.count
+    end
   end
 
   # @return [Boolean] True if the last result is an exception that was raised,
@@ -362,10 +374,9 @@ class Pry
   def readline(current_prompt="> ")
 
     if input == Readline
-
-      # Readline must be treated differently
-      # as it has a second parameter.
-      input.readline(current_prompt, true)
+      line = input.readline(current_prompt, false)
+      Pry.history << line.dup if line
+      line
     else
       begin
         if input.method(:readline).arity == 1
@@ -389,14 +400,6 @@ class Pry
     !@suppress_output || last_result_is_exception?
   end
 
-  # Save readline history to a file.
-  def save_history
-    history_file = File.expand_path(Pry.config.history.file)
-    File.open(history_file, 'w') do |f|
-      f.write Readline::HISTORY.to_a.join("\n")
-    end
-  end
-
   # Returns the appropriate prompt to use.
   # This method should not need to be invoked directly.
   # @param [Boolean] first_line Whether this is the first line of input
@@ -406,9 +409,9 @@ class Pry
   def select_prompt(first_line, target_self)
 
     if first_line
-      Array(prompt).first.call(target_self, nesting.level)
+      Array(prompt).first.call(target_self, binding_stack.size - 1, self)
     else
-      Array(prompt).last.call(target_self, nesting.level)
+      Array(prompt).last.call(target_self, binding_stack.size - 1, self)
     end
   end
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.3pre1"
+  VERSION = "0.9.4"
 end

data/pry.gemspec

@@ -1,20 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'pry/version'
 
 Gem::Specification.new do |s|
   s.name = %q{pry}
-  s.version = Pry::VERSION
+  s.version = "0.9.4pre1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{John Mair (banisterfiend)}]
-  s.description = %q{an IRB alternative and runtime developer console}
+  s.date = %q{2011-09-07}
+  s.description = %q{An IRB alternative and runtime developer console}
   s.email = %q{jrmair@gmail.com}
   s.executables = [%q{pry}]
-  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.yardopts}, %q{CHANGELOG}, %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_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_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_history_array.rb}, %q{test/test_pry.rb}, %q{test/testrc}, %q{wiki/Customizing-pry.md}, %q{wiki/Home.md}]
-  s.homepage = %q{http://banisterfiend.wordpress.com}
-  s.summary = %q{an IRB alternative and runtime developer console}
-  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_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_history_array.rb}, %q{test/test_pry.rb}, %q{test/testrc}]
+  s.files = [%q{.document}, %q{.gemtest}, %q{.gitignore}, %q{.yardopts}, %q{CHANGELOG}, %q{CONTRIBUTORS}, %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_history_array.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 = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{An IRB alternative and runtime developer console}
+  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_history_array.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
@@ -22,23 +23,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.5"])
       s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
-      s.add_runtime_dependency(%q<slop>, ["~> 1.7.0"])
-      s.add_runtime_dependency(%q<method_source>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<slop>, ["~> 2.1.0"])
+      s.add_runtime_dependency(%q<method_source>, [">= 0.6.0"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_development_dependency(%q<open4>, ["~> 1.0.1"])
     else
       s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
       s.add_dependency(%q<coderay>, [">= 0.9.8"])
-      s.add_dependency(%q<slop>, ["~> 1.7.0"])
-      s.add_dependency(%q<method_source>, [">= 0.4.0"])
+      s.add_dependency(%q<slop>, ["~> 2.1.0"])
+      s.add_dependency(%q<method_source>, [">= 0.6.0"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
       s.add_dependency(%q<open4>, ["~> 1.0.1"])
     end
   else
     s.add_dependency(%q<ruby_parser>, [">= 2.0.5"])
     s.add_dependency(%q<coderay>, [">= 0.9.8"])
-    s.add_dependency(%q<slop>, ["~> 1.7.0"])
-    s.add_dependency(%q<method_source>, [">= 0.4.0"])
+    s.add_dependency(%q<slop>, ["~> 2.1.0"])
+    s.add_dependency(%q<method_source>, [">= 0.6.0"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
     s.add_dependency(%q<open4>, ["~> 1.0.1"])
   end

data/test/helper.rb

@@ -25,13 +25,33 @@ class << Pry
   end
 end
 
+# are we on Jruby platform?
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+end
+
+# are we on rbx platform?
+def rbx?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+end
+
 Pry.reset_defaults
 
+# this is to test exception code (cat --ex)
+def broken_method
+  this method is broken
+end
+
 # sample doc
 def sample_method
   :sample
 end
 
+# another sample doc
+def another_sample_method
+  :another_sample
+end
+
 def redirect_pry_io(new_in, new_out)
   old_in = Pry.input
   old_out = Pry.output
@@ -46,6 +66,17 @@ def redirect_pry_io(new_in, new_out)
   end
 end
 
+def mock_pry(*args)
+  input = InputTester.new(*args)
+  output = StringIO.new
+
+  redirect_pry_io(input, output) do
+    Pry.start
+  end
+
+  output.string
+end
+
 def redirect_global_pry_input(new_io)
   old_io = Pry.input
     Pry.input = new_io