pry 0.9.8.2 → 0.9.8.3

data/test/test_command_integration.rb

@@ -287,18 +287,6 @@ describe "commands" do
     str_output.string.should =~ /goodbye world/
   end
 
-  it 'should inherit "help" command from Pry::CommandBase' do
-    klass = Pry::CommandSet.new do
-      command "h", "h command" do
-      end
-    end
-
-    klass.commands.keys.size.should == 3
-    klass.commands.keys.include?("help").should == true
-    klass.commands.keys.include?("install-command").should == true
-    klass.commands.keys.include?("h").should == true
-  end
-
   it 'should inherit commands from Pry::Commands' do
     klass = Pry::CommandSet.new Pry::Commands do
       command "v" do
@@ -313,13 +301,14 @@ describe "commands" do
 
   it 'should alias a command with another command' do
     klass = Pry::CommandSet.new do
+      import Pry::DefaultCommands::Help
       alias_command "help2", "help"
     end
     klass.commands["help2"].block.should == klass.commands["help"].block
   end
 
   it 'should change description of a command using desc' do
-    klass = Pry::CommandSet.new do; end
+    klass = Pry::CommandSet.new do; import Pry::DefaultCommands::Help; end
     orig = klass.commands["help"].description
     klass.instance_eval do
       desc "help", "blah"

data/test/test_command_set.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe Pry::CommandSet do
   before do
-    @set = Pry::CommandSet.new
+    @set = Pry::CommandSet.new{ import Pry::DefaultCommands::Help }
     @ctx = {
       :target => binding,
       :command_set => @set
@@ -252,27 +252,6 @@ describe Pry::CommandSet do
     }.should.not.raise
   end
 
-  it "should sort the output of the 'help' command" do
-    @set.command 'foo', "Fooerizes" do; end
-    @set.command 'goo', "Gooerizes" do; end
-    @set.command 'moo', "Mooerizes" do; end
-    @set.command 'boo', "Booerizes" do; end
-
-    @ctx[:command_set] = @set
-    @ctx[:output] = StringIO.new
-
-    @set.run_command(@ctx, 'help')
-
-    doc = @ctx[:output].string
-
-    order = [doc.index("boo"),
-             doc.index("foo"),
-             doc.index("goo"),
-             doc.index("help"),
-             doc.index("moo")]
-
-    order.should == order.sort
-  end
 
   describe "renaming a command" do
     it 'should be able to rename and run a command' do
@@ -301,7 +280,6 @@ describe Pry::CommandSet do
       lambda { @set.run_command(@ctx, 'foo') }.should.raise Pry::NoCommandError
     end
 
-
     it 'should be able to pass in options when renaming command' do
       desc    = "hello"
       listing = "bing"
@@ -471,6 +449,18 @@ describe Pry::CommandSet do
       @set.find_command('colon').should == cmd
       Pry.config.command_prefix = ''
     end
+
+    it "should find the command that has the longest match" do
+      cmd = @set.command(/\.(.*)/){ }
+      cmd2 = @set.command(/\.\|\|(.*)/){ }
+      @set.find_command('.||').should == cmd2
+    end
+
+    it "should find the command that has the longest name" do
+      cmd = @set.command(/\.(.*)/){ }
+      cmd2 = @set.command('.||'){ }
+      @set.find_command('.||').should == cmd2
+    end
   end
 
   describe '.valid_command?' do

data/test/test_default_commands/test_help.rb

@@ -0,0 +1,57 @@
+require 'helper'
+
+describe "'help' command" do
+  before do
+    @oldset = Pry.config.commands
+    @set = Pry.config.commands = Pry::CommandSet.new do
+      import Pry::DefaultCommands::Help
+      import Pry::DefaultCommands::Ls
+    end
+  end
+
+  after do
+    Pry.config.commands = @oldset
+  end
+
+  it 'should display help for a specific command' do
+    mock_pry('help ls').should =~ /Usage: ls/
+  end
+
+  it 'should display help for a regex command with a "listing"' do
+    @set.command /bar(.*)/, "Test listing", :listing => "foo" do; end
+    mock_pry('help foo').should =~ /Test listing/
+  end
+
+  it 'should display help for a command with a spaces in its name' do
+    @set.command "command with spaces", "description of a command with spaces" do; end
+    mock_pry('help "command with spaces"').should =~ /description of a command with spaces/
+  end
+
+  it 'should display help for all commands with a description' do
+    @set.command /bar(.*)/, "Test listing", :listing => "foo" do; end
+    @set.command "b", "description for b", :listing => "foo" do; end
+    @set.command "c" do;end
+    @set.command "d", "" do;end
+
+    output = mock_pry('help')
+    output.should =~ /Test listing/
+    output.should =~ /description for b/
+    output.should =~ /No description/
+  end
+
+  it "should sort the output of the 'help' command" do
+    @set.command 'faa', "Fooerizes" do; end
+    @set.command 'gaa', "Gooerizes" do; end
+    @set.command 'maa', "Mooerizes" do; end
+    @set.command 'baa', "Booerizes" do; end
+
+    doc = mock_pry('help')
+
+    order = [doc.index("baa"),
+             doc.index("faa"),
+             doc.index("gaa"),
+             doc.index("maa")]
+
+    order.should == order.sort
+  end
+end

data/test/test_default_commands/test_introspection.rb

@@ -320,6 +320,29 @@ describe "Pry::DefaultCommands::Introspection" do
       str_output.string.should =~ /Mr flibble/
     end
 
+    it "should find methods even if the object has an overridden method method" do
+      c = Class.new{
+        def method;
+          98
+        end
+      }
+
+      mock_pry(binding, "show-method c.new.method").should =~ /98/
+    end
+
+    it "should find instance_methods even if the class has an override instance_method method" do
+      c = Class.new{
+        def method;
+          98
+        end
+
+        def self.instance_method; 789; end
+      }
+
+      mock_pry(binding, "show-method c#method").should =~ /98/
+
+    end
+
     it "should find instance methods with -M" do
       c = Class.new{ def moo; "ve over!"; end }
       mock_pry(binding, "cd c","show-method -M moo").should =~ /ve over/

data/test/test_pry.rb

@@ -296,6 +296,17 @@ describe Pry do
           Object.remove_const(:TEST_RC)
         end
 
+        it "should not load the pryrc if it cannot expand ENV[HOME]" do
+          old_home = ENV['HOME']
+          old_rc = Pry.config.should_load_rc
+          ENV['HOME'] = nil
+          Pry.config.should_load_rc = true
+          lambda { Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput) }.should.not.raise
+
+          ENV['HOME'] = old_home
+          Pry.config.should_load_rc = old_rc
+        end
+
         it "should not run the rc file at all if Pry.config.should_load_rc is false" do
           Pry.config.should_load_rc = false
           Pry.start(self, :input => StringIO.new("exit-all\n"), :output => Pry::NullOutput)

metadata

@@ -2,7 +2,7 @@
 name: pry
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.8.2
+  version: 0.9.8.3
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: coderay
@@ -45,7 +45,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.7"
+        version: 0.7.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -124,15 +124,19 @@ files:
 - lib/pry/config.rb
 - lib/pry/core_extensions.rb
 - lib/pry/custom_completions.rb
-- lib/pry/default_commands/basic.rb
+- lib/pry/default_commands/cd.rb
+- lib/pry/default_commands/commands.rb
 - lib/pry/default_commands/context.rb
-- lib/pry/default_commands/documentation.rb
 - lib/pry/default_commands/easter_eggs.rb
+- lib/pry/default_commands/editing.rb
 - lib/pry/default_commands/gems.rb
-- lib/pry/default_commands/input.rb
+- lib/pry/default_commands/help.rb
+- lib/pry/default_commands/hist.rb
+- lib/pry/default_commands/input_and_output.rb
 - lib/pry/default_commands/introspection.rb
 - lib/pry/default_commands/ls.rb
-- lib/pry/default_commands/shell.rb
+- lib/pry/default_commands/misc.rb
+- lib/pry/default_commands/navigating_pry.rb
 - lib/pry/extended_commands/experimental.rb
 - lib/pry/helpers.rb
 - lib/pry/helpers/base_helpers.rb
@@ -163,10 +167,10 @@ files:
 - test/test_command_integration.rb
 - test/test_command_set.rb
 - test/test_completion.rb
-- test/test_default_commands.rb
 - test/test_default_commands/test_context.rb
 - test/test_default_commands/test_documentation.rb
 - test/test_default_commands/test_gems.rb
+- test/test_default_commands/test_help.rb
 - test/test_default_commands/test_input.rb
 - test/test_default_commands/test_introspection.rb
 - test/test_default_commands/test_ls.rb
@@ -224,10 +228,10 @@ test_files:
 - test/test_command_integration.rb
 - test/test_command_set.rb
 - test/test_completion.rb
-- test/test_default_commands.rb
 - test/test_default_commands/test_context.rb
 - test/test_default_commands/test_documentation.rb
 - test/test_default_commands/test_gems.rb
+- test/test_default_commands/test_help.rb
 - test/test_default_commands/test_input.rb
 - test/test_default_commands/test_introspection.rb
 - test/test_default_commands/test_ls.rb

data/lib/pry/default_commands/documentation.rb

@@ -1,209 +0,0 @@
-class Pry
-  module DefaultCommands
-
-    Documentation = Pry::CommandSet.new do
-
-      create_command "ri", "View ri documentation. e.g `ri Array#each`" do
-        banner <<-BANNER
-          Usage: ri [spec]
-          e.g. ri Array#each
-
-          Relies on the ri executable being available. See also: show-doc.
-        BANNER
-
-        def process
-          run ".ri", *args
-        end
-      end
-
-      create_command "show-doc", "Show the comments above METH. Type `show-doc --help` for more info. Aliases: \?", :shellwords => false do |*args|
-        banner <<-BANNER
-          Usage: show-doc [OPTIONS] [METH]
-          Show the comments above method METH. Tries instance methods first and then methods by default.
-          e.g show-doc hello_method
-        BANNER
-
-        def options(opt)
-          method_options(opt)
-          opt.on :l, "line-numbers", "Show line numbers."
-          opt.on :b, "base-one", "Show line numbers but start numbering at 1 (useful for `amend-line` and `play` commands)."
-          opt.on :f, :flood, "Do not use a pager to view text longer than one screen."
-        end
-
-        def process
-          meth = method_object
-          raise Pry::CommandError, "No documentation found." if meth.doc.nil? || meth.doc.empty?
-
-          doc = process_comment_markup(meth.doc, meth.source_type)
-          output.puts make_header(meth, doc)
-          output.puts "#{text.bold("Owner:")} #{meth.owner || "N/A"}"
-          output.puts "#{text.bold("Visibility:")} #{meth.visibility}"
-          output.puts "#{text.bold("Signature:")} #{meth.signature}"
-          output.puts
-
-          if opts.present?(:b) || opts.present?(:l)
-            doc = Code.new(doc, start_line, :text).
-              with_line_numbers(true)
-          end
-
-          render_output(doc, opts)
-        end
-
-        def start_line
-          if opts.present?(:'base-one')
-             1
-          else
-            (method_object.source_line - method_object.doc.lines.count) || 1
-          end
-        end
-
-      end
-
-      alias_command "?", "show-doc"
-
-      create_command "stat", "View method information and set _file_ and _dir_ locals. Type `stat --help` for more info.", :shellwords => false do |*args|
-        banner <<-BANNER
-            Usage: stat [OPTIONS] [METH]
-            Show method information for method METH and set _file_ and _dir_ locals.
-            e.g: stat hello_method
-        BANNER
-
-        def options(opt)
-          method_options(opt)
-        end
-
-        def process
-          meth = method_object
-          output.puts unindent <<-EOS
-            Method Information:
-            --
-            Name: #{meth.name}
-            Owner: #{meth.owner ? meth.owner : "Unknown"}
-            Visibility: #{meth.visibility}
-            Type: #{meth.is_a?(::Method) ? "Bound" : "Unbound"}
-            Arity: #{meth.arity}
-            Method Signature: #{meth.signature}
-            Source Location: #{meth.source_location ? meth.source_location.join(":") : "Not found."}
-          EOS
-        end
-      end
-
-      create_command "gist", "Gist a method or expression history to github. Type `gist --help` for more info.", :requires_gem => "gist", :shellwords => false do
-        banner <<-USAGE
-          Usage: gist [OPTIONS] [METH]
-          Gist method (doc or source) or input expression to github.
-          Ensure the `gist` gem is properly working before use. http://github.com/defunkt/gist for instructions.
-          e.g: gist -m my_method
-          e.g: gist -d my_method
-          e.g: gist -i 1..10
-          e.g: gist -c show-method
-          e.g: gist -m hello_world --lines 2..-2
-        USAGE
-
-        attr_accessor :content
-        attr_accessor :code_type
-
-        def setup
-          require 'gist'
-          self.content   = ""
-          self.code_type = :ruby
-        end
-
-        def options(opt)
-          opt.on :m, :method, "Gist a method's source.", true do |meth_name|
-            meth = get_method_or_raise(meth_name, target, {})
-            self.content << meth.source
-            self.code_type = meth.source_type
-          end
-          opt.on :d, :doc, "Gist a method's documentation.", true do |meth_name|
-            meth = get_method_or_raise(meth_name, target, {})
-            text.no_color do
-              self.content << process_comment_markup(meth.doc, self.code_type)
-            end
-            self.code_type = :plain
-          end
-          opt.on :c, :command, "Gist a command's source.", true do |command_name|
-            command = find_command(command_name)
-            block = Pry::Method.new(find_command(command_name).block)
-            self.content << block.source
-          end
-          opt.on :f, :file, "Gist a file.", true do |file|
-            self.content << File.read(File.expand_path(file))
-          end
-          opt.on :p, :public, "Create a public gist (default: false)", :default => false
-          opt.on :l, :lines, "Only gist a subset of lines.", :optional => true, :as => Range, :default => 1..-1
-          opt.on :i, :in, "Gist entries from Pry's input expression history. Takes an index or range.", :optional => true,
-          :as => Range, :default => -5..-1 do |range|
-            range = convert_to_range(range)
-            input_expressions = _pry_.input_array[range] || []
-            Array(input_expressions).each_with_index do |code, index|
-              corrected_index = index + range.first
-              if code && code != ""
-                self.content << code
-                if code !~ /;\Z/
-                  self.content << "#{comment_expression_result_for_gist(Pry.config.gist.inspecter.call(_pry_.output_array[corrected_index]))}"
-                end
-              end
-            end
-          end
-        end
-
-        def process
-          perform_gist
-        end
-
-        def perform_gist
-          type_map = { :ruby => "rb", :c => "c", :plain => "plain" }
-
-          if self.content =~ /\A\s*\z/
-            raise CommandError, "Found no code to gist."
-          end
-
-          # prevent Gist from exiting the session on error
-          begin
-            extname = opts.present?(:file) ? ".#{gist_file_extension(opts[:f])}" : ".#{type_map[self.code_type]}"
-
-            if opts.present?(:lines)
-              self.content = restrict_to_lines(content, opts[:l])
-            end
-
-            link = Gist.write([:extension => extname,
-                               :input => self.content],
-                              !opts[:p])
-          rescue SystemExit
-          end
-
-          if link
-            Gist.copy(link)
-            output.puts "Gist created at #{link} and added to clipboard."
-          end
-        end
-
-        def gist_file_extension(file_name)
-          file_name.split(".").last
-        end
-
-        def convert_to_range(n)
-          if !n.is_a?(Range)
-            (n..n)
-          else
-            n
-          end
-        end
-
-        def comment_expression_result_for_gist(result)
-          content = ""
-          result.lines.each_with_index do |line, index|
-            if index == 0
-              content << "# => #{line}"
-            else
-              content << "#    #{line}"
-            end
-          end
-          content
-        end
-      end
-    end
-  end
-end
-