pry 0.8.4pre1-i386-mingw32 → 0.9.0-i386-mingw32

data/lib/pry/pry_instance.rb

@@ -2,12 +2,13 @@ require "pry/command_processor.rb"
 
 class Pry
 
-  # The list of configuration options.
-  CONFIG_OPTIONS = [:input, :output, :commands, :print,
-                    :exception_handler, :prompt, :hooks,
-                    :custom_completions]
-
-  attr_accessor *CONFIG_OPTIONS
+  attr_accessor :input
+  attr_accessor :output
+  attr_accessor :commands
+  attr_accessor :print
+  attr_accessor :exception_handler
+  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.
@@ -18,22 +19,69 @@ class Pry
   # @param [Hash] options The optional configuration parameters.
   # @option options [#readline] :input The object to use for input.
   # @option options [#puts] :output The object to use for output.
-  # @option options [Pry::CommandBase] :commands The object to use for commands. (see commands.rb)
-  # @option options [Hash] :hooks The defined hook Procs (see hooks.rb)
-  # @option options [Array<Proc>] :default_prompt The array of Procs to use for the prompts. (see prompts.rb)
+  # @option options [Pry::CommandBase] :commands The object to use for commands.
+  # @option options [Hash] :hooks The defined hook Procs
+  # @option options [Array<Proc>] :prompt The array of Procs to use for the prompts.
   # @option options [Proc] :print The Proc to use for the 'print'
   #   component of the REPL. (see print.rb)
   def initialize(options={})
+    refresh(options)
 
-    default_options = {}
-    CONFIG_OPTIONS.each { |v| default_options[v] = Pry.send(v) }
-    default_options.merge!(options)
+    @command_processor = CommandProcessor.new(self)
+  end
 
-    CONFIG_OPTIONS.each do |key|
-      send "#{key}=", default_options[key]
+  # Refresh the Pry instance settings from the Pry class.
+  # Allows options to be specified to override settings from Pry class.
+  # @param [Hash] options The options to override Pry class settings
+  #   for this instance.
+  def refresh(options={})
+    defaults   = {}
+    attributes = [
+                   :input, :output, :commands, :print,
+                   :exception_handler, :hooks, :custom_completions,
+                   :prompt, :memory_size
+                 ]
+
+    attributes.each do |attribute|
+      defaults[attribute] = Pry.send attribute
     end
 
-    @command_processor = CommandProcessor.new(self)
+    defaults.merge!(options).each do |key, value|
+      send "#{key}=", value
+    end
+
+    true
+  end
+
+  # The current prompt.
+  # This is the prompt at the top of the prompt stack.
+  #
+  # @example
+  #    self.prompt = Pry::SIMPLE_PROMPT
+  #    self.prompt # => Pry::SIMPLE_PROMPT
+  #
+  # @return [Array<Proc>] Current prompt.
+  def prompt
+    prompt_stack.last
+  end
+
+  def prompt=(new_prompt)
+    if prompt_stack.empty?
+      push_prompt new_prompt
+    else
+      prompt_stack[-1] = new_prompt
+    end
+  end
+
+  # @return [Integer] The maximum amount of objects remembered by the inp and
+  #   out arrays. Defaults to 100.
+  def memory_size
+    @output_array.max_size
+  end
+
+  def memory_size=(size)
+    @input_array  = Pry::HistoryArray.new(size)
+    @output_array = Pry::HistoryArray.new(size)
   end
 
   # Get nesting data.
@@ -50,6 +98,11 @@ class Pry
     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
@@ -71,8 +124,13 @@ class Pry
     Pry.active_instance = self
 
     # Make sure special locals exist
-    target.eval("_pry_ = ::Pry.active_instance")
-    target.eval("_ = ::Pry.last_result")
+    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
   end
 
@@ -91,6 +149,8 @@ class Pry
       throw :breakout, break_data
     end
 
+    save_history if Pry.config.history.should_save && finished_top_level_session?
+
     return_value
   end
 
@@ -153,20 +213,27 @@ class Pry
 
     # save the pry instance to active_instance
     Pry.active_instance = self
-    target.eval("_pry_ = ::Pry.active_instance")
+
+    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)
+
+    code = r(target)
 
-    # eval the expression and save to last_result
-    # Do not want __FILE__, __LINE__ here because we need to distinguish
-    # (eval) methods for show-method and friends.
-    # This also sets the `_` local for the session.
-    set_last_result(target.eval(r(target)), 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
     set_last_exception(e, target)
+  ensure
+    @input_array << code
+    Pry.current_line += code.each_line.count if code
   end
 
   # Perform a read.
@@ -175,18 +242,19 @@ class Pry
   # Ruby expression is received.
   # Pry commands are also accepted here and operate on the target.
   # @param [Object, Binding] target The receiver of the read.
+  # @param [String] eval_string Optionally Prime `eval_string` with a start value.
   # @return [String] The Ruby expression.
   # @example
   #   Pry.new.r(Object.new)
-  def r(target=TOPLEVEL_BINDING)
+  def r(target=TOPLEVEL_BINDING, eval_string="")
     target = Pry.binding_for(target)
     @suppress_output = false
-    eval_string = ""
 
     val = ""
     loop do
       val = retrieve_line(eval_string, target)
       process_line(val, eval_string, target)
+
       break if valid_expression?(eval_string)
     end
 
@@ -195,7 +263,7 @@ class Pry
     eval_string
   end
 
-  # FIXME should delete this method? it's exposing an implementation detail!
+  # 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
@@ -234,15 +302,15 @@ class Pry
   # This method should not need to be invoked directly.
   # @param [String] val The line to process.
   # @param [String] eval_string The cumulative lines of input.
-  # @target [Binding] target The target of the Pry session.
+  # @param [Binding] target The target of the Pry session.
   def process_line(val, eval_string, target)
-    val.rstrip!
     Pry.cmd_ret_value = @command_processor.process_commands(val, eval_string, target)
 
     if Pry.cmd_ret_value
       eval_string << "Pry.cmd_ret_value\n"
     else
-      eval_string << "#{val}\n" if !val.empty?
+      # only commands (with no ret_value) should have an empty `val` so this ignores their result
+      eval_string << "#{val.rstrip}\n" if !val.empty?
     end
   end
 
@@ -252,6 +320,7 @@ class Pry
   # @param [Binding] target The binding to set `_` on.
   def set_last_result(result, target)
     Pry.last_result = result
+    @output_array << result
     target.eval("_ = ::Pry.last_result")
   end
 
@@ -260,10 +329,25 @@ class Pry
   # @param [Exception] ex The exception.
   # @param [Binding] target The binding to set `_ex_` on.
   def set_last_exception(ex, target)
+    class << ex
+      attr_accessor :file, :line
+    end
+
+    ex.backtrace.first =~ /(.*):(\d+)/
+    ex.file, ex.line = $1, $2.to_i
+
     Pry.last_exception = ex
     target.eval("_ex_ = ::Pry.last_exception")
   end
 
+  # Set the active instance for a session.
+  # 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")
+  end
+
   # @return [Boolean] True if the last result is an exception that was raised,
   #   as opposed to simply an instance of Exception (like the result of
   #   Exception.new)
@@ -291,7 +375,7 @@ class Pry
         end
 
       rescue EOFError
-        self.input = Readline
+        self.input = Pry.input
         ""
       end
     end
@@ -305,6 +389,14 @@ 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
@@ -326,30 +418,6 @@ class Pry
   end
   private :prompt_stack
 
-  # The current prompt, this is the prompt at the top of the prompt stack.
-  # @return [Array<Proc>] Current prompt.
-  # @example
-  #    push_prompt(Pry::SIMPLE_PROMPT)
-  #    prompt # => Pry::SIMPLE_PROMPT
-  def prompt
-    prompt_stack.last
-  end
-
-  # Replaces the current prompt with the new prompt.
-  # Does not change the rest of the prompt stack.
-  # @param [Array<Proc>] new_prompt
-  # @return [Array<Proc>] new_prompt
-  # @example
-  #    pry.prompt = Pry::SIMPLE_PROMPT # => Pry::SIMPLE_PROMPT
-  #    pry.prompt # => Pry::SIMPLE_PROMPT
-  def prompt=(new_prompt)
-    if prompt_stack.empty?
-      push_prompt new_prompt
-    else
-      prompt_stack[-1] = new_prompt
-    end
-  end
-
   # Pushes the current prompt onto a stack that it can be restored from later.
   # Use this if you wish to temporarily change the prompt.
   # @param [Array<Proc>] new_prompt
@@ -374,7 +442,7 @@ class Pry
   #    pry.pop_prompt # => prompt1
   #    pry.pop_prompt # => prompt1
   def pop_prompt
-    if prompt_stack.size > 1 then prompt_stack.pop else prompt end
+    prompt_stack.size > 1 ? prompt_stack.pop : prompt
   end
 
   if RUBY_VERSION =~ /1.9/ && RUBY_ENGINE == "ruby"

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.8.4pre1"
+  VERSION = "0.9.0"
 end

data/pry.gemspec

@@ -0,0 +1,45 @@
+# -*- 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.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.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}]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    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_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<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<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<open4>, ["~> 1.0.1"])
+  end
+end

data/test/helper.rb

@@ -4,24 +4,74 @@ unless Object.const_defined? 'Pry'
 end
 
 require 'bacon'
+require 'open4'
 
 # Ensure we do not execute any rc files
 Pry::RC_FILES.clear
-Pry.color = false
-Pry.should_load_rc = false
-
-class Module
-  public :remove_const
-end
 
+# in case the tests call reset_defaults, ensure we reset them to
+# amended (test friendly) values
 class << Pry
   alias_method :orig_reset_defaults, :reset_defaults
   def reset_defaults
     orig_reset_defaults
+
     Pry.color = false
+    Pry.pager = false
+    Pry.config.should_load_rc = false
+    Pry.config.plugins.enabled = false
+    Pry.config.history.should_load = false
+    Pry.config.history.should_save = false
   end
 end
 
+Pry.reset_defaults
+
+# sample doc
+def sample_method
+  :sample
+end
+
+def redirect_pry_io(new_in, new_out)
+  old_in = Pry.input
+  old_out = Pry.output
+
+  Pry.input = new_in
+  Pry.output = new_out
+  begin
+    yield
+  ensure
+    Pry.input = old_in
+    Pry.output = old_out
+  end
+end
+
+def redirect_global_pry_input(new_io)
+  old_io = Pry.input
+    Pry.input = new_io
+    begin
+      yield
+    ensure
+      Pry.input = old_io
+    end
+end
+
+def redirect_global_pry_output(new_io)
+  old_io = Pry.output
+    Pry.output = new_io
+    begin
+      yield
+    ensure
+      Pry.output = old_io
+    end
+end
+
+class Module
+  public :remove_const
+  public :remove_method
+end
+
+
 class InputTester
   def initialize(*actions)
     @orig_actions = actions.dup
@@ -47,7 +97,7 @@ class Pry
 end
 
 
-CommandTester = Pry::CommandSet.new :test do
+CommandTester = Pry::CommandSet.new do
   command "command1", "command 1 test" do
     output.puts "command1"
   end