pry 0.9.8pre2 → 0.9.8pre3

data/test/test_completion.rb

@@ -16,7 +16,7 @@ describe Pry::InputCompleter do
   end
 
   # another jruby hack :((
-  if !jruby?
+  if !Pry::Helpers::BaseHelpers.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))
       lambda{ completer.call "a.to_s." }.should.not.raise Exception

data/test/test_default_commands.rb

@@ -7,8 +7,7 @@ describe "Pry::Commands" do
       redirect_pry_io(InputTester.new("help ls", "exit-all"), str_output) do
         pry
       end
-      str_output.string.each_line.count.should == 1
-      str_output.string.should =~ /ls --help/
+      str_output.string.should =~ /Usage: ls/
     end
 
     it 'should display help for a regex command with a "listing"' do

data/test/test_default_commands/test_introspection.rb

@@ -53,7 +53,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
           mock_pry("edit #{path}", "$rand").should =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should not reload the file if it is not a ruby file" do
@@ -62,7 +62,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
           mock_pry("edit #{path}", "$rand").should.not =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should not reload a ruby file if -n is given" do
@@ -71,7 +71,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
           mock_pry("edit -n #{path}", "$rand").should.not =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
 
         it "should reload a non-ruby file if -r is given" do
@@ -80,7 +80,7 @@ describe "Pry::DefaultCommands::Introspection" do
 
           mock_pry("edit -r #{path}", "$rand").should =~ /#{@rand}/
 
-          tf.close
+          tf.close(true)
         end
       end
     end
@@ -93,7 +93,7 @@ describe "Pry::DefaultCommands::Introspection" do
         @tf.flush
       end
       after do
-        @tf.close
+        @tf.close(true)
         File.unlink("#{@path}c") if File.exists?("#{@path}c") #rbx
       end
       it "should open the correct file" do
@@ -455,7 +455,7 @@ describe "Pry::DefaultCommands::Introspection" do
       end
 
       after do
-        @tempfile.close
+        @tempfile.close(true)
       end
 
       describe 'without -p' do

data/test/test_default_commands/test_ls.rb

@@ -92,7 +92,7 @@ describe "ls" do
   describe "when no arguments given" do
     describe "when at the top-level" do
       # rubinius has a bug that means local_variables of "main" aren't reported inside eval()
-      unless defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+      unless Pry::Helpers::BaseHelpers.rbx?
         it "should show local variables" do
           mock_pry("ls").should =~ /_pry_/
           mock_pry("arbitrar = 1", "ls").should =~ /arbitrar/

data/test/test_default_commands/test_shell.rb

@@ -47,7 +47,7 @@ describe "Pry::DefaultCommands::Shell" do
     # this doesnt work so well on rbx due to differences in backtrace
     # so we currently skip rbx until we figure out a workaround
     describe "with --ex" do
-      if !rbx?
+      if !Pry::Helpers::BaseHelpers.rbx?
         it 'cat --ex should correctly display code that generated exception even if raised in repl' do
           mock_pry("this raises error", "cat --ex").should =~ /\d+:(\s*) this raises error/
         end
@@ -140,7 +140,9 @@ describe "Pry::DefaultCommands::Shell" do
         pry_instance.rep(self)
         str_output.string.should =~ /bt number 0/
 
-        temp_files.each(&:close)
+        temp_files.each do |file|
+          file.close(true)
+        end
       end
 
     end

data/test/test_hooks.rb

@@ -172,4 +172,20 @@ describe Pry::Hooks do
       @hooks.exec_hook(:test_hook).should == 3
     end
   end
+
+  describe "integration tests" do
+    describe "when_started hook" do
+      it 'should yield options to the hook' do
+        options = nil
+        Pry.config.hooks.add_hook(:when_started, :test_hook) { |_, opt, _| options = opt }
+
+        redirect_pry_io(StringIO.new("exit"), out=StringIO.new) do
+          Pry.start binding, :hello => :baby
+        end
+        options[:hello].should == :baby
+
+        Pry.config.hooks.delete_hook(:when_started, :test_hook)
+      end
+    end
+  end
 end

data/test/test_method.rb

@@ -74,6 +74,56 @@ describe Pry::Method do
     end
   end
 
+  describe '.from_binding' do
+    it 'should be able to pick a method out of a binding' do
+      Pry::Method.from_binding(Class.new{ def self.foo; binding; end }.foo).name.should == "foo"
+    end
+
+    it 'should NOT find a method from the special pry bindings' do
+      Pry::Method.from_binding(5.__binding__).should == nil
+    end
+
+    it 'should NOT find a method from the toplevel binding' do
+      Pry::Method.from_binding(TOPLEVEL_BINDING).should == nil
+    end
+
+    it "should find methods that have been undef'd" do
+      m = Pry::Method.from_binding(Class.new do
+        def self.bar
+          class << self; undef bar; end
+          binding
+        end
+      end.bar)
+      m.name.should == "bar"
+    end
+
+    # Our source_location trick doesn't work, due to https://github.com/rubinius/rubinius/issues/953
+    unless Pry::Helpers::BaseHelpers.rbx?
+      it 'should find the super method correctly' do
+        a = Class.new{ def gag; binding; end; def self.line; __LINE__; end }
+        b = Class.new(a){ def gag; super; end }
+
+        g = b.new.gag
+        m = Pry::Method.from_binding(g)
+
+        m.owner.should == a
+        m.source_line.should == a.line
+        m.name.should == "gag"
+      end
+    end
+
+    it 'should find the right method if a super method exists' do
+      a = Class.new{ def gag; binding; end; }
+      b = Class.new(a){ def gag; super; binding; end; def self.line; __LINE__; end }
+
+      m = Pry::Method.from_binding(b.new.gag)
+
+      m.owner.should == b
+      m.source_line.should == b.line
+      m.name.should == "gag"
+    end
+  end
+
   describe 'all_from_class' do
     def should_find_method(name)
       Pry::Method.all_from_class(@class).map(&:name).should.include(name)

data/test/test_pry.rb

@@ -2,16 +2,6 @@ require 'helper'
 
 describe Pry do
 
-  # if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/ && RUBY_PLATFORM != 'java'
-  #   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
-  # end
-
   if RUBY_VERSION =~ /1.9/
     describe "Exotic object support" do
       # regression test for exotic object support
@@ -53,7 +43,7 @@ describe Pry do
 
       # bug fix for https://github.com/banister/pry/issues/93
       it 'should not leak pry constants into Object namespace' do
-        input_string = "CommandContext"
+        input_string = "Command"
         str_output = StringIO.new
         o = Object.new
         pry_tester = Pry.new(:input => StringIO.new(input_string),
@@ -792,7 +782,7 @@ describe Pry do
             str_output = StringIO.new
             Pry.new(:input => StringIO.new("hello\n"), :output => str_output, :commands => klass).rep
             str_output.string.should =~ /nil/
-            str_output.string.should =~ /=>/
+                str_output.string.should =~ /=>/
           end
 
           it 'should define a command that keeps its return value but does not return when value is void' do
@@ -806,7 +796,7 @@ describe Pry do
             str_output.string.empty?.should == true
           end
 
-          it 'a command (with :keep_retval => false) that replaces eval_string with a valid expression should not have the expression value suppressed' do
+         it 'a command (with :keep_retval => false) that replaces eval_string with a valid expression should not have the expression value suppressed' do
             klass = Pry::CommandSet.new do
               command "hello", "" do
                 eval_string.replace("6")
@@ -818,45 +808,45 @@ describe Pry do
             end
 
 
-          it 'a command (with :keep_retval => true) that replaces eval_string with a valid expression should overwrite the eval_string with the return value' do
-            klass = Pry::CommandSet.new do
-              command "hello", "", :keep_retval => true do
+            it 'a command (with :keep_retval => true) that replaces eval_string with a valid expression should overwrite the eval_string with the return value' do
+              klass = Pry::CommandSet.new do
+                command "hello", "", :keep_retval => true do
                   eval_string.replace("6")
                   7
+                end
               end
-            end
-            str_output = StringIO.new
-            Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+              str_output = StringIO.new
+              Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
               str_output.string.should =~ /7/
               str_output.string.should.not =~ /6/
             end
 
-          it 'a command that return a value in a multi-line expression should clear the expression and return the value' do
-            klass = Pry::CommandSet.new do
-              command "hello", "", :keep_retval => true do
-                5
+            it 'a command that return a value in a multi-line expression should clear the expression and return the value' do
+              klass = Pry::CommandSet.new do
+                command "hello", "", :keep_retval => true do
+                  5
+                end
               end
+              str_output = StringIO.new
+              Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
+              str_output.string.should =~ /5/
             end
-            str_output = StringIO.new
-            Pry.new(:input => StringIO.new("def yo\nhello\n"), :output => str_output, :commands => klass).rep
-            str_output.string.should =~ /5/
-          end
 
 
-          it 'should set the commands default, and the default should be overridable' do
-            klass = Pry::CommandSet.new do
-              command "hello" do
-                output.puts "hello world"
+            it 'should set the commands default, and the default should be overridable' do
+              klass = Pry::CommandSet.new do
+                command "hello" do
+                  output.puts "hello world"
+                end
               end
-            end
 
-            Pry.commands = klass
+              Pry.commands = klass
 
-            str_output = StringIO.new
-            Pry.new(:input => InputTester.new("hello"), :output => str_output).rep
-            str_output.string.should =~ /hello world/
+              str_output = StringIO.new
+              Pry.new(:input => InputTester.new("hello"), :output => str_output).rep
+              str_output.string.should =~ /hello world/
 
-                other_klass = Pry::CommandSet.new do
+              other_klass = Pry::CommandSet.new do
                 command "goodbye", "" do
                   output.puts "goodbye world"
                 end
@@ -1312,7 +1302,7 @@ describe Pry do
             str_output = StringIO.new
             Pry.new(:output => str_output,
                     :hooks => Pry::Hooks.new.
-                      add_hook(:before_session, :my_name) { |out,_,_| out.puts "OPEN" }
+                    add_hook(:before_session, :my_name) { |out,_,_| out.puts "OPEN" }
                     ).repl
 
             str_output.string.should =~ /OPEN/
@@ -1321,7 +1311,7 @@ describe Pry do
             str_output = StringIO.new
             Pry.new(:output => str_output,
                     :hooks => Pry::Hooks.new.
-                      add_hook(:after_session, :my_name) { |out,_,_| out.puts "CLOSE" }
+                    add_hook(:after_session, :my_name) { |out,_,_| out.puts "CLOSE" }
                     ).repl
 
             str_output.string.should =~ /CLOSE/
@@ -1332,4 +1322,12 @@ describe Pry do
         end
       end
     end
+
+    describe 'setting custom options' do
+      it 'should not raise for unrecognized options' do
+        should.not.raise?(NoMethodError) {
+          instance = Pry.new(:custom_option => 'custom value')
+        }
+      end
+    end
   end

data/test/test_syntax_checking.rb

@@ -26,7 +26,7 @@ describe Pry do
     ["1 1"],
     ["puts :"],
     # in this case the syntax error is "expecting ')'".
-    ((defined? RUBY_ENGINE && RUBY_ENGINE == "rbx") ? nil : ["def", "method(1"])
+    (Pry::Helpers::BaseHelpers.rbx? ? nil : ["def", "method(1"])
   ].compact.each do |foo|
     it "should raise an error on invalid syntax like #{foo.inspect}" do
       output = StringIO.new

metadata

@@ -1,92 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pry
-version: !ruby/object:Gem::Version
-  version: 0.9.8pre2
+version: !ruby/object:Gem::Version 
   prerelease: 5
+  version: 0.9.8pre3
 platform: ruby
-authors:
+authors: 
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: coderay
-  requirement: &70272200153380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
   type: :runtime
-  prerelease: false
-  version_requirements: *70272200153380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: slop
-  requirement: &70272200152100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.4.1
     - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+      - !ruby/object:Gem::Version 
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70272200152100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: method_source
-  requirement: &70272200150660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        version: "0.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *70272200150660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bacon
-  requirement: &70272200147760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        version: "1.1"
   type: :development
-  prerelease: false
-  version_requirements: *70272200147760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: open4
-  requirement: &70272200138920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
-  prerelease: false
-  version_requirements: *70272200138920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70272200136900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *70272200136900
+  version_requirements: *id006
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
-executables:
+executables: 
 - pry
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gemtest
 - .gitignore
@@ -113,8 +116,7 @@ files:
 - examples/helper.rb
 - lib/pry.rb
 - lib/pry/cli.rb
-- lib/pry/command_context.rb
-- lib/pry/command_processor.rb
+- lib/pry/command.rb
 - lib/pry/command_set.rb
 - lib/pry/commands.rb
 - lib/pry/completion.rb
@@ -155,8 +157,8 @@ files:
 - pry.gemspec
 - test/helper.rb
 - test/test_cli.rb
+- test/test_command.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
@@ -185,33 +187,36 @@ files:
 - wiki/Home.md
 homepage: http://pry.github.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console
-test_files:
+test_files: 
 - test/helper.rb
 - test/test_cli.rb
+- test/test_command.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