pry 0.9.4pre1-i386-mingw32 → 0.9.4pre2-i386-mingw32

data/lib/pry/version.rb

@@ -1,3 +1,3 @@
 class Pry
-  VERSION = "0.9.4pre1"
+  VERSION = "0.9.4pre2"
 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

data/test/test_command_set.rb

@@ -112,9 +112,9 @@ describe Pry::CommandSet do
     @set.commands['foo'].description.should == 'baz'
   end
 
-  it 'should return nil for commands by default' do
+  it 'should return Pry::CommandContext::VOID_VALUE for commands by default' do
     @set.command('foo') { 3 }
-    @set.run_command(nil, 'foo').should == nil
+    @set.run_command(nil, 'foo').should == Pry::CommandContext::VOID_VALUE
   end
 
   it 'should be able to keep return values' do
@@ -122,6 +122,11 @@ describe Pry::CommandSet do
     @set.run_command(nil, 'foo').should == 3
   end
 
+  it 'should be able to keep return values, even if return value is nil' do
+    @set.command('foo', '', :keep_retval => true) { nil }
+    @set.run_command(nil, 'foo').should == nil
+  end
+
   it 'should be able to have its own helpers' do
     @set.command('foo') do
       should.respond_to :my_helper

data/test/test_completion.rb

@@ -15,9 +15,13 @@ describe Pry::InputCompleter do
     Object.remove_const :SymbolyName
   end
 
-  it "should not crash if there's a Module that has a symbolic name." do
-    completer = Pry::InputCompleter.build_completion_proc(Pry.binding_for(Object.new))
-    lambda{ completer.call "a.to_s." }.should.not.raise Exception
+  # another jruby hack :((
+  if !jruby?
+    it "should not crash if there's a Module that has a symbolic name." do
+      completer = Pry::InputCompleter.build_completion_proc(Pry.binding_for(Object.new))
+      binding.pry
+      lambda{ completer.call "a.to_s." }.should.not.raise Exception
+    end
   end
 end
 

data/test/test_default_commands/test_context.rb

@@ -1,6 +1,104 @@
 require 'helper'
 
 describe "Pry::DefaultCommands::Context" do
+  describe "exit-all" do
+    it 'should break out of the repl loop of Pry instance (returning target of session)' do
+      redirect_pry_io(InputTester.new("exit-all"), StringIO.new) do
+        Pry.new.repl(0).should == 0
+      end
+    end
+
+    it 'should break out of the repl loop of Pry instance wth a user specified value' do
+      redirect_pry_io(InputTester.new("exit-all 'message'"), StringIO.new) do
+        Pry.new.repl(0).should == 'message'
+      end
+    end
+
+    it 'should break of the repl loop even if multiple bindings still on stack' do
+      ins = nil
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all 'message'"), StringIO.new) do
+        ins = Pry.new.tap { |v| v.repl(0).should == 'message' }
+      end
+    end
+
+    it 'binding_stack should be empty after breaking out of the repl loop' do
+      ins = nil
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "exit-all"), StringIO.new) do
+        ins = Pry.new.tap { |v| v.repl(0) }
+      end
+
+      ins.binding_stack.empty?.should == true
+    end
+  end
+
+  describe "exit" do
+    it 'should pop a binding with exit' do
+      b = Pry.binding_for(:outer)
+      b.eval("x = :inner")
+
+      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "exit", "$outer = self", "exit-all"), StringIO.new) do
+        b.pry
+      end
+      $inner.should == :inner
+      $outer.should == :outer
+    end
+
+    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit' do
+      Pry.start(0, :input => StringIO.new("exit")).should == 0
+    end
+
+    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with exit, and return user-given value' do
+      Pry.start(0, :input => StringIO.new("exit :john")).should == :john
+    end
+  end
+
+  describe "jump-to" do
+    it 'should jump to the proper binding index in the stack' do
+      outp = StringIO.new
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 1", "$blah = self", "exit-all"), outp) do
+        Pry.start(0)
+      end
+
+      $blah.should == 1
+    end
+
+    it 'should print error when trying to jump to a non-existent binding index' do
+      outp = StringIO.new
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 100", "exit-all"), outp) do
+        Pry.start(0)
+      end
+
+      outp.string.should =~ /Invalid nest level/
+    end
+
+    it 'should print error when trying to jump to the same binding index' do
+      outp = StringIO.new
+      redirect_pry_io(InputTester.new("cd 1", "cd 2", "jump-to 2", "exit-all"), outp) do
+        Pry.new.repl(0)
+      end
+
+      outp.string.should =~ /Already/
+    end
+  end
+
+  describe "exit-program" do
+    it 'should raise SystemExit' do
+      redirect_pry_io(InputTester.new("exit-program"), StringIO.new) do
+        lambda { Pry.new.repl(0).should == 0 }.should.raise SystemExit
+      end
+    end
+
+    it 'should exit the program with the provided value' do
+      redirect_pry_io(InputTester.new("exit-program 66"), StringIO.new) do
+        begin
+          Pry.new.repl(0)
+        rescue SystemExit => e
+          e.status.should == 66
+        end
+      end
+    end
+  end
+
   describe "cd" do
     after do
       $obj = nil
@@ -28,6 +126,10 @@ describe "Pry::DefaultCommands::Context" do
       $outer.should == :outer
     end
 
+    it 'should break out of the repl loop of Pry instance when binding_stack has only one binding with cd ..' do
+      Pry.start(0, :input => StringIO.new("cd ..")).should == 0
+    end
+
     it 'should break out to outer-most session with cd /' do
       b = Pry.binding_for(:outer)
       b.eval("x = :inner")
@@ -40,9 +142,91 @@ describe "Pry::DefaultCommands::Context" do
       $outer.should == :outer
     end
 
-    it 'should start a session on TOPLEVEL_BINDING with cd ::' do
+    it 'should break out to outer-most session with just cd (no args)' do
       b = Pry.binding_for(:outer)
+      b.eval("x = :inner")
+
+      redirect_pry_io(InputTester.new("cd x", "$inner = self;", "cd 5", "$five = self", "cd", "$outer = self", "exit-all"), StringIO.new) do
+        b.pry
+      end
+      $inner.should == :inner
+      $five.should == 5
+      $outer.should == :outer
+    end
+
+    it 'should cd into an object and its ivar using cd obj/@ivar syntax' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+
+      redirect_pry_io(InputTester.new("cd $obj/@x", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 3
+      $result[1].eval('self').should == $obj
+      $result[2].eval('self').should == 66
+    end
 
+    it 'should cd into an object and its ivar using cd obj/@ivar/ syntax (note following /)' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+
+      redirect_pry_io(InputTester.new("cd $obj/@x/", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 3
+      $result[1].eval('self').should == $obj
+      $result[2].eval('self').should == 66
+    end
+
+    it 'should cd into previous object and its local using cd ../local syntax' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+
+      redirect_pry_io(InputTester.new("cd $obj", "local = :local", "cd @x", "cd ../local", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 3
+      $result[1].eval('self').should == $obj
+      $result[2].eval('self').should == :local
+    end
+
+    it 'should cd into an object and its ivar and back again using cd obj/@ivar/.. syntax' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+
+      redirect_pry_io(InputTester.new("cd $obj/@x/..", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 2
+      $result[1].eval('self').should == $obj
+    end
+
+    it 'should cd into an object and its ivar and back and then into another ivar using cd obj/@ivar/../@y syntax' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+      $obj.instance_variable_set(:@y, 79)
+
+      redirect_pry_io(InputTester.new("cd $obj/@x/../@y", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 3
+      $result[1].eval('self').should == $obj
+      $result[2].eval('self').should == 79
+    end
+
+    it 'should cd back to top-level and then into another ivar using cd /@ivar/ syntax' do
+      $obj = Object.new
+      $obj.instance_variable_set(:@x, 66)
+      TOPLEVEL_BINDING.eval('@z = 20')
+
+      redirect_pry_io(InputTester.new("cd $obj/@x/", "cd /@z", "$result = _pry_.binding_stack.dup", "exit-all"), StringIO.new) do
+        Pry.start
+      end
+      $result.size.should == 2
+      $result[1].eval('self').should == 20
+    end
+
+    it 'should start a session on TOPLEVEL_BINDING with cd ::' do
       redirect_pry_io(InputTester.new("cd ::", "$obj = self", "exit-all"), StringIO.new) do
         5.pry
       end

data/test/test_default_commands/test_documentation.rb

@@ -10,6 +10,16 @@ describe "Pry::DefaultCommands::Documentation" do
 
       str_output.string.should =~ /sample doc/
     end
+    
+    it 'should output multiple methods\' documentation' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-doc sample_method another_sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /sample doc/
+      str_output.string.should =~ /another sample doc/
+    end
 
     it 'should output a method\'s documentation if inside method without needing to use method name' do
       $str_output = StringIO.new

data/test/test_default_commands/test_input.rb

@@ -150,19 +150,24 @@ describe "Pry::DefaultCommands::Input" do
   end
 
   describe "play" do
-    it 'should play a string of code (with no args)' do
-      redirect_pry_io(InputTester.new("play :test_string", "exit-all"), str_output = StringIO.new) do
-        pry
+    it 'should play a string variable  (with no args)' do
+      b = binding
+      b.eval('x = "\"hello\""')
+      redirect_pry_io(InputTester.new("play x", "exit-all"), str_output = StringIO.new) do
+        Pry.start b, :hooks => {}
       end
-      str_output.string.should =~ /:test_string/
+      str_output.string.should =~ /hello/
     end
 
-    it 'should play an interpolated string of code (with no args)' do
-      $obj = ":test_string_interpolated"
-      redirect_pry_io(InputTester.new('play #{$obj}', "exit-all"), str_output = StringIO.new) do
-        pry
+    it 'should play a string variable  (with no args) using --lines to select what to play' do
+      b = binding
+      b.eval('x = "\"hello\"\n\"goodbye\"\n\"love\""')
+      redirect_pry_io(InputTester.new("play x --lines 1", "exit-all"), str_output = StringIO.new) do
+        Pry.start b, :hooks => {}
       end
-      str_output.string.should =~ /:test_string_interpolated/
+      str_output.string.should =~ /hello/
+      str_output.string.should.not =~ /love/
+      str_output.string.should.not =~ /goodbye/
     end
 
     it 'should play a method with the -m switch (a single line)' do
@@ -202,8 +207,8 @@ describe "Pry::DefaultCommands::Input" do
     end
 
     before do
-      Readline::HISTORY.shift until Readline::HISTORY.empty?
-      @hist = Readline::HISTORY
+      Pry.history.clear
+      @hist = Pry.history
     end
 
     it 'should display the correct history' do

data/test/test_default_commands/test_introspection.rb

@@ -10,6 +10,16 @@ describe "Pry::DefaultCommands::Introspection" do
 
       str_output.string.should =~ /def sample/
     end
+    
+    it 'should output multiple methods\' sources' do
+      str_output = StringIO.new
+      redirect_pry_io(InputTester.new("show-method sample_method another_sample_method", "exit-all"), str_output) do
+        pry
+      end
+
+      str_output.string.should =~ /def sample/
+      str_output.string.should =~ /def another_sample/
+    end
 
     it 'should output a method\'s source with line numbers' do
       str_output = StringIO.new

data/test/test_default_commands/test_shell.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+describe "Pry::DefaultCommands::Shell" do
+  describe "cat" do
+
+    # this doesnt work so well on rbx due to differences in backtrace
+    # so we currently skip rbx until we figure out a workaround
+    if !rbx?
+      it 'cat --ex should give warning when exception is raised in repl' do
+        mock_pry("this raises error", "cat --ex").should =~ /Cannot cat exceptions raised in REPL/
+      end
+
+      it 'cat --ex should correctly display code that generated exception' do
+        mock_pry("broken_method", "cat --ex").should =~ /this method is broken/
+      end
+    end
+  end
+end