pry 0.9.11.4 → 0.9.12pre1

data/spec/commands/ls_spec.rb

@@ -93,6 +93,10 @@ describe "ls" do
         "ls Module.new{ def shinanagarns; 4; end; public :shinanagarns }")
       output.should =~ /shinanagarns/
     end
+
+    it "should behave normally when invoked on Module itself" do
+      pry_eval("ls Module").should.not =~ /Pry/
+    end
   end
 
   describe "constants" do

data/spec/commands/show_doc_spec.rb

@@ -279,34 +279,34 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
 
       # FIXME: THis is nto a good spec anyway, because i dont think it
       # SHOULD skip!
-      # describe "should skip over broken modules" do
-      #   before do
-      #     module TestHost
-      #       # hello
-      #       module M
-      #         binding.eval("def a; end", "dummy.rb", 1)
-      #         binding.eval("def b; end", "dummy.rb", 2)
-      #         binding.eval("def c; end", "dummy.rb", 3)
-      #       end
-
-      #       # goodbye
-      #       module M
-      #         def d; end
-      #         def e; end
-      #       end
-      #     end
-      #   end
-
-      #   after do
-      #     Object.remove_const(:TestHost)
-      #   end
-
-      #   it 'should return doc for first valid module' do
-      #     result = pry_eval("show-doc TestHost::M")
-      #     result.should =~ /goodbye/
-      #     result.should.not =~ /hello/
-      #   end
-      # end
+      describe "should skip over broken modules" do
+        before do
+          module TestHost
+            # hello
+            module M
+              binding.eval("def a; end", "dummy.rb", 1)
+              binding.eval("def b; end", "dummy.rb", 2)
+              binding.eval("def c; end", "dummy.rb", 3)
+            end
+
+            # goodbye
+            module M
+              def d; end
+              def e; end
+            end
+          end
+        end
+
+        after do
+          Object.remove_const(:TestHost)
+        end
+
+        it 'should return doc for first valid module' do
+          result = pry_eval("show-doc TestHost::M")
+          result.should =~ /goodbye/
+          result.should.not =~ /hello/
+        end
+      end
     end
 
     describe "on commands" do

data/spec/commands/show_source_spec.rb

@@ -491,7 +491,7 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
             proc {
               pry_eval(TestHost::C, 'show-source')
             }.should.raise(Pry::CommandError).
-              message.should =~ /Cannot find a definition for/
+              message.should =~ /Couldn't locate/
           end
 
           it 'should display method code (rather than class) if Pry started inside method binding' do
@@ -535,14 +535,11 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
               Object.remove_const(:BabyDuck)
             end
 
-            # TODO: !!! This is a bad spec, should not be expected behaviour?!?!
-            #
-            # it 'should return source for first valid module' do
-            #   out = pry_eval('show-source BabyDuck::Muesli')
-            #   out.should =~ /def d; end/
-            #   out.should.not =~ /def a; end/
-            # end
-
+            it 'should return source for first valid module' do
+              out = pry_eval('show-source BabyDuck::Muesli')
+              out.should =~ /def d; end/
+              out.should.not =~ /def a; end/
+            end
           end
         end
       end
@@ -560,28 +557,79 @@ if !PryTestHelpers.mri18_and_no_real_source_location?
         Pry.config.commands = @oldset
       end
 
-      it 'should show source for an ordinary command' do
-        @set.command "foo", :body_of_foo do; end
+      describe "block commands" do
+        it 'should show source for an ordinary command' do
+          @set.command "foo", :body_of_foo do; end
 
-        pry_eval('show-source foo').should =~ /:body_of_foo/
-      end
+          pry_eval('show-source foo').should =~ /:body_of_foo/
+        end
+
+        it "should output source of commands using special characters" do
+          @set.command "!%$", "I gots the yellow fever" do; end
+
+          pry_eval('show-source !%$').should =~ /yellow fever/
+        end
 
-      it "should output source of commands using special characters" do
-        @set.command "!%$", "I gots the yellow fever" do; end
+        it 'should show source for a command with spaces in its name' do
+          @set.command "foo bar", :body_of_foo_bar do; end
 
-        pry_eval('show-source !%$').should =~ /yellow fever/
+          pry_eval('show-source foo bar').should =~ /:body_of_foo_bar/
+        end
+
+        it 'should show source for a command by listing name' do
+          @set.command /foo(.*)/, :body_of_foo_bar_regex, :listing => "bar" do; end
+
+          pry_eval('show-source bar').should =~ /:body_of_foo_bar_regex/
+        end
       end
 
-      it 'should show source for a command with spaces in its name' do
-        @set.command "foo bar", :body_of_foo_bar do; end
+      describe "create_command commands" do
+        it 'should show source for a command' do
+          @set.create_command "foo", "babble" do
+            def process() :body_of_foo end
+          end
+          pry_eval('show-source foo').should =~ /:body_of_foo/
+        end
 
-        pry_eval('show-source foo bar').should =~ /:body_of_foo_bar/
+        it 'should show source for a command defined inside pry' do
+          pry_eval %{
+            _pry_.commands.create_command "foo", "babble" do
+              def process() :body_of_foo end
+            end
+          }
+          pry_eval('show-source foo').should =~ /:body_of_foo/
+        end
       end
 
-      it 'should show source for a command by listing name' do
-        @set.command /foo(.*)/, :body_of_foo_bar_regex, :listing => "bar" do; end
+      describe "real class-based commands" do
+        before do
+          class ::TemporaryCommand < Pry::ClassCommand
+            match 'temp-command'
+            def process() :body_of_temp end
+          end
 
-        pry_eval('show-source bar').should =~ /:body_of_foo_bar_regex/
+          Pry.commands.add_command(::TemporaryCommand)
+        end
+
+        after do
+          Object.remove_const(:TemporaryCommand)
+        end
+
+        it 'should show source for a command' do
+          pry_eval('show-source temp-command').should =~ /:body_of_temp/
+        end
+
+        it 'should show source for a command defined inside pry' do
+          pry_eval %{
+            class ::TemporaryCommandInPry < Pry::ClassCommand
+              match 'temp-command-in-pry'
+              def process() :body_of_temp end
+            end
+          }
+          Pry.commands.add_command(::TemporaryCommandInPry)
+          pry_eval('show-source temp-command-in-pry').should =~ /:body_of_temp/
+          Object.remove_const(:TemporaryCommandInPry)
+        end
       end
     end
 

data/spec/commands/whereami_spec.rb

@@ -63,7 +63,6 @@ describe "whereami" do
     end
 
     Cor.instance_method(:blimey!).source.should =~ /pry_eval/
-
     Cor.new.blimey!.should =~ /Cor#blimey!.*Look at me/m
     Object.remove_const(:Cor)
   end
@@ -85,26 +84,76 @@ describe "whereami" do
     Object.remove_const(:Cor)
   end
 
-  it 'should display a description and and error if reading the file goes wrong' do
+  # Now that we use stagger_output (paging output) we no longer get
+  # the "From: " line, as we output everything in one go (not separate output.puts)
+  # and so the user just gets a single `Error: Cannot open
+  # "not.found.file.erb" for reading.`
+  # which is good enough IMO. Unfortunately we can't test for it
+  # though, as we don't hook stdout.
+  #
+  # it 'should display a description and error if reading the file goes wrong' do
+  #   class Cor
+  #     def blimey!
+  #       eval <<-END, binding, "not.found.file.erb", 7
+  #         Pad.tester = pry_tester(binding)
+  #         Pad.tester.eval('whereami')
+  #       END
+  #     end
+  #   end
+
+  #   proc { Cor.new.blimey! }.should.raise(MethodSource::SourceNotFoundError)
+
+  #   Pad.tester.last_output.should =~
+  #     /From: not.found.file.erb @ line 7 Cor#blimey!:/
+  #   Object.remove_const(:Cor)
+  # end
+
+  it 'should show code window (not just method source) if parameter passed to whereami' do
     class Cor
       def blimey!
-        eval <<-END, binding, "not.found.file.erb", 7
-          Pad.tester = pry_tester(binding)
-          Pad.tester.eval('whereami')
-        END
+        pry_eval(binding, 'whereami 3').should =~ /class Cor/
+      end
+    end
+    Cor.new.blimey!
+    Object.remove_const(:Cor)
+  end
+
+  it 'should show entire method when -m option used' do
+    old_size, Pry.config.default_window_size = Pry.config.default_window_size, 1
+    old_cutoff, Pry::Command::Whereami.method_size_cutoff = Pry::Command::Whereami.method_size_cutoff, 1
+    class Cor
+      def blimey!
+        1
+        2
+        pry_eval(binding, 'whereami -m').should =~ /def blimey/
       end
     end
+    Pry::Command::Whereami.method_size_cutoff, Pry.config.default_window_size = old_cutoff, old_size
+    Cor.new.blimey!
+    Object.remove_const(:Cor)
+  end
 
-    proc { Cor.new.blimey! }.should.raise(MethodSource::SourceNotFoundError)
-    Pad.tester.last_output.should =~
-      /From: not.found.file.erb @ line 7 Cor#blimey!:/
+  it 'should show entire file when -f option used' do
+    class Cor
+      def blimey!
+        1
+        2
+        pry_eval(binding, 'whereami -f').should =~ /show entire file when -f option used/
+      end
+    end
+    Cor.new.blimey!
     Object.remove_const(:Cor)
   end
 
-  it 'should show code window (not just method source) if parameter passed to whereami' do
+  it 'should show class when -c option used, and locate correct candidate' do
+    require 'fixtures/whereami_helper'
     class Cor
       def blimey!
-        pry_eval(binding, 'whereami 3').should =~ /class Cor/
+        1
+        2
+        out = pry_eval(binding, 'whereami -c')
+        out.should =~ /class Cor/
+        out.should =~ /blimey/
       end
     end
     Cor.new.blimey!

data/spec/documentation_helper_spec.rb

@@ -0,0 +1,73 @@
+require 'helper'
+
+describe Pry::Helpers::DocumentationHelpers do
+  before do
+    @helper = Pry::Helpers::DocumentationHelpers
+  end
+
+  describe "get_comment_content" do
+    it "should strip off the hash and unindent" do
+      @helper.get_comment_content(" # hello\n # world\n").should == "hello\nworld\n"
+    end
+
+    it "should strip out leading lines of hashes" do
+      @helper.get_comment_content("###############\n#hello\n#world\n").should == "hello\nworld\n"
+    end
+
+    it "should remove shebangs" do
+      @helper.get_comment_content("#!/usr/bin/env ruby\n# This is a program\n").should == "This is a program\n"
+    end
+
+    it "should unindent past separators" do
+      @helper.get_comment_content(" # Copyright Me <me@cirw.in>\n #--\n # So there.\n").should == "Copyright Me <me@cirw.in>\n--\nSo there.\n"
+    end
+  end
+
+  describe "process_rdoc" do
+    before do
+      Pry.color = true
+    end
+
+    after do
+      Pry.color = false
+    end
+
+    it "should syntax highlight indented code" do
+      @helper.process_rdoc("  4 + 4\n").should.not == "  4 + 4\n"
+    end
+
+    it "should highlight words surrounded by +s" do
+      @helper.process_rdoc("the +parameter+").should =~ /the \e.*parameter\e.*/
+    end
+
+    it "should syntax highlight things in backticks" do
+      @helper.process_rdoc("for `Example`").should =~ /for `\e.*Example\e.*`/
+    end
+
+    it "should emphasise em tags" do
+      @helper.process_rdoc("for <em>science</em>").should == "for \e[1mscience\e[0m"
+    end
+
+    it "should emphasise italic tags" do
+      @helper.process_rdoc("for <i>science</i>").should == "for \e[1mscience\e[0m"
+    end
+
+    it "should syntax highlight code in <code>" do
+      @helper.process_rdoc("for <code>Example</code>").should =~ /for \e.*Example\e.*/
+    end
+
+    it "should not double-highlight backticks inside indented code" do
+      @helper.process_rdoc("  `echo 5`").should =~ /echo 5/
+    end
+
+    it "should not remove ++" do
+      @helper.process_rdoc("--\n  comment in a bubble\n++").should =~ /\+\+/
+    end
+
+    it "should do nothing if Pry.color is false" do
+      Pry.color = false
+      @helper.process_rdoc("  4 + 4\n").should == "  4 + 4\n"
+    end
+  end
+
+end

data/spec/fixtures/whereami_helper.rb

@@ -0,0 +1,6 @@
+class Cor
+  def a; end
+  def b; end
+  def c; end
+  def d; end
+end

data/spec/helpers/table_spec.rb

@@ -80,6 +80,25 @@ asfadsssaaad    fasfaafdssd     s
     end
   end
 
+  describe 'line length is smaller than the length of the longest word' do
+    before do
+      element = 'swizzle'
+      @elem_len = element.length
+      @out = [element, 'crime', 'fun']
+    end
+
+    it 'should not raise error' do
+      should.not.raise(FloatDomainError) {
+        Pry::Helpers.tablify(@out, @elem_len - 1)
+      }
+    end
+
+    it 'should format output as one column' do
+      table = Pry::Helpers.tablify(@out, @elem_len - 1).to_s
+      table.should == "swizzle\ncrime  \nfun    "
+    end
+  end
+
   describe 'decide between one-line or indented output' do
     Pry::Helpers.tablify_or_one_line('head', %w(ing)).should == 'head:  ing'
   end

data/spec/method_spec.rb

@@ -95,27 +95,29 @@ describe Pry::Method do
     end
 
     it "should find methods that have been undef'd" do
-      m = Pry::Method.from_binding(Class.new do
+      c = Class.new do
         def self.bar
           class << self; undef bar; end
           binding
         end
-      end.bar)
+      end
+
+      m = Pry::Method.from_binding(c.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 }
+       it 'should find the super method correctly' do
+        a = Class.new{ def gag33; binding; end; def self.line; __LINE__; end }
+        b = Class.new(a){ def gag33; super; end }
 
-        g = b.new.gag
+        g = b.new.gag33
         m = Pry::Method.from_binding(g)
 
         m.owner.should == a
         m.source_line.should == a.line
-        m.name.should == "gag"
+        m.name.should == "gag33"
       end
     end
 
@@ -140,6 +142,21 @@ describe Pry::Method do
         m.source_line.should == a.line
       end
     end
+
+    it 'should find the right method even if it was renamed and replaced' do
+      o = Object.new
+      class << o
+        def borscht
+          "nips"
+          binding
+        end
+        alias paella borscht
+        def borscht() paella end
+      end
+
+      m = Pry::Method.from_binding(o.borscht)
+      m.source.should == Pry::Method(o.method(:paella)).source
+    end
   end
 
   describe 'super' do