pry 0.9.11.4-java → 0.9.12-java

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/completion_spec.rb

@@ -230,4 +230,10 @@ describe Pry::InputCompleter do
     pry = Pry.new
     new_completer(binding, pry).call("pry.").should.not.include nil
   end
+
+  it "does not raise when complete file paths" do
+    should.not.raise(Pry::CommandError) {
+      new_completer(binding, Pry.new).call("cat lib/p")
+    }
+  end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry
 version: !ruby/object:Gem::Version
-  version: 0.9.11.4
+  version: 0.9.12
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -184,7 +184,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .document
-- .gemtest
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -216,8 +215,8 @@ files:
 - lib/pry/commands/cat/input_expression_formatter.rb
 - lib/pry/commands/cd.rb
 - lib/pry/commands/code_collector.rb
-- lib/pry/commands/deprecated_commands.rb
 - lib/pry/commands/disable_pry.rb
+- lib/pry/commands/disabled_commands.rb
 - lib/pry/commands/easter_eggs.rb
 - lib/pry/commands/edit.rb
 - lib/pry/commands/edit/exception_patcher.rb
@@ -277,6 +276,8 @@ files:
 - lib/pry/hooks.rb
 - lib/pry/indent.rb
 - lib/pry/method.rb
+- lib/pry/method/disowned.rb
+- lib/pry/method/weird_method_locator.rb
 - lib/pry/module_candidate.rb
 - lib/pry/pager.rb
 - lib/pry/plugins.rb
@@ -286,7 +287,7 @@ files:
 - lib/pry/rbx_path.rb
 - lib/pry/repl_file_loader.rb
 - lib/pry/rubygem.rb
-- lib/pry/terminal_info.rb
+- lib/pry/terminal.rb
 - lib/pry/test/helper.rb
 - lib/pry/version.rb
 - lib/pry/wrapped_module.rb
@@ -294,6 +295,7 @@ files:
 - man/pry.1.html
 - man/pry.1.ronn
 - pry.gemspec
+- spec/Procfile
 - spec/cli_spec.rb
 - spec/code_object_spec.rb
 - spec/code_spec.rb
@@ -326,6 +328,7 @@ files:
 - spec/commands/whereami_spec.rb
 - spec/completion_spec.rb
 - spec/control_d_handler_spec.rb
+- spec/documentation_helper_spec.rb
 - spec/editor_spec.rb
 - spec/exception_whitelist_spec.rb
 - spec/fixtures/candidate_helper1.rb
@@ -335,6 +338,7 @@ files:
 - spec/fixtures/show_source_doc_examples.rb
 - spec/fixtures/testrc
 - spec/fixtures/testrcbad
+- spec/fixtures/whereami_helper.rb
 - spec/helper.rb
 - spec/helpers/bacon.rb
 - spec/helpers/mock_pry.rb
@@ -380,6 +384,7 @@ signing_key:
 specification_version: 3
 summary: An IRB alternative and runtime developer console
 test_files:
+- spec/Procfile
 - spec/cli_spec.rb
 - spec/code_object_spec.rb
 - spec/code_spec.rb
@@ -412,6 +417,7 @@ test_files:
 - spec/commands/whereami_spec.rb
 - spec/completion_spec.rb
 - spec/control_d_handler_spec.rb
+- spec/documentation_helper_spec.rb
 - spec/editor_spec.rb
 - spec/exception_whitelist_spec.rb
 - spec/fixtures/candidate_helper1.rb
@@ -421,6 +427,7 @@ test_files:
 - spec/fixtures/show_source_doc_examples.rb
 - spec/fixtures/testrc
 - spec/fixtures/testrcbad
+- spec/fixtures/whereami_helper.rb
 - spec/helper.rb
 - spec/helpers/bacon.rb
 - spec/helpers/mock_pry.rb

data/lib/pry/commands/deprecated_commands.rb

@@ -1,2 +0,0 @@
-Pry::Commands.deprecated_command("edit-method", "Use `edit` instead.")
-Pry::Commands.deprecated_command("show-command", "Use show-source [command_name] instead.")

data/lib/pry/terminal_info.rb

@@ -1,48 +0,0 @@
-class Pry::TerminalInfo
-  # Return a pair of [rows, columns] which gives the size of the window.
-  #
-  # If the window size cannot be determined, return nil.
-  def self.screen_size
-    rows, cols = actual_screen_size
-    if rows && cols
-      [rows.to_i, cols.to_i]
-    else
-      nil
-    end
-  end
-
-  # Return a screen width or a default if it fails.
-  def self.width! default = 80
-    (screen_size || [nil, default])[1]
-  end
-
-  def self.actual_screen_size
-    [
-      # Some readlines also provides get_screen_size.
-      # Readline comes before IO#winsize because jruby sometimes defaults winsize to [25, 80]
-      readline_screen_size,
-
-      # io/console adds a winsize method to IO streams.
-      # rescue nil for jruby 1.7.0 [jruby/jruby#354]
-      $stdout.tty? && $stdout.respond_to?(:winsize) && ($stdout.winsize rescue nil),
-
-      # Otherwise try to use the environment (this may be out of date due
-      # to window resizing, but it's better than nothing).
-      [ENV["LINES"] || ENV["ROWS"], ENV["COLUMNS"]],
-
-      # If the user is running within ansicon, then use the screen size
-      # that it reports (same caveats apply as with ROWS and COLUMNS)
-      ENV['ANSICON'] =~ /\((.*)x(.*)\)/ && [$2, $1],
-    ].detect do |(_, cols)|
-      cols.to_i > 0
-    end
-  end
-
-  def self.readline_screen_size
-    Readline.get_screen_size if Readline.respond_to?(:get_screen_size)
-  rescue Java::JavaLang::NullPointerException
-    # This rescue won't happen on jrubies later than:
-    #     https://github.com/jruby/jruby/pull/436
-    nil
-  end
-end