pry 0.9.5 → 0.9.6

data/test/test_exception_whitelist.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+describe "Pry.config.exception_whitelist" do
+  it 'should rescue all exceptions NOT specified on whitelist' do
+    Pry.config.exception_whitelist.include?(NameError).should == false
+    lambda { Pry.start(self, :input => StringIO.new("raise NameError\nexit"), :output => StringIO.new) }.should.not.raise NameError
+  end
+
+  it 'should NOT rescue exceptions specified on whitelist' do
+    old_whitelist = Pry.config.exception_whitelist
+    Pry.config.exception_whitelist = [NameError]
+    lambda { Pry.start(self, :input => StringIO.new("raise NameError"), :output => StringIO.new) }.should.raise NameError
+    Pry.config.exception_whitelist = old_whitelist
+  end
+end
+
+

data/test/test_input_stack.rb

@@ -0,0 +1,70 @@
+require 'helper'
+
+describe "Pry#input_stack" do
+  it 'should accept :input_stack as a config option' do
+    stack = [StringIO.new("test")]
+    Pry.new(:input_stack => stack).input_stack.should == stack
+  end
+
+  it 'should use defaults from Pry.config' do
+    Pry.config.input_stack = [StringIO.new("exit")]
+    Pry.new.input_stack.should == Pry.config.input_stack
+    Pry.config.input_stack = []
+  end
+
+  it 'should read from all input objects on stack and exit session (usingn repl)' do
+    stack = [b = StringIO.new(":cloister\nexit\n"), c = StringIO.new(":baron\n")]
+    instance = Pry.new(:input => StringIO.new(":alex\n"),
+                       :output => str_output = StringIO.new,
+                       :input_stack => stack)
+
+    instance.repl
+    str_output.string.should =~ /:alex/
+    str_output.string.should =~ /:baron/
+    str_output.string.should =~ /:cloister/
+  end
+
+  it 'input objects should be popped off stack as they are used up' do
+    stack = [StringIO.new(":cloister\n"), StringIO.new(":baron\n")]
+    instance = Pry.new(:input => StringIO.new(":alex\n"),
+                       :output => str_output = StringIO.new,
+                       :input_stack => stack)
+
+    stack.size.should == 2
+
+    instance.rep
+    str_output.string.should =~ /:alex/
+    instance.rep
+    str_output.string.should =~ /:baron/
+    stack.size.should == 1
+    instance.rep
+    str_output.string.should =~ /:cloister/
+    stack.size.should == 0
+  end
+
+  it 'should revert to Pry.config.input when it runs out of input objects in input_stack' do
+    redirect_pry_io(StringIO.new(":rimbaud\nexit\n"), StringIO.new) do
+      stack = [StringIO.new(":cloister\n"), StringIO.new(":baron\n")]
+      instance = Pry.new(:input => StringIO.new(":alex\n"),
+                         :output => str_output = StringIO.new,
+                         :input_stack => stack)
+
+      instance.repl
+      str_output.string.should =~ /:alex/
+      str_output.string.should =~ /:baron/
+      str_output.string.should =~ /:cloister/
+      str_output.string.should =~ /:rimbaud/
+    end
+  end
+
+  it 'should display error and throw(:breakout) if at end of input after using up input_stack objects' do
+    str_output = StringIO.new
+    catch(:breakout) do
+      redirect_pry_io(StringIO.new(":rimbaud\n"), str_output) do
+        Pry.new(:input_stack => [StringIO.new(":a\n"), StringIO.new(":b\n")]).repl
+      end
+    end
+    str_output.string.should =~ /Error: Pry ran out of things to read/
+  end
+
+end

data/test/test_pry.rb

@@ -1,10 +1,5 @@
 require 'helper'
 
-puts "Ruby Version #{RUBY_VERSION}"
-puts "Testing Pry #{Pry::VERSION}"
-puts "With method_source version #{MethodSource::VERSION}"
-puts "--"
-
 describe Pry do
 
   if RUBY_PLATFORM !~ /mingw/ && RUBY_PLATFORM !~ /mswin/ && RUBY_PLATFORM != 'java'
@@ -19,7 +14,6 @@ describe Pry do
 
   if RUBY_VERSION =~ /1.9/
     describe "Exotic object support" do
-
       # regression test for exotic object support
       it "Should not error when return value is a BasicObject instance" do
 
@@ -64,7 +58,7 @@ describe Pry do
         o = Object.new
         pry_tester = Pry.new(:input => StringIO.new(input_string),
                              :output => str_output,
-                             :exception_handler => proc { |_, exception| @excep = exception },
+                             :exception_handler => proc { |_, exception, _pry_| @excep = exception },
                              :print => proc {}
                              ).rep(o)
 
@@ -92,16 +86,14 @@ describe Pry do
         o.instance_variable_get(:@x).should == 10
       end
 
-      it 'should not output anything for no input' do
-        outp = StringIO.new
-
-        # note i could not use mock_pry() for this test for some
-        # reason, as i'd always get "\n" as output instead of ""
-        redirect_pry_io(StringIO.new(""), outp) do
-          Pry.new.rep(self)
+      it 'should display error and throw(:breakout) if Pry instance runs out of input' do
+        str_output = StringIO.new
+        catch(:breakout) do
+          redirect_pry_io(StringIO.new(":nothing\n"), str_output) do
+            Pry.new.repl
+          end
         end
-
-        outp.string.empty?.should == true
+        str_output.string.should =~ /Error: Pry ran out of things to read/
       end
 
       it 'should make self evaluate to the receiver of the rep session' do
@@ -146,7 +138,6 @@ describe Pry do
         str_output.string.should == ""
       end
 
-
       it 'should suppress output if input ends in a ";" (multi-line)' do
         o = Object.new
         str_output = StringIO.new
@@ -189,6 +180,19 @@ describe Pry do
       end
     end
 
+    describe "Pry#run_command" do
+      it 'should run a command in a specified context' do
+        b = Pry.binding_for(7)
+        p = Pry.new(:output => StringIO.new)
+        p.run_command("ls -m", b)
+        p.output.string.should =~ /divmod/
+      end
+
+      it 'should run a command in the context of a session' do
+        mock_pry("@session_ivar = 10", "_pry_.run_command('ls')").should =~ /@session_ivar/
+      end
+    end
+
     describe "repl" do
       describe "basic functionality" do
         it 'should set an ivar on an object and exit the repl' do
@@ -559,14 +563,14 @@ describe Pry do
 
           it 'should NOT try to interpolate pure ruby code (no commands) ' do
             str_output = StringIO.new
-            Pry.new(:input => StringIO.new('puts \'#{aggy}\''), :output => str_output).rep
+            Pry.new(:input => StringIO.new('format \'#{aggy}\''), :output => str_output).rep
             str_output.string.should.not =~ /NameError/
 
-            Pry.new(:input => StringIO.new('puts #{aggy}'), :output => str_output).rep
+            Pry.new(:input => StringIO.new('format #{aggy}'), :output => str_output).rep
             str_output.string.should.not =~ /NameError/
 
             $test_interpolation = "blah"
-            Pry.new(:input => StringIO.new('puts \'#{$test_interpolation}\''), :output => str_output).rep
+            Pry.new(:input => StringIO.new('format \'#{$test_interpolation}\''), :output => str_output).rep
 
             str_output.string.should.not =~ /blah/
             $test_interpolation = nil
@@ -1136,9 +1140,9 @@ describe Pry do
             end
 
             describe "given the 'main' object" do
-              it "returns the #inspect of main (special case)" do
+              it "returns the #to_s of main (special case)" do
                 o = TOPLEVEL_BINDING.eval('self')
-                Pry.view_clip(o, VC_MAX_LENGTH).should == o.inspect
+                Pry.view_clip(o, VC_MAX_LENGTH).should == o.to_s
               end
             end
 

data/test/test_pry_output.rb

@@ -16,7 +16,7 @@ describe Pry do
     it "should display serialization exceptions" do
       Pry.config.print = lambda { |*a| raise "catch-22" }
 
-      mock_pry("1").should =~ /output error: #<RuntimeError: catch-22>/
+      mock_pry("1").should =~ /\(pry\) output error: #<RuntimeError: catch-22>/
     end
 
     it "should catch errors serializing exceptions" do
@@ -24,7 +24,7 @@ describe Pry do
         raise Exception.new("catch-22").tap{ |e| class << e; def inspect; raise e; end; end }
       end
 
-      mock_pry("1").should =~ /output error: failed to show result/
+      mock_pry("1").should =~ /\(pry\) output error: failed to show result/
     end
   end
 
@@ -36,9 +36,5 @@ describe Pry do
     it "should not be phased by un-inspectable things" do
       mock_pry("class NastyClass; undef pretty_inspect; end", "NastyClass.new").should =~ /#<NastyClass:0x[0-9a-f]+>/
     end
-
-    it "should warn you about un-inspectable things" do
-      mock_pry("class NastyClass; undef pretty_inspect; end", "NastyClass.new").should =~ /output error: #<(NoMethodError|NameError): undefined method `pretty_inspect'/
-    end
   end
 end

metadata

@@ -1,98 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pry
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.6
   prerelease: 
-  version: 0.9.5
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70165027600780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: coderay
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70165027600780
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &70165027599520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: slop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70165027599520
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: &70165027598380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: method_source
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70165027598380
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: &70165027597600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.5
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70165027597600
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70165027596860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70165027596860
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70165027596300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70165027596300
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
-executables: 
+executables:
 - pry
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gemtest
 - .gitignore
 - .yardopts
 - CHANGELOG
 - CONTRIBUTORS
+- Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -152,7 +150,9 @@ files:
 - test/test_default_commands/test_input.rb
 - test/test_default_commands/test_introspection.rb
 - test/test_default_commands/test_shell.rb
+- test/test_exception_whitelist.rb
 - test/test_history_array.rb
+- test/test_input_stack.rb
 - test/test_pry.rb
 - test/test_pry_history.rb
 - test/test_pry_output.rb
@@ -162,32 +162,29 @@ 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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An IRB alternative and runtime developer console
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
@@ -200,7 +197,9 @@ test_files:
 - test/test_default_commands/test_input.rb
 - test/test_default_commands/test_introspection.rb
 - test/test_default_commands/test_shell.rb
+- test/test_exception_whitelist.rb
 - test/test_history_array.rb
+- test/test_input_stack.rb
 - test/test_pry.rb
 - test/test_pry_history.rb
 - test/test_pry_output.rb