pry 0.9.0pre2 → 0.9.0pre3

data/Rakefile

@@ -25,6 +25,7 @@ def apply_spec_defaults(s)
   s.add_dependency("slop","~>1.6.0")
   s.add_dependency("method_source",">=0.4.0")
   s.add_development_dependency("bacon",">=1.1.0")
+  s.add_development_dependency("open4", "~>1.0.1")
 end
 
 task :test do

data/bin/pry

@@ -20,9 +20,25 @@ See: `https://github.com/banister` for more information.
 }
 
   on :e, :exec, "A line of code to execute in context before the session starts", true
-  on :f, "Suppress loading of ~/.pryrc"
-  on "no-color", "Disable syntax highlighting for session"
-  on "no-plugins", "Suppress loading of plugins."
+
+  on "no-pager", "Disable pager for long output" do
+    Pry.pager = false
+  end
+
+  on "no-color", "Disable syntax highlighting for session" do
+    Pry.color = false
+  end
+
+  on :f, "Suppress loading of ~/.pryrc" do
+    # load ~/.pryrc, if not suppressed with -f option
+    Pry.config.should_load_rc = false
+  end
+
+  on "no-plugins", "Suppress loading of plugins." do
+    # suppress plugins if given --no-plugins optino
+    Pry.config.plugins.enabled = false
+  end
+
   on "simple-prompt", "Enable simple prompt mode" do
     Pry.prompt = Pry::SIMPLE_PROMPT
   end
@@ -50,12 +66,6 @@ end
 # invoked via cli
 Pry.cli = true
 
-# load ~/.pryrc, if not suppressed with -f option
-Pry.config.should_load_rc = !opts.f?
-
-# suppress plugins if given --no-plugins optino
-Pry.config.plugins.enabled = false if opts["no-plugins"]
-
 # create the actual context
 context = Pry.binding_for(eval(opts[:context]))
 

data/lib/pry.rb

@@ -1,6 +1,8 @@
 # (C) John Mair (banisterfiend) 2011
 # MIT License
 
+require 'pp'
+
 class Pry
   # The default hooks - display messages when beginning and ending Pry sessions.
   DEFAULT_HOOKS = {
@@ -19,7 +21,7 @@ class Pry
   # The default prints
   DEFAULT_PRINT = proc do |output, value|
     if Pry.color
-      output.puts "=> #{CodeRay.scan(Pry.view(value), :ruby).term}"
+      output.puts "=> #{CodeRay.scan(value.pretty_inspect, :ruby).term}"
     else
       output.puts "=> #{Pry.view(value)}"
     end
@@ -79,6 +81,7 @@ if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 end
 
 require "pry/version"
+require "pry/history_array"
 require "pry/helpers"
 require "pry/command_set"
 require "pry/commands"
@@ -88,4 +91,4 @@ require "pry/completion"
 require "pry/plugins"
 require "pry/core_extensions"
 require "pry/pry_class"
-require "pry/pry_instance"
+require "pry/pry_instance"

data/lib/pry/command_processor.rb

@@ -12,13 +12,16 @@ class Pry
 
     def_delegators :@pry_instance, :commands, :nesting, :output
 
-    # Is the string a command valid?
+    # Is the string a valid command?
     # @param [String] val The string passed in from the Pry prompt.
     # @return [Boolean] Whether the string is a valid command.
     def valid_command?(val)
-      !!(command_matched(val)[0])
+      !!(command_matched(val, binding)[0])
     end
 
+    # Convert the object to a form that can be interpolated into a
+    # Regexp cleanly.
+    # @return [String] The string to interpolate into a Regexp
     def convert_to_regex(obj)
       case obj
       when String
@@ -44,10 +47,20 @@ class Pry
     # and argument string.
     # This method should not need to be invoked directly.
     # @param [String] val The line of input.
+    # @param [Binding] target The binding to perform string
+    #   interpolation against.
     # @return [Array] The command data and arg string pair
-    def command_matched(val)
-      _, cmd_data = commands.commands.find do |name, cmd_data|
-        /^#{convert_to_regex(name)}(?!\S)/ =~ val
+    def command_matched(val, target)
+      _, cmd_data = commands.commands.find do |name, data|
+
+        interp_val = interpolate_string(val, target)
+        command_regex = /^#{convert_to_regex(name)}(?!\S)/
+
+        if data.options[:interpolate] && (command_regex =~ interp_val)
+          val.replace interp_val
+        else
+          command_regex =~ val
+        end
       end
 
       [cmd_data, (Regexp.last_match ? Regexp.last_match.captures : nil), (Regexp.last_match ? Regexp.last_match.end(0) : nil)]
@@ -65,18 +78,10 @@ class Pry
     def process_commands(val, eval_string, target)
 
       # no command was matched, so return to caller
-      return if !valid_command?(val)
-      command, captures, pos = command_matched(val)
-
-
-      # perform ruby interpolation for commands
-      if command.options[:interpolate]
-        val.replace interpolate_string(val, target)
- #       command, captures, pos = command_matched(val)
-#        captures = captures.map { |v| interpolate_string(v, target) if v }
-      end
-
+      command, captures, pos = command_matched(val, target)
+      return if !command
       arg_string = val[pos..-1].strip
+
       args = arg_string ? Shellwords.shellwords(arg_string) : []
 
       options = {

data/lib/pry/config.rb

@@ -88,6 +88,9 @@ class Pry
     # `plugins.strict_loading` (Boolean) which toggles whether referring to a non-existent plugin should raise an exception (defaults to `false`)
     # @return [OpenStruct]
     attr_accessor :plugins
+
+    # @return [Integer] Amount of results that will be stored into _out_
+    attr_accessor :memory_size
   end
 end
 

data/lib/pry/default_commands/gems.rb

@@ -33,12 +33,12 @@ class Pry
                   end
 
         gems.each do |gem, specs|
-          specs.sort! do |a,b| 
-            Gem::Version.new(b.version) <=> Gem::Version.new(a.version) 
+          specs.sort! do |a,b|
+            Gem::Version.new(b.version) <=> Gem::Version.new(a.version)
           end
-          
-          versions = specs.map.with_index do |spec, index|
-            index == 0 ? text.bright_green(spec.version.to_s) : text.green(spec.version.to_s) 
+
+          versions = specs.each_with_index.map do |spec, index|
+            index == 0 ? text.bright_green(spec.version.to_s) : text.green(spec.version.to_s)
           end
 
           output.puts "#{text.white gem} (#{versions.join ', '})"

data/lib/pry/default_commands/input.rb

@@ -12,8 +12,8 @@ class Pry
         render_output(false, 0, Pry.color ? CodeRay.scan(eval_string, :ruby).term : eval_string)
       end
 
-      command /amend-line-?(\d+)?/, "Experimental amend-line, where the N in amend-line-N represents line to replace. Aliases: %N",
-      :interpolate => false, :listing => "amend-line-N"  do |line_number, replacement_line|
+      command(/amend-line-?(\d+)?/, "Experimental amend-line, where the N in amend-line-N represents line to replace. Aliases: %N",
+      :interpolate => false, :listing => "amend-line-N")  do |line_number, replacement_line|
         replacement_line = "" if !replacement_line
         input_array = eval_string.each_line.to_a
         line_num = line_number ? line_number.to_i : input_array.size - 1
@@ -21,7 +21,7 @@ class Pry
         eval_string.replace input_array.join
       end
 
-      alias_command /%(\d+)?/, /amend-line-?(\d+)?/, ""
+      alias_command(/%(\d+)?/, /amend-line-?(\d+)?/, "")
 
       command "hist", "Show and replay Readline history. Type `hist --help` for more info." do |*args|
         Slop.parse(args) do |opt|

data/lib/pry/default_commands/introspection.rb

@@ -109,8 +109,8 @@ class Pry
 
           opt.on :M, "instance-methods", "Operate on instance methods."
           opt.on :m, :methods, "Operate on methods."
-          opt.on "no-reload", "Do not automatically reload the method's file after editting."
-          opt.on :n, "no-jump", "Do not fast forward editor to first line of method."
+          opt.on :n, "no-reload", "Do not automatically reload the method's file after editting."
+          opt.on "no-jump", "Do not fast forward editor to first line of method."
           opt.on :c, :context, "Select object context to run under.", true do |context|
             target = Pry.binding_for(target.eval(context))
           end
@@ -143,13 +143,13 @@ class Pry
             editor_invocation = Pry.editor.call(file, line)
           else
             # only use start line if -n option is not used
-            start_line_syntax = opts.n? ? "" : start_line_for_editor(line)
+            start_line_syntax = opts["no-jump"] ? "" : start_line_for_editor(line)
             editor_invocation = "#{Pry.editor} #{start_line_syntax} #{file}"
           end
 
           run ".#{editor_invocation}"
           silence_warnings do
-            load file if !opts["no-reload"]
+            load file if !opts.n?
           end
         end
       end

data/lib/pry/default_commands/ls.rb

@@ -180,9 +180,9 @@ Shows local and instance variables by default.
                                 list = list.grep(options[:grep]) if list
                                 list.uniq! if list
                                 if Pry.color
-                                  text << CodeRay.scan(Pry.view(list), :ruby).term + "\n"
+                                  text << CodeRay.scan(list.inspect, :ruby).term + "\n"
                                 else
-                                  text <<  Pry.view(list) + "\n"
+                                  text <<  list.inspect + "\n"
                                 end
                                 if !options[:f]
                                   stagger_output(text)

data/lib/pry/default_commands/shell.rb

@@ -3,7 +3,7 @@ class Pry
 
     Shell = Pry::CommandSet.new do
 
-      command /\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>" do |cmd|
+      command(/\.(.*)/, "All text following a '.' is forwarded to the shell.", :listing => ".<shell command>") do |cmd|
         if cmd =~ /^cd\s+(.+)/i
           dest = $1
           begin

data/lib/pry/history_array.rb

@@ -0,0 +1,105 @@
+class Pry
+  # A history array is an array to which you can only add elements. Older
+  # entries are removed progressively, so that the aray never contains more than
+  # N elements.
+  #
+  # History arrays are used by Pry to store the output of the last commands.
+  #
+  # @example
+  #   ary = Pry::HistoryArray.new 10
+  #   ary << 1 << 2 << 3
+  #   ary[0] # => 1
+  #   ary[1] # => 2
+  #   10.times { |n| ary << n }
+  #   ary[0] # => nil
+  #   ary[-1] # => 9
+  class HistoryArray
+    include Enumerable
+
+    # @param [Integer] size Maximum amount of objects in the array
+    def initialize(size)
+      @max_size = size
+
+      @hash  = {}
+      @count = 0
+    end
+
+    # Pushes an object at the end of the array
+    # @param [Object] value Object to be added
+    def <<(value)
+      @hash[@count] = value
+
+      if @hash.size > max_size
+        @hash.delete(@count - max_size)
+      end
+
+      @count += 1
+
+      self
+    end
+
+    # @overload [](index)
+    #   @param [Integer] index Index of the item to access.
+    #   @return [Object, nil] Item at that index or nil if it has been removed.
+    # @overload [](index, size)
+    #   @param [Integer] index Index of the first item to access.
+    #   @param [Integer] size Amount of items to access
+    #   @return [Array, nil] The selected items. Nil if index is greater than
+    #     the size of the array.
+    # @overload [](range)
+    #   @param [Range<Integer>] range Range of indices to access.
+    #   @return [Array, nil] The selected items. Nil if index is greater than
+    #     the size of the array.
+    def [](index_or_range, size = nil)
+      if index_or_range.is_a? Integer
+        index = convert_index(index_or_range)
+
+        if size
+          end_index = index + size
+          index > @count ? nil : (index...[end_index, @count].min).map do |n|
+            @hash[n]
+          end
+        else
+          @hash[index]
+        end
+      else
+        range = convert_range(index_or_range)
+        range.begin > @count ? nil : range.map { |n| @hash[n] }
+      end
+    end
+
+    # @return [Integer] Amount of objects in the array
+    def size
+      @count
+    end
+
+    def each
+      ((@count - size)...@count).each do |n|
+        yield @hash[n]
+      end
+    end
+
+    def to_a
+      ((@count - size)...@count).map { |n| @hash[n] }
+    end
+
+    def inspect
+      "#<#{self.class} size=#{size} first=#{@count - size} max_size=#{max_size}>"
+    end
+
+    # @return [Integer] Maximum amount of objects in the array
+    attr_reader :max_size
+
+    private
+    def convert_index(n)
+      n >= 0 ? n : @count + n
+    end
+
+    def convert_range(range)
+      end_index = convert_index(range.end)
+      end_index += 1 unless range.exclude_end?
+
+      Range.new(convert_index(range.begin), [end_index, @count].min, true)
+    end
+  end
+end

data/lib/pry/pry_class.rb

@@ -69,7 +69,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
+      :hooks, :color, :pager, :editor, :memory_size
   end
 
   # Load the rc files given in the `Pry::RC_FILES` array.
@@ -105,12 +105,12 @@ class Pry
     new(options).repl(target)
   end
 
-  # A custom version of `Kernel#inspect`.
+  # A custom version of `Kernel#pretty_inspect`.
   # This method should not need to be accessed directly.
   # @param obj The object to view.
   # @return [String] The string representation of `obj`.
   def self.view(obj)
-    obj.inspect
+    obj.pretty_inspect
 
   rescue NoMethodError
     "unknown"
@@ -122,8 +122,8 @@ class Pry
   # @param max_size The maximum number of chars before clipping occurs.
   # @return [String] The string representation of `obj`.
   def self.view_clip(obj, max_size=60)
-    if Pry.view(obj).size < max_size
-      Pry.view(obj)
+    if obj.inspect.size < max_size
+      obj.inspect
     else
       "#<#{obj.class}:%#x>" % (obj.object_id << 1)
     end
@@ -199,6 +199,8 @@ class Pry
     config.history.save = true
     config.history.load = true
     config.history.file = File.expand_path("~/.pry_history")
+
+    config.memory_size = 100
   end
 
   # Set all the configurable options back to their default values

data/lib/pry/pry_instance.rb

@@ -26,6 +26,7 @@ class Pry
   #   component of the REPL. (see print.rb)
   def initialize(options={})
     refresh(options)
+
     @command_processor = CommandProcessor.new(self)
   end
 
@@ -38,7 +39,7 @@ class Pry
     attributes = [
                    :input, :output, :commands, :print,
                    :exception_handler, :hooks, :custom_completions,
-                   :prompt
+                   :prompt, :memory_size
                  ]
 
     attributes.each do |attribute|
@@ -48,6 +49,7 @@ class Pry
     defaults.merge!(options).each do |key, value|
       send "#{key}=", value
     end
+
     true
   end
 
@@ -71,6 +73,17 @@ class Pry
     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.
   # This method should not need to be accessed directly.
   # @return [Array] The unparsed nesting information.
@@ -111,8 +124,13 @@ class Pry
     Pry.active_instance = self
 
     # 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
   end
 
@@ -193,19 +211,29 @@ 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)
-    expr = r(target)
 
-    Pry.line_buffer.push(*expr.each_line)
-    set_last_result(target.eval(expr, Pry.eval_path, Pry.current_line), 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
     set_last_exception(e, target)
   ensure
-    Pry.current_line += expr.each_line.count if expr
+    @input_array << code
+    Pry.current_line += code.each_line.count if code
   end
 
   # Perform a read.
@@ -292,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
 

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.0pre2"
+  VERSION = "0.9.0pre3"
 end

data/test/helper.rb

@@ -4,6 +4,7 @@ unless Object.const_defined? 'Pry'
 end
 
 require 'bacon'
+require 'open4'
 
 # Ensure we do not execute any rc files
 Pry::RC_FILES.clear

data/test/test_command_processor.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe "Pry::CommandProcessor" do
-
   before do
     @pry = Pry.new
     @pry.commands = Pry::CommandSet.new
@@ -12,9 +11,21 @@ describe "Pry::CommandProcessor" do
     @pry.commands = Pry::CommandSet.new
   end
 
+  it 'should accurately determine if a command is valid' do
+    @pry.commands.command("test-command") {}
+    valid = @command_processor.valid_command? "test-command"
+    valid.should == true
+
+    valid = @command_processor.valid_command? "blah"
+    valid.should == false
+
+    a = "test-command"
+    lambda { @command_processor.valid_command? '#{a}' }.should.raise NameError
+  end
+
   it 'should correctly match a simple string command' do
     @pry.commands.command("test-command") {}
-    command, captures, pos = @command_processor.command_matched "test-command"
+    command, captures, pos = @command_processor.command_matched "test-command", binding
 
     command.name.should == "test-command"
     captures.should == []
@@ -23,7 +34,7 @@ describe "Pry::CommandProcessor" do
 
   it 'should correctly match a simple string command with parameters' do
     @pry.commands.command("test-command") { |arg|}
-    command, captures, pos = @command_processor.command_matched "test-command hello"
+    command, captures, pos = @command_processor.command_matched "test-command hello", binding
 
     command.name.should == "test-command"
     captures.should == []
@@ -31,7 +42,7 @@ describe "Pry::CommandProcessor" do
   end
 
   it 'should not match when the relevant command does not exist' do
-    command, captures, pos = @command_processor.command_matched "test-command"
+    command, captures, pos = @command_processor.command_matched "test-command", binding
 
     command.should == nil
     captures.should == nil
@@ -39,7 +50,7 @@ describe "Pry::CommandProcessor" do
 
   it 'should correctly match a regex command' do
     @pry.commands.command(/rue(.?)/) { }
-    command, captures, pos = @command_processor.command_matched "rue hello"
+    command, captures, pos = @command_processor.command_matched "rue hello", binding
 
     command.name.should == /rue(.?)/
     captures.should == [""]
@@ -48,7 +59,7 @@ describe "Pry::CommandProcessor" do
 
   it 'should correctly match a regex command and extract the capture groups' do
     @pry.commands.command(/rue(.?)/) { }
-    command, captures, pos = @command_processor.command_matched "rue5 hello"
+    command, captures, pos = @command_processor.command_matched "rue5 hello", binding
 
     command.name.should == /rue(.?)/
     captures.should == ["5"]
@@ -57,7 +68,7 @@ describe "Pry::CommandProcessor" do
 
   it 'should correctly match a string command with spaces in its name' do
     @pry.commands.command("test command") {}
-    command, captures, pos = @command_processor.command_matched "test command"
+    command, captures, pos = @command_processor.command_matched "test command", binding
 
     command.name.should == "test command"
     captures.should == []
@@ -66,7 +77,7 @@ describe "Pry::CommandProcessor" do
 
   it 'should correctly match a string command with spaces in its name with parameters' do
     @pry.commands.command("test command") {}
-    command, captures, pos = @command_processor.command_matched "test command param1 param2"
+    command, captures, pos = @command_processor.command_matched "test command param1 param2", binding
 
     command.name.should == "test command"
     captures.should == []
@@ -78,7 +89,7 @@ describe "Pry::CommandProcessor" do
     @pry.commands.command(regex_command_name) {}
 
     sample_text = "test friendship command"
-    command, captures, pos = @command_processor.command_matched sample_text
+    command, captures, pos = @command_processor.command_matched sample_text, binding
 
     command.name.should == regex_command_name
     captures.should == ["friendship"]
@@ -90,10 +101,33 @@ describe "Pry::CommandProcessor" do
     @pry.commands.command(regex_command_name) {}
 
     sample_text = ".cd ~/pry"
-    command, captures, pos = @command_processor.command_matched sample_text
+    command, captures, pos = @command_processor.command_matched sample_text, binding
 
     command.name.should == regex_command_name
     captures.should == ["cd ~/pry"]
     pos.should == sample_text.size
   end
+
+  it 'should correctly match a command whose name is interpolated' do
+    @pry.commands.command("blah") {}
+    a = "bl"
+    b = "ah"
+    command, captures, pos = @command_processor.command_matched '#{a}#{b}', binding
+
+    command.name.should == "blah"
+    captures.should == []
+    pos.should == command.name.length
+  end
+
+  it 'should NOT match a command whose name is interpolated when :interpolate => false' do
+    @pry.commands.command("boast", "", :interpolate => false) {}
+    a = "boa"
+    b = "st"
+
+    # remember to use '' instead of "" when testing interpolation or
+    # you'll cause yourself incredible confusion
+    command, captures, pos = @command_processor.command_matched '#{a}#{b}', binding
+
+    command.should == nil
+  end
 end

data/test/test_default_commands/test_gems.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+describe "Pry::DefaultCommands::Gems" do
+  describe "gem-list" do
+
+    # fixing bug for 1.8 compat
+    it 'should not raise when invoked' do
+      str_output = StringIO.new
+      Pry.start self, :input => InputTester.new("gem-list", "exit-all"), :output => str_output
+      str_output.string.should.not =~ /NoMethodError/
+    end
+  end
+end
+

data/test/test_history_array.rb

@@ -0,0 +1,65 @@
+require 'helper'
+
+describe Pry::HistoryArray do
+  before do
+    @array = Pry::HistoryArray.new 10
+  end
+
+  it 'should have a maximum size specifed at creation time' do
+    @array.max_size.should == 10
+  end
+
+  it 'should be able to be added objects to' do
+    @array << 1 << 2 << 3
+    @array.size.should == 3
+    @array.to_a.should == [1, 2, 3]
+  end
+
+  it 'should be able to access single elements' do
+    @array << 1 << 2 << 3
+    @array[2].should == 3
+  end
+
+  it 'should be able to access negative indices' do
+    @array << 1 << 2 << 3
+    @array[-1].should == 3
+  end
+
+  it 'should be able to access ranges' do
+    @array << 1 << 2 << 3 << 4
+    @array[1..2].should == [2, 3]
+  end
+
+  it 'should be able to access ranges starting from a negative index' do
+    @array << 1 << 2 << 3 << 4
+    @array[-2..3].should == [3, 4]
+  end
+
+  it 'should be able to access ranges ending at a negative index' do
+    @array << 1 << 2 << 3 << 4
+    @array[2..-1].should == [3, 4]
+  end
+
+  it 'should be able to access ranges using only negative indices' do
+    @array << 1 << 2 << 3 << 4
+    @array[-2..-1].should == [3, 4]
+  end
+
+  it 'should be able to use range where end is excluded' do
+    @array << 1 << 2 << 3 << 4
+    @array[-2...-1].should == [3]
+  end
+
+  it 'should be able to access slices using a size' do
+    @array << 1 << 2 << 3 << 4
+    @array[-3, 2].should == [2, 3]
+  end
+
+  it 'should remove older entries' do
+    11.times { |n| @array << n }
+
+    @array[0].should  == nil
+    @array[1].should  == 1
+    @array[10].should == 10
+  end
+end

data/test/test_pry.rb

@@ -6,6 +6,15 @@ puts "With method_source version #{MethodSource::VERSION}"
 puts "--"
 
 describe Pry do
+
+  describe 'warning emissions' do
+    it 'should emit no warnings' do
+      Open4.popen4 'ruby -I lib -rubygems -r"pry" -W -e "exit"' do |pid, stdin, stdout, stderr|
+        stderr.read.empty?.should == true
+      end
+    end
+  end
+
   describe "open a Pry session on an object" do
     describe "rep" do
       before do
@@ -134,6 +143,67 @@ describe Pry do
         end
       end
 
+      describe "history arrays" do
+        it 'sets _ to the last result' do
+          res   = []
+          input = InputTester.new *[":foo", "self << _", "42", "self << _"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry.repl(res)
+
+          res.should == [:foo, 42]
+        end
+
+        it 'sets out to an array with the result' do
+          res   = {}
+          input = InputTester.new *[":foo", "42", "self[:res] = out"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry.repl(res)
+
+          res[:res].should.be.kind_of Pry::HistoryArray
+          res[:res][1..2].should == [:foo, 42]
+        end
+
+        it 'sets inp to an array with the entered lines' do
+          res   = {}
+          input = InputTester.new *[":foo", "42", "self[:res] = inp"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry.repl(res)
+
+          res[:res].should.be.kind_of Pry::HistoryArray
+          res[:res][1..2].should == [":foo\n", "42\n"]
+        end
+
+        it 'uses 100 as the size of inp and out' do
+          res   = []
+          input = InputTester.new *["self << out.max_size << inp.max_size"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput)
+          pry.repl(res)
+
+          res.should == [100, 100]
+        end
+
+        it 'can change the size of the history arrays' do
+          res   = []
+          input = InputTester.new *["self << out.max_size << inp.max_size"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput,
+                          :memory_size => 1000)
+          pry.repl(res)
+
+          res.should == [1000, 1000]
+        end
+
+        it 'store exceptions' do
+          res   = []
+          input = InputTester.new *["foo!","self << inp[-1] << out[-1]"]
+          pry   = Pry.new(:input => input, :output => Pry::NullOutput,
+                          :memory_size => 1000)
+          pry.repl(res)
+
+          res.first.should == "foo!\n"
+          res.last.should.be.kind_of NoMethodError
+        end
+      end
+
       describe "test loading rc files" do
 
         before do
@@ -492,11 +562,33 @@ describe Pry do
               Pry.new(:commands => set).rep
             end
 
-#            binding.pry
             str_output.string.should =~ /hello bing/
             $obj = nil
           end
 
+          it 'should create a regex command and arg_string should be interpolated' do
+            set = Pry::CommandSet.new do
+              command /hello(\w+)/, "" do |c1, a1, a2, a3|
+                output.puts "hello #{c1} #{a1} #{a2} #{a3}"
+              end
+            end
+
+            str_output = StringIO.new
+            $a1 = "bing"
+            $a2 = "bong"
+            $a3 = "bang"
+            redirect_pry_io(InputTester.new('hellojohn #{$a1} #{$a2} #{$a3}'), str_output) do
+              Pry.new(:commands => set).rep
+            end
+
+            str_output.string.should =~ /hello john bing bong bang/
+
+            $a1 = nil
+            $a2 = nil
+            $a3 = nil
+          end
+
+
           it 'if a regex capture is missing it should be nil' do
             set = Pry::CommandSet.new do
               command /hello(.)?/, "" do |c1, a1|

metadata

@@ -2,7 +2,7 @@
 name: pry
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 0.9.0pre2
+  version: 0.9.0pre3
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
@@ -67,6 +67,17 @@ dependencies:
         version: 1.1.0
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :development
+  version_requirements: *id006
 description: an IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables: 
@@ -121,6 +132,7 @@ files:
 - lib/pry/helpers/base_helpers.rb
 - lib/pry/helpers/command_helpers.rb
 - lib/pry/helpers/text.rb
+- lib/pry/history_array.rb
 - lib/pry/plugins.rb
 - lib/pry/pry_class.rb
 - lib/pry/pry_instance.rb
@@ -132,8 +144,10 @@ files:
 - 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_history_array.rb
 - test/test_pry.rb
 - test/testrc
 - wiki/Customizing-pry.md
@@ -173,7 +187,9 @@ test_files:
 - 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_history_array.rb
 - test/test_pry.rb
 - test/testrc