pry 0.9.7.4 → 0.9.8pre2

data/test/test_indent.rb

@@ -196,6 +196,8 @@ TXT
     @indent.reset.indent("foo 'hi' if bar\n#").should == "foo 'hi' if bar\n#"
     @indent.reset.indent("foo 1 while bar\n#").should == "foo 1 while bar\n#"
     @indent.reset.indent("super if true\n#").should == "super if true\n#"
+    @indent.reset.indent("true if false\n#").should == "true if false\n#"
+    @indent.reset.indent("String if false\n#").should == "String if false\n#"
   end
 
   it "should indent cunningly disguised ifs" do

data/test/test_method.rb

@@ -287,5 +287,15 @@ describe Pry::Method do
       end
     end
   end
+
+  describe 'method_name_from_first_line' do
+    it 'should work in all simple cases' do
+      meth = Pry::Method.new(nil)
+      meth.send(:method_name_from_first_line, "def x").should == "x"
+      meth.send(:method_name_from_first_line, "def self.x").should == "x"
+      meth.send(:method_name_from_first_line, "def ClassName.x").should == "x"
+      meth.send(:method_name_from_first_line, "def obj_name.x").should == "x"
+    end
+  end
 end
 

data/test/test_pry.rb

@@ -216,11 +216,11 @@ describe Pry do
         end
       end
 
-      describe "valid_expression?" do
+      describe "complete_expression?" do
         it "should not mutate the input!" do
           clean = "puts <<-FOO\nhi\nFOO\n"
           a = clean.dup
-          Pry.new.valid_expression?(a)
+          Pry.new.complete_expression?(a)
           a.should == clean
         end
       end
@@ -491,7 +491,6 @@ describe Pry do
         end
       end
 
-
       describe "test Pry defaults" do
 
         after do
@@ -1062,8 +1061,8 @@ describe Pry do
           end
 
           describe "pry return values" do
-            it 'should return the target object' do
-              Pry.start(self, :input => StringIO.new("exit-all"), :output => Pry::NullOutput).should == self
+            it 'should return nil' do
+              Pry.start(self, :input => StringIO.new("exit-all"), :output => Pry::NullOutput).should == nil
             end
 
             it 'should return the parameter given to exit-all' do
@@ -1084,23 +1083,29 @@ describe Pry do
           end
 
           describe "prompts" do
+            before do
+              @empty_input_buffer = ""
+              @non_empty_input_buffer = "def hello"
+              @context = Pry.binding_for(0)
+            end
+
             it 'should set the prompt default, and the default should be overridable (single prompt)' do
               new_prompt = proc { "test prompt> " }
               Pry.prompt =  new_prompt
 
               Pry.new.prompt.should == Pry.prompt
-              Pry.new.select_prompt(true, 0).should == "test prompt> "
-              Pry.new.select_prompt(false, 0).should == "test prompt> "
+              Pry.new.select_prompt(@empty_input_buffer, @context).should == "test prompt> "
+              Pry.new.select_prompt(@non_empty_input_buffer, @context).should == "test prompt> "
 
               new_prompt = proc { "A" }
               pry_tester = Pry.new(:prompt => new_prompt)
               pry_tester.prompt.should == new_prompt
-              pry_tester.select_prompt(true, 0).should == "A"
-              pry_tester.select_prompt(false, 0).should == "A"
+              pry_tester.select_prompt(@empty_input_buffer, @context).should == "A"
+              pry_tester.select_prompt(@non_empty_input_buffer, @context).should == "A"
 
               Pry.new.prompt.should == Pry.prompt
-              Pry.new.select_prompt(true, 0).should == "test prompt> "
-              Pry.new.select_prompt(false, 0).should == "test prompt> "
+              Pry.new.select_prompt(@empty_input_buffer, @context).should == "test prompt> "
+              Pry.new.select_prompt(@non_empty_input_buffer, @context).should == "test prompt> "
             end
 
             it 'should set the prompt default, and the default should be overridable (multi prompt)' do
@@ -1108,18 +1113,18 @@ describe Pry do
               Pry.prompt =  new_prompt
 
               Pry.new.prompt.should == Pry.prompt
-              Pry.new.select_prompt(true, 0).should == "test prompt> "
-              Pry.new.select_prompt(false, 0).should == "test prompt* "
+              Pry.new.select_prompt(@empty_input_buffer, @context).should == "test prompt> "
+              Pry.new.select_prompt(@non_empty_input_buffer, @context).should == "test prompt* "
 
               new_prompt = [proc { "A" }, proc { "B" }]
               pry_tester = Pry.new(:prompt => new_prompt)
               pry_tester.prompt.should == new_prompt
-              pry_tester.select_prompt(true, 0).should == "A"
-              pry_tester.select_prompt(false, 0).should == "B"
+              pry_tester.select_prompt(@empty_input_buffer, @context).should == "A"
+              pry_tester.select_prompt(@non_empty_input_buffer, @context).should == "B"
 
               Pry.new.prompt.should == Pry.prompt
-              Pry.new.select_prompt(true, 0).should == "test prompt> "
-              Pry.new.select_prompt(false, 0).should == "test prompt* "
+              Pry.new.select_prompt(@empty_input_buffer, @context).should == "test prompt> "
+              Pry.new.select_prompt(@non_empty_input_buffer, @context).should == "test prompt* "
             end
 
             describe 'storing and restoring the prompt' do
@@ -1145,11 +1150,11 @@ describe Pry do
               it 'should restore overridden prompts when returning from file-mode' do
                 pry = Pry.new :input => InputTester.new('shell-mode', 'shell-mode'),
                 :prompt => [ proc { 'P>' } ] * 2
-                pry.select_prompt(true, 0).should == "P>"
+                pry.select_prompt(@empty_input_buffer, @context).should == "P>"
                 pry.re
-                pry.select_prompt(true, 0).should =~ /\Apry .* \$ \z/
+                pry.select_prompt(@empty_input_buffer, @context).should =~ /\Apry .* \$ \z/
                 pry.re
-                pry.select_prompt(true, 0).should == "P>"
+                pry.select_prompt(@empty_input_buffer, @context).should == "P>"
               end
 
               it '#pop_prompt should return the popped prompt' do
@@ -1281,10 +1286,9 @@ describe Pry do
 
           it 'should set the hooks default, and the default should be overridable' do
             Pry.input = InputTester.new("exit-all")
-            Pry.hooks = {
-              :before_session => proc { |out,_,_| out.puts "HELLO" },
-              :after_session => proc { |out,_,_| out.puts "BYE" }
-            }
+            Pry.hooks = Pry::Hooks.new.
+              add_hook(:before_session, :my_name) { |out,_,_|  out.puts "HELLO" }.
+              add_hook(:after_session, :my_name) { |out,_,_| out.puts "BYE" }
 
             str_output = StringIO.new
             Pry.new(:output => str_output).repl
@@ -1295,10 +1299,9 @@ describe Pry do
 
             str_output = StringIO.new
             Pry.new(:output => str_output,
-                    :hooks => {
-                      :before_session => proc { |out,_,_| out.puts "MORNING" },
-                      :after_session => proc { |out,_,_| out.puts "EVENING" }
-                    }
+                    :hooks => Pry::Hooks.new.
+                    add_hook( :before_session, :my_name) { |out,_,_| out.puts "MORNING" }.
+                    add_hook(:after_session, :my_name) { |out,_,_| out.puts "EVENING" }
                     ).repl
 
             str_output.string.should =~ /MORNING/
@@ -1308,9 +1311,8 @@ describe Pry do
             Pry.input.rewind
             str_output = StringIO.new
             Pry.new(:output => str_output,
-                    :hooks => {
-                      :before_session => proc { |out,_,_| out.puts "OPEN" }
-                    }
+                    :hooks => Pry::Hooks.new.
+                      add_hook(:before_session, :my_name) { |out,_,_| out.puts "OPEN" }
                     ).repl
 
             str_output.string.should =~ /OPEN/
@@ -1318,9 +1320,8 @@ describe Pry do
             Pry.input.rewind
             str_output = StringIO.new
             Pry.new(:output => str_output,
-                    :hooks => {
-                      :after_session => proc { |out,_,_| out.puts "CLOSE" }
-                    }
+                    :hooks => Pry::Hooks.new.
+                      add_hook(:after_session, :my_name) { |out,_,_| out.puts "CLOSE" }
                     ).repl
 
             str_output.string.should =~ /CLOSE/

data/test/test_pry_history.rb

@@ -2,26 +2,30 @@ require 'helper'
 require 'tempfile'
 
 describe Pry do
-
   before do
     Pry.history.clear
-    @file = Tempfile.new(["tmp", ".pry_history"])
-    @hist = @file.path
-    File.open(@hist, 'w') {|f| f << "1\n2\n3\n" }
-    @old_hist = Pry.config.history.file
-    Pry.config.history.file = @hist
+
+    @saved_history = "1\n2\n3\n"
+
+    Pry.history.loader = proc do |&blk|
+      @saved_history.lines.each { |l| blk.call(l) }
+    end
+
+    Pry.history.saver = proc do |lines|
+      @saved_history << lines.map { |l| "#{l}\n" }.join
+    end
+
     Pry.load_history
   end
 
   after do
-    @file.close
-    File.unlink(@hist)
-    Pry.config.history.file = @old_hist
+    Pry.history.clear
+    Pry.history.restore_default_behavior
   end
 
   describe ".load_history" do
     it "should read the contents of the file" do
-      Pry.history.to_a[-2..-1].should === ["2", "3"]
+      Pry.history.to_a[-2..-1].should == %w(2 3)
     end
   end
 
@@ -29,56 +33,52 @@ describe Pry do
     it "should include a trailing newline" do
       Pry.history << "4"
       Pry.save_history
-      File.read(@hist).should =~ /4\n\z/
+      @saved_history.should =~ /4\n\z/
     end
 
     it "should not change anything if history is not changed" do
-      File.open(@hist, 'w') {|f| f << "4\n5\n6\n" }
+      @saved_history = "4\n5\n6\n"
       Pry.save_history
-      File.read(@hist).should == "4\n5\n6\n"
+      @saved_history.should == "4\n5\n6\n"
     end
 
     it "should append new lines to the file" do
       Pry.history << "4"
       Pry.save_history
-      File.read(@hist).should == "1\n2\n3\n4\n"
+      @saved_history.should == "1\n2\n3\n4\n"
     end
 
     it "should not clobber lines written by other Pry's in the meantime" do
       Pry.history << "5"
-      File.open(@hist, 'a') {|f| f << "4\n" }
+      @saved_history << "4\n"
       Pry.save_history
 
       Pry.history.to_a[-3..-1].should == ["2", "3", "5"]
-      File.read(@hist).should == "1\n2\n3\n4\n5\n"
+      @saved_history.should == "1\n2\n3\n4\n5\n"
     end
 
     it "should not delete lines from the file if this session's history was cleared" do
       Pry.history.clear
       Pry.save_history
-      File.read(@hist).should == "1\n2\n3\n"
+      @saved_history.should == "1\n2\n3\n"
     end
 
     it "should save new lines that are added after the history was cleared" do
       Pry.history.clear
       Pry.history << "4"
-
-      # doing this twice as libedit on 1.8.7 has bugs and sometimes ignores the
-      # first line in history
-      Pry.history << "4"
       Pry.save_history
-      File.read(@hist).should =~ /1\n2\n3\n4\n/
+      @saved_history.should =~ /1\n2\n3\n4\n/
     end
 
     it "should only append new lines the second time it is saved" do
       Pry.history << "4"
       Pry.save_history
-      File.open(@hist, 'a') {|f| f << "5\n" }
+      @saved_history << "5\n"
       Pry.history << "6"
       Pry.save_history
 
       Pry.history.to_a[-4..-1].should == ["2", "3", "4", "6"]
-      File.read(@hist).should == "1\n2\n3\n4\n5\n6\n"
+      @saved_history.should == "1\n2\n3\n4\n5\n6\n"
     end
   end
 end

data/test/test_syntax_checking.rb

@@ -0,0 +1,47 @@
+require 'helper'
+describe Pry do
+
+  [
+    ["p = '", "'"],
+    ["def", "a", "(); end"],
+    ["p = <<FOO", "lots", "and", "lots of", "foo", "FOO"],
+    ["[", ":lets,", "'list',", "[/nested/", "], things ]"],
+    ["abc =~ /hello", "/"],
+    ["issue = %W/", "343/"],
+    ["pouts(<<HI, 'foo", "bar", "HI", "baz')"],
+  ].each do |foo|
+    it "should not raise an error on broken lines: #{foo.join("\\n")}" do
+      output = StringIO.new
+      redirect_pry_io(InputTester.new(*foo), output) do
+        Pry.start
+      end
+
+      output.string.should.not =~ /SyntaxError/
+    end
+  end
+
+  [
+    ["end"],
+    ["puts )("],
+    ["1 1"],
+    ["puts :"],
+    # in this case the syntax error is "expecting ')'".
+    ((defined? RUBY_ENGINE && RUBY_ENGINE == "rbx") ? nil : ["def", "method(1"])
+  ].compact.each do |foo|
+    it "should raise an error on invalid syntax like #{foo.inspect}" do
+      output = StringIO.new
+      redirect_pry_io(InputTester.new(*foo), output) do
+        Pry.start
+      end
+      output.string.should =~ /SyntaxError/
+    end
+  end
+
+  it "should not intefere with syntax errors explicitly raised" do
+    output = StringIO.new
+    redirect_pry_io(InputTester.new(%q{raise SyntaxError, "unexpected $end"}), output) do
+      Pry.start
+    end
+    output.string.should =~ /SyntaxError/
+  end
+end

data/test/test_wrapped_module.rb

@@ -0,0 +1,71 @@
+require 'helper'
+
+describe Pry::WrappedModule do
+
+  describe "#initialize" do
+    it "should raise an exception when a non-module is passed" do
+      lambda{ Pry::WrappedModule.new(nil) }.should.raise ArgumentError
+    end
+  end
+
+  describe ".method_prefix" do
+    before do
+      Foo = Class.new
+      @foo = Foo.new
+    end
+
+    after do
+      Object.remove_const(:Foo)
+    end
+
+    it "should return Foo# for normal classes" do
+      Pry::WrappedModule.new(Foo).method_prefix.should == "Foo#"
+    end
+
+    it "should return Bar# for modules" do
+      Pry::WrappedModule.new(Kernel).method_prefix.should == "Kernel#"
+    end
+
+    it "should return Foo. for singleton classes of classes" do
+      Pry::WrappedModule.new(class << Foo; self; end).method_prefix.should == "Foo."
+    end
+
+    describe "of singleton classes of objects" do
+      Pry::WrappedModule.new(class << @foo; self; end).method_prefix.should == "self."
+    end
+
+    describe "of anonymous classes should not be empty" do
+      Pry::WrappedModule.new(Class.new).method_prefix.should =~ /#<Class:.*>#/
+    end
+
+    describe "of singleton classes of anonymous classes should not be empty" do
+      Pry::WrappedModule.new(class << Class.new; self; end).method_prefix.should =~ /#<Class:.*>./
+    end
+  end
+
+  describe ".singleton_class?" do
+    it "should be true for singleton classes" do
+      Pry::WrappedModule.new(class << ""; self; end).singleton_class?.should == true
+    end
+
+    it "should be false for normal classes" do
+      Pry::WrappedModule.new(Class.new).singleton_class?.should == false
+    end
+
+    it "should be false for modules" do
+      Pry::WrappedModule.new(Module.new).singleton_class?.should == false
+    end
+  end
+
+  describe ".singleton_instance" do
+    it "should raise an exception when called on a non-singleton-class" do
+      lambda{ Pry::WrappedModule.new(Class).singleton_instance }.should.raise ArgumentError
+    end
+
+    it "should return the attached object" do
+      Pry::WrappedModule.new(class << "hi"; self; end).singleton_instance.should == "hi"
+      Pry::WrappedModule.new(class << Object; self; end).singleton_instance.should.equal?(Object)
+    end
+  end
+end
+

metadata

@@ -1,85 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.7.4
-  prerelease: 
+  version: 0.9.8pre2
+  prerelease: 5
 platform: ruby
 authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-12-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby_parser
-  requirement: &70358296218720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70358296218720
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70358296218040 !ruby/object:Gem::Requirement
+  requirement: &70272200153380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70358296218040
+  version_requirements: *70272200153380
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70358296217040 !ruby/object:Gem::Requirement
+  requirement: &70272200152100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70358296217040
+  version_requirements: *70272200152100
 - !ruby/object:Gem::Dependency
   name: method_source
-  requirement: &70358296216480 !ruby/object:Gem::Requirement
+  requirement: &70272200150660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70358296216480
+  version_requirements: *70272200150660
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70358296215860 !ruby/object:Gem::Requirement
+  requirement: &70272200147760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70358296215860
+  version_requirements: *70272200147760
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70358296215360 !ruby/object:Gem::Requirement
+  requirement: &70272200138920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70358296215360
+  version_requirements: *70272200138920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70358296214740 !ruby/object:Gem::Requirement
+  requirement: &70272200136900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +79,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70358296214740
+  version_requirements: *70272200136900
 description: An IRB alternative and runtime developer console
 email: jrmair@gmail.com
 executables:
@@ -120,6 +112,7 @@ files:
 - examples/example_prompt.rb
 - examples/helper.rb
 - lib/pry.rb
+- lib/pry/cli.rb
 - lib/pry/command_context.rb
 - lib/pry/command_processor.rb
 - lib/pry/command_set.rb
@@ -146,6 +139,7 @@ files:
 - lib/pry/helpers/text.rb
 - lib/pry/history.rb
 - lib/pry/history_array.rb
+- lib/pry/hooks.rb
 - lib/pry/indent.rb
 - lib/pry/method.rb
 - lib/pry/plugins.rb
@@ -154,8 +148,13 @@ files:
 - lib/pry/rbx_method.rb
 - lib/pry/rbx_path.rb
 - lib/pry/version.rb
+- lib/pry/wrapped_module.rb
+- man/pry.1
+- man/pry.1.html
+- man/pry.1.ronn
 - pry.gemspec
 - test/helper.rb
+- test/test_cli.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
 - test/test_command_set.rb
@@ -170,6 +169,7 @@ files:
 - test/test_default_commands/test_shell.rb
 - test/test_exception_whitelist.rb
 - test/test_history_array.rb
+- test/test_hooks.rb
 - test/test_indent.rb
 - test/test_input_stack.rb
 - test/test_method.rb
@@ -177,6 +177,8 @@ files:
 - test/test_pry_history.rb
 - test/test_pry_output.rb
 - test/test_special_locals.rb
+- test/test_syntax_checking.rb
+- test/test_wrapped_module.rb
 - test/testrc
 - test/testrcbad
 - wiki/Customizing-pry.md
@@ -196,9 +198,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -207,6 +209,7 @@ specification_version: 3
 summary: An IRB alternative and runtime developer console
 test_files:
 - test/helper.rb
+- test/test_cli.rb
 - test/test_command_helpers.rb
 - test/test_command_processor.rb
 - test/test_command_set.rb
@@ -221,6 +224,7 @@ test_files:
 - test/test_default_commands/test_shell.rb
 - test/test_exception_whitelist.rb
 - test/test_history_array.rb
+- test/test_hooks.rb
 - test/test_indent.rb
 - test/test_input_stack.rb
 - test/test_method.rb
@@ -228,5 +232,7 @@ test_files:
 - test/test_pry_history.rb
 - test/test_pry_output.rb
 - test/test_special_locals.rb
+- test/test_syntax_checking.rb
+- test/test_wrapped_module.rb
 - test/testrc
 - test/testrcbad