rcodetools 0.4.1.0 → 0.5.0.0

data/CHANGES

@@ -1,6 +1,15 @@
 rcodetools history
 ==================
+
+User-visible changes since 0.4.1
+--------------------------------
+* --dev: adds project directories to $:
+* --completion-class-info: list completion candidates and class info
+* display completion candidates with description, both in emacs
+  and vim (using the menu+preview window).
+
 User-visible changes since 0.4.0
+--------------------------------
 * rct-meth-args: implemented -I
 * many bug fixes
 

data/README

@@ -1,7 +1,7 @@
 
  rcodetools  http://eigenclass.org/hiki.rb?rcodetools
- Copyright (c) 2005-2006 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
- Copyright (c)      2006 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
+ Copyright (c) 2005-2007 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
+ Copyright (c) 2006-2007 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
 Use and distribution subject to the terms of the Ruby license.
 
 = Overview

data/README.vim

@@ -9,6 +9,22 @@ rcodetools.vim redefines user-defined completion for Ruby programs, so you can
 use the intelligent, 100%-accurate completion with <C-X><C-U> in insert mode.
 Note that this runs the code to obtain the exact candidate list.
 
+If you've set completeopt to menu,preview then rcodetools.vim can display
+information about the completion candidates. The menu will show the synopsis 
+as given in the RI documentation, and the preview window will contain the full
+RI documentation.
+
+This functionality relies on fri for quick lookups. It can be enabled by setting
+
+  let g:rct_completion_use_fri = 1  " 0 by default (disabled)
+
+in your .vimrc (don't forget to run fastri-server too). 
+Obtaining the documentation for many candidates can be slow, so you can set
+the threshold above which additional documentation will not be shown with
+
+ " 20 by default, about a couple secs max wait on a normal machine
+  let g:rct_completion_info_max_len = 20 
+
 Quick RI documentation and exact tag jumping
 ============================================
 When you're editing a Ruby file, <C-]> will jump to the definition of the

data/bin/rct-complete

@@ -21,6 +21,9 @@ opts = OptionParser.new do |opts|
   opts.on("--completion-emacs-icicles", "Generate completion code for Emacs/Icicles.") do
     klass = XMPCompletionEmacsIciclesFilter
   end
+  opts.on("--completion-class-info", "List completion candidates with class.") do
+    klass = XMPCompletionClassInfoFilter
+  end
 
   opts.handle_position options
   opts.handle_interpreter options

data/bin/rct-meth-args

@@ -1,11 +1,11 @@
-#!/usr/bin/env ruby
+#! /home/batsman/usr//bin/ruby
 # Copyright (c) 
-#  2006 Mauricio Fernandez <mfp@acm.org>    http://eigenclass.org
-#  2006 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
+#  2006-2007 Mauricio Fernandez <mfp@acm.org>    http://eigenclass.org
+#  2006-2007 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/
 #                    
 # Use and distribution subject to the same conditions as Ruby.
 
-
+require 'rcodetools/options'
 $VERBOSE = nil
 $__method_args_off = true
 
@@ -14,7 +14,8 @@ if ARGV.empty? or ARGV.include? '-h' or ARGV.include? '--help'
 rct-meth-args [-Idirectory] [-i] [-m] [-c] [-n] <file> [<file> ...]
 
 -Idirectory   specify $LOAD_PATH directory (same as ruby)
-
+--dev         Add this project's bin/ and lib/ to $LOAD_PATH.
+              A directory that has Rakefile is considered as project base direcotry.
 -i            omit instance methods defined in classes
 -m            omit instance methods defined in modules
 -c            omit class methods
@@ -256,7 +257,8 @@ ARGV.each do |arg|
   when "-t"; $__printer = TagsPrinter.new; $__with_location = true
   when /-I(.+)$/; $:.unshift $1
   when "-I"; i_opt_p = true
-  when /-./; omissions[$&] = true
+  when "--dev"; OptionHandler.auto_include_paths($:, Dir.pwd)
+  when /^-.$/; omissions[$&] = true
   else
     if i_opt_p
       $:.unshift arg
@@ -397,7 +399,13 @@ end
 
 $__method_args_off = false
 
-ARGV.each{|x| require x}
+ARGV.each{|x|
+  begin
+    require x
+  rescue LoadError
+    load x
+  end
+}
 
 $__method_args_off = true
 # END { puts "zzzz OK" }

data/icicles-rcodetools.el

@@ -1,6 +1,6 @@
 ;;; icicles-rcodetools.el -- accurate completion with icicles
 
-;;; Copyright (c) 2006 rubikitch <rubikitch@ruby-lang.org>
+;;; Copyright (c) 2006-2007 rubikitch <rubikitch@ruby-lang.org>
 ;;;
 ;;; Use and distribution subject to the terms of the Ruby license.
 
@@ -23,9 +23,12 @@ See also `rct-interactive'."
                        rct-method-completion-table
                        nil nil pattern nil nil nil
                        ((end (point)) beg
-                        pattern klass
+                        (icicle-list-join-string "\t")
+                        (icicle-list-use-nth-parts '(1))
+                        (icicle-point-position-in-candidate 'input-end)
+                        pattern klass alist
                         (icicle-candidate-help-fn
-                         (lambda (result) (ri result klass)))) ;bindings
+                         (lambda (result) (ri (cdr (assoc result alist)))))) ;bindings
                        (rct-exec-and-eval rct-complete-command-name "--completion-emacs-icicles"))
 
 (provide 'icicles-rcodetools)

data/lib/rcodetools/completion.rb

@@ -1,3 +1,6 @@
+# Nearly 100% accurate completion for any editors!!
+#  by rubikitch <rubikitch@ruby-lang.org>
+
 require 'rcodetools/xmpfilter'
 require 'enumerator'
 # Common routines for XMPCompletionFilter/XMPDocFilter
@@ -150,7 +153,7 @@ XXX
       i+1==lineno ? prepare_line(line.chomp, column) : line
     }.join
     newcode << add_BEGIN if @ignore_NoMethodError
-    debugprint "newcode", newcode, "-"*80
+    debugprint "newcode", newcode.gsub(/;/, "\n"), "-"*80
     stdout, stderr = execute(newcode)
     output = stderr.readlines
     debugprint "stdout", output, "-"*80
@@ -171,6 +174,15 @@ XXX
     runtime_data_with_class(code, lineno, column)[1]
   end
 
+  def __magic_help_code(result, v, meth)
+    code = <<-EOC
+  #{result} = #{v}.method(#{meth}).inspect.match( %r[\\A#<(?:Unbound)?Method: (.*?)>\\Z] )[1].sub(/\\A.*?\\((.*?)\\)(.*)\\Z/){ "\#{$1}\#{$2}" }.sub(/#<Class:(.*?)>#/) { "\#{$1}." }
+  #{result} = #{v}.to_s + ".new" if #{result} == 'Class#new' and #{v}.private_method_defined?(:initialize)
+  #{result} = "Object#" + #{meth} if #{result} =~ /^Kernel#/ and Kernel.instance_methods(false).include? #{meth}
+  #{result}
+EOC
+  end
+
 end
 
 # Nearly 100% accurate completion for any editors!!
@@ -178,6 +190,11 @@ end
 class XMPCompletionFilter < XMPFilter
   include ProcessParticularLine
 
+  class << self
+    attr_accessor :candidates_with_description_flag
+  end
+  @candidates_with_description_flag = false
+
   # String completion begins with this.
   attr :prefix
 
@@ -185,49 +202,77 @@ class XMPCompletionFilter < XMPFilter
     new(opts).completion_code(code, opts[:lineno], opts[:column])
   end
 
+  def magic_help_code(recv, meth)
+    oneline_ize __magic_help_code("#{VAR}_result", recv, meth)
+  end
+
+  def methods_map_code(recv)
+    # delimiter is \0
+    %Q[map{|m| "\#{m}\\0" + #{magic_help_code((recv), 'm')}}]
+  end
+
+  def split_method_info(minfo)
+    minfo.split(/\0/,2)
+  end
+
   def prepare_line(expr, column)
     set_expr_and_postfix!(expr, column){|c| /^.{#{c}}/ }
     @prefix = expr
     case expr
     when /^\$\w+$/              # global variable
-      __prepare_line 'nil', 'global_variables'
+      __prepare_line 'nil', 'global_variables', '%n'
     when /^@@\w+$/              # class variable
-      __prepare_line 'nil', 'Module === self ? class_variables : self.class.class_variables'
+      __prepare_line 'nil', 'Module === self ? class_variables : self.class.class_variables', '%n'
     when /^@\w+$/               # instance variable
-      __prepare_line 'nil', 'instance_variables'
+      __prepare_line 'nil', 'instance_variables', '%n'
     when /^([A-Z].*)::([^.]*)$/    # nested constants / class methods
       @prefix = $2
-      __prepare_line $1, "#$1.constants | #$1.methods(true)"
+      __prepare_line $1, "#$1.constants | #$1.methods(true)",
+      %Q[#$1.constants + #$1.methods(true).#{methods_map_code($1)}]
     when /^[A-Z]\w*$/           # normal constants
-      __prepare_line 'nil', 'Module.constants'
+      __prepare_line 'nil', 'Module.constants', '%n'
     when /^(.*::.+)\.(.+)$/       # toplevel class methods
       @prefix = $2
-      __prepare_line $1, "#$1.methods"
+      __prepare_line $1, "#$1.methods",
+      %Q[%n.#{methods_map_code($1)}]
     when /^(::.+)::(.*)$/       # toplevel nested constants
       @prefix = $2
-      __prepare_line $1, "#$1.constants | #$1.methods"
+      __prepare_line $1, "#$1.constants | #$1.methods",
+      %Q[#$1.constants + #$1.methods.#{methods_map_code($1)}]
     when /^::(.*)/              # toplevel constant
       @prefix = $1
-      __prepare_line 'nil', 'Object.constants'
+      __prepare_line 'nil', 'Object.constants', '%n'
     when /^(:[^:.]*)$/          # symbol
-      __prepare_line 'nil', 'Symbol.all_symbols.map{|s| ":" + s.id2name}'
+      __prepare_line 'nil', 'Symbol.all_symbols.map{|s| ":" + s.id2name}', '%n'
     when /\.([^.]*)$/           # method call
       @prefix = $1
       recv = Regexp.last_match.pre_match
-      __prepare_line recv, "(#{recv}).methods(true)"
+      __prepare_line recv, "(#{recv}).methods(true)",
+      %Q[%n.#{methods_map_code(recv)}]
     else                        # bare words
-      __prepare_line 'self', "methods | private_methods | local_variables | self.class.constants"
+      __prepare_line 'self', "methods | private_methods | local_variables | self.class.constants",
+      %Q[(methods | private_methods).#{methods_map_code('self')} + local_variables | self.class.constants]
     end
   end
 
-  def __prepare_line(recv, all_completion_expr)
+  def __prepare_line(recv, all_completion_expr, all_completion_expr_verbose)
+    if self.class.candidates_with_description_flag
+      ___prepare_line(recv, all_completion_expr_verbose.gsub(/%n/, '('+all_completion_expr+')'))
+    else
+      ___prepare_line(recv, all_completion_expr) 
+    end
+
+  end
+
+  def ___prepare_line(recv, all_completion_expr)
     v = "#{VAR}"
+    rcv = "#{VAR}_recv"
     idx = 1
     oneline_ize(<<EOC)
+#{rcv} = (#{recv})
 #{v} = (#{all_completion_expr}).grep(/^#{Regexp.quote(@prefix)}/)
-#{v}2 = (#{recv})
-#{v}2 = Module === #{v}2 ? #{v}2 : #{v}2.class
-$stderr.puts("#{MARKER}[#{idx}] => " + #{v}2.to_s  + " " + #{v}.join(" ")) || #{v}
+#{rcv} = Module === #{rcv} ? #{rcv} : #{rcv}.class
+$stderr.puts("#{MARKER}[#{idx}] => " + #{rcv}.to_s  + " " + #{v}.join(" ")) || #{v}
 exit
 EOC
   end
@@ -235,7 +280,7 @@ EOC
   # Array of completion candidates.
   def candidates(code, lineno, column=nil)
     methods = runtime_data(code, lineno, column) rescue ""
-    methods.split.sort
+    methods.split(/ /).sort
   end
 
   # Completion code for editors.
@@ -244,18 +289,38 @@ EOC
   end
 end
 
+# for debugging XMPCompletionEmacsFilter
+class XMPCompletionVerboseFilter < XMPCompletionFilter
+  @candidates_with_description_flag = true
+end
+
+class XMPCompletionClassInfoFilter < XMPCompletionFilter
+  @candidates_with_description_flag = true
+
+  def completion_code(code, lineno, column=nil)
+    candidates(code, lineno, column).join("\n").tr("\0", "\t")
+  end
+end
+
 class XMPCompletionEmacsFilter < XMPCompletionFilter
+  @candidates_with_description_flag = true
+
   def completion_code(code, lineno, column=nil)
     elisp = "(progn\n"
-    elisp <<  "(setq rct-method-completion-table '("
+    table = "(setq rct-method-completion-table '("
+    alist = "(setq alist '("
     begin
-      candidates(code, lineno, column).each do |meth|
-        elisp << format('("%s") ', meth)
+      candidates(code, lineno, column).sort.each do |minfo|
+        meth, description = split_method_info(minfo)
+        table << format('("%s") ', meth)
+        alist << format('("%s\\t[%s]") ', meth, description)
       end
+      table << "))\n"
+      alist << "))\n"
     rescue Exception => err
       return %Q[(error "#{err.message}")]
     end
-    elisp << "))\n"
+    elisp << table << alist
     elisp << %Q[(setq pattern "#{prefix}")\n]
     elisp << %Q[(try-completion pattern rct-method-completion-table nil)\n]
     elisp << ")"                # /progn
@@ -263,23 +328,31 @@ class XMPCompletionEmacsFilter < XMPCompletionFilter
 end
 
 class XMPCompletionEmacsIciclesFilter < XMPCompletionFilter
+  @candidates_with_description_flag = true
+
   def candidates(code, lineno, column=nil)
     klass, methods = runtime_data_with_class(code, lineno, column) rescue ["", ""]
     @klass = klass
-    methods.split.sort
+    methods.split(/ /).sort
   end
 
   def completion_code(code, lineno, column=nil)
     elisp = "(progn\n"
-    elisp <<  "(setq rct-method-completion-table '("
+    table = "(setq rct-method-completion-table '("
+    help_alist = "(setq alist '("
+    
     begin
-      candidates(code, lineno, column).each do |meth|
-        elisp << format('("%s") ', meth)
+      candidates(code, lineno, column).sort.each do |minfo|
+        meth, description = split_method_info(minfo)
+        table << format('("%s\\t[%s]") ', meth, description)
+        help_alist << format('("%s" . "%s")', meth, description)
       end
+      table << "))\n"
+      help_alist << "))\n"
     rescue Exception => err
       return %Q[(error "#{err.message}")]
     end
-    elisp << "))\n"
+    elisp << table << help_alist
     elisp << %Q[(setq pattern "#{prefix}")\n]
     elisp << %Q[(setq klass "#{@klass}")\n]
     elisp << ")"                # /progn

data/lib/rcodetools/doc.rb

@@ -46,6 +46,7 @@ class XMPDocFilter < XMPFilter
 
   def __prepare_line(x)
     v = "#{VAR}"
+    result = "#{VAR}_result"
     klass = "#{VAR}_klass"
     flag = "#{VAR}_flag"
     which_methods = "#{VAR}_methods"
@@ -55,34 +56,18 @@ class XMPDocFilter < XMPFilter
     meth = x[:meth_or_constant] || x[:meth]
     debugprint "recv=#{recv}", "meth=#{meth}"
     if meth
+      # imported from fastri/MagicHelp
       code = <<-EOC
 #{v} = (#{recv})
-if Class === #{v}
-  #{flag} = #{v}.respond_to?('#{meth}') ? "." : "::"
-  #{klass} = #{v}
-  #{which_methods} = :methods
-else
-  #{flag} = "#"
-  #{klass} = #{v}.class
-  #{which_methods} = :instance_methods
-end
-#{ancestor_class} = #{klass}.ancestors.delete_if{|c| c==Kernel }.find{|c| c.__send__(#{which_methods}, false).include? '#{meth}' }
 $stderr.print("#{MARKER}[#{idx}] => " + #{v}.class.to_s  + " ")
 
-if #{ancestor_class}
-  $stderr.puts(#{ancestor_class}.to_s + #{flag} + '#{meth}')
+if Module === #{v} and '#{meth}' =~ /^[A-Z]/ and #{v}.const_defined?('#{meth}')
+  #{result} = #{v}.to_s + "::#{meth}"
 else
-  if '#{meth}' == 'new' and #{v}.private_method_defined?(:initialize)
-    $stderr.puts(#{v}.to_s + #{flag} + '#{meth}'); exit
-  end
-               
-  [Kernel, Module, Class].each do |k|
-    if (k.instance_methods(false) + k.private_instance_methods(false)).include? '#{meth}'
-      $stderr.printf("%s#%s\\n", k, '#{meth}'); exit
-    end
-  end
-  $stderr.puts(#{v}.to_s + '::' + '#{meth}')
+  #{__magic_help_code result, v, meth.dump}
 end
+
+$stderr.puts(#{result})
 exit
       EOC
     else
@@ -154,7 +139,7 @@ end
 
 class XMPRiFilter < XMPDocFilter
   def doc(code, lineno, column=nil)
-    "ri '#{super}'"
+    "ri '#{super.sub(/\./, '::')}'"
   end
 end
 

data/lib/rcodetools/options.rb

@@ -26,6 +26,10 @@ module OptionHandler
     on("-I PATH", "Add PATH to $LOAD_PATH") do |path|
       options[:include_paths] << path
     end
+    on("--dev", "Add this project's bin/ and lib/ to $LOAD_PATH.",
+       "A directory with a Rakefile is considered a project base directory.") do
+      auto_include_paths(options[:include_paths], Dir.pwd)
+    end
     on("-r LIB", "Require LIB before execution.") do |lib|
       options[:libs] << lib
     end
@@ -55,6 +59,14 @@ module OptionHandler
     end
   end
 
+  def auto_include_paths(include_paths, pwd)
+    if pwd =~ %r!^(.+)/(lib|bin)!
+      include_paths.unshift("#$1/lib").unshift("#$1/bin")
+    elsif File.file? "#{pwd}/Rakefile" or File.file? "#{pwd}/rakefile"
+      include_paths.unshift("#{pwd}/lib").unshift("#{pwd}/bin")
+    end
+  end
+  module_function :auto_include_paths
 
 end
 

data/lib/rcodetools/xmpfilter.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# Copyright (c) 2005-2006 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
+# Copyright (c) 2005-2007 Mauricio Fernandez <mfp@acm.org> http://eigenclass.org
 #                         rubikitch <rubikitch@ruby-lang.org>
 # Use and distribution subject to the terms of the Ruby license.
 
 class XMPFilter
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 
   MARKER = "!XMP#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}!"
   XMP_RE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] (=>|~>|==>) (.*)')

data/rcodetools.el

@@ -4,11 +4,11 @@
 ;;;
 ;;; Use and distribution subject to the terms of the Ruby license.
 
-(defvar xmpfilter-command-name "ruby -S xmpfilter"
+(defvar xmpfilter-command-name "ruby -S xmpfilter --dev"
   "The xmpfilter command name.")
-(defvar rct-doc-command-name "ruby -S rct-doc"
+(defvar rct-doc-command-name "ruby -S rct-doc --dev"
   "The rct-doc command name.")
-(defvar rct-complete-command-name "ruby -S rct-complete"
+(defvar rct-complete-command-name "ruby -S rct-complete --dev"
   "The rct-complete command name.")
 (defvar rct-option-history nil)                ;internal
 (defvar rct-option-local nil)     ;internal
@@ -89,7 +89,7 @@ See also `rct-interactive', `rct-complete-symbol--normal', and `rct-complete-sym
 See also `rct-interactive'."
   (interactive (rct-interactive))
   (let ((end (point)) beg
-	pattern
+	pattern alist
 	completion)
     (setq completion (rct-try-completion)) ; set also pattern / completion
     (save-excursion
@@ -108,7 +108,7 @@ See also `rct-interactive'."
 	   (message "Making completion list...")
 	   (with-output-to-temp-buffer "*Completions*"
 	     (display-completion-list
-	      (all-completions pattern rct-method-completion-table)))
+	      (all-completions pattern alist)))
 	   (message "Making completion list...%s" "done")))))
 
 ;; (define-key ruby-mode-map "\M-\C-i" 'rct-complete-symbol)

data/rcodetools.vim

@@ -58,10 +58,30 @@ function! <SID>RCT_completion(findstart, base)
     else
 	let line    = line('.')
 	let column  = s:rct_completion_col
-	let command = "rct-complete --line=" . line . " --column=" . column . " " . s:rct_tmpfile
-	let ret = split(system(command))
+	let command = "rct-complete --completion-class-info --line=" . line . " --column=" . column . " " . s:rct_tmpfile
+	let data = split(system(command), '\n')
+
+	for dline in data
+	    let parts    = split(dline, "\t")
+	    let name     = get(parts, 0)
+	    let selector = get(parts, 1)
+	    echo name
+	    echo selector
+	    if s:GetOption('rct_completion_use_fri', 0) && s:GetOption('rct_completion_info_max_len', 20) >= len(data)
+		let fri_data = system('fri -f plain ' . "'" .  selector . "'" . ' 2>/dev/null')
+		call complete_add({'word': name,
+			        \  'menu': get(split(fri_data), 2, ''),
+			        \  'info': fri_data } )
+	    else
+		call complete_add(name)
+	    endif
+	    if complete_check()
+		break
+	    endif
+	endfor
+
 	call delete(s:rct_tmpfile)
-	return ret
+	return []
     endif
 endfunction
 

data/test/data/completion_emacs-output.rb

@@ -1,5 +1,6 @@
 (progn
 (setq rct-method-completion-table '(("uniq") ("uniq!") ))
+(setq alist '(("uniq\t[Array#uniq]") ("uniq!\t[Array#uniq!]") ))
 (setq pattern "uni")
 (try-completion pattern rct-method-completion-table nil)
 )

data/test/data/completion_emacs_icicles-output.rb

@@ -1,5 +1,6 @@
 (progn
-(setq rct-method-completion-table '(("div") ("divmod") ))
+(setq rct-method-completion-table '(("div\t[Fixnum#div]") ("divmod\t[Fixnum#divmod]") ))
+(setq alist '(("div" . "Fixnum#div")("divmod" . "Fixnum#divmod")))
 (setq pattern "div")
 (setq klass "Fixnum")
 )

data/test/test_completion.rb

@@ -493,3 +493,148 @@ EOC
     assert_equal("String", get_class("'a'.siz", 1))
   end
 end
+
+
+class TestXMPCompletionVerboseFilter < Test::Unit::TestCase
+  def doit(code, lineno, column=nil, options={})
+    xmp = XMPCompletionVerboseFilter.new options
+    xmp.candidates(code, lineno, column).sort
+  end
+
+  def test_complete_global_variable
+    assert_equal(["$hoge"], doit(<<EOC, 2))
+  $hoge = 100
+  $ho
+EOC
+  end
+
+  def test_complete_instance_variable
+    assert_equal(["@hoge"], doit(<<EOC, 2))
+  @hoge = 100
+  @ho
+EOC
+  end
+
+  def test_complete_class_variable_module
+    assert_equal(["@@hoge"], doit(<<EOC, 3))
+  module X
+    @@hoge = 100
+    @@ho
+  end
+EOC
+  end
+
+  def test_complete_constant__nested
+    assert_equal(["Stat"], doit('File::Sta',1))
+  end
+
+  def test_complete_class_method
+    assert_equal(["popen\0IO.popen"], doit('File::pop',1))
+    assert_equal(["popen\0IO.popen"], doit('::File::pop',1))
+
+    assert_equal(["popen\0IO.popen"], doit('File.pop',1))
+    assert_equal(["popen\0IO.popen"], doit('::File.pop',1))
+
+    assert_equal(["new\0File::Stat.new"], doit('::File::Stat.ne', 1))
+    assert_equal(["new\0File::Stat.new"], doit('File::Stat.ne',1))
+
+  end
+
+  def test_complete_constant__in_class
+    assert_equal(["Fixclass", "Fixnum"], doit(<<EOC, 3))
+  class Fixclass
+    class Bar
+      Fix
+    end
+  end
+EOC
+  end
+
+
+  def test_complete_toplevel_constant
+    assert_equal(["Fixnum"], doit(<<EOC,3))
+  class Foo
+    class Fixnum
+      ::Fixn
+    end
+  end
+EOC
+
+    assert_equal(["Fixnum"], doit(<<EOC,3))
+  class Foo
+    class Fixnum
+      ::Foo::Fixn
+    end
+  end
+EOC
+
+    assert_equal(["Bar"], doit(<<EOC,5))
+  class Foo
+    class Bar
+    end
+  end
+  ::Foo::B
+EOC
+  end
+
+  def test_complete_symbol
+    assert_equal([":vccaex"], doit(<<EOC,2))
+a = :vccaex
+:vcca
+EOC
+    
+  end
+
+  def test_method_chain__String
+    assert_equal(["length\0String#length"], doit('"a".upcase.capitalize.leng', 1))
+  end
+
+  def test_bare_word__local_variable
+    assert_equal(["aaaaaxx"], doit(<<EOC,2))
+  aaaaaxx = 1
+  aaaa
+EOC
+  end
+
+  def test_bare_word__method
+    assert_equal(["trace_var\0Kernel#trace_var"], doit("trace",1))
+  end
+
+  def test_bare_word__constant
+    assert_equal(["Fixnum"], doit("Fixn",1))
+  end
+    
+  def test_bare_word__method_in_class
+    assert_equal(["attr_accessor\0Module#attr_accessor"], doit(<<EOC,2))
+  class X
+    attr_acc
+  end
+EOC
+  end
+
+  def test_bare_word__public_method
+    assert_equal(["hoge\0X#hoge"], doit(<<EOC,4))
+  class X
+    def hoge() end
+    def boke
+      hog
+    end
+    new.boke
+  end
+EOC
+  end
+
+  def test_bare_word__private_method
+    assert_equal(["hoge\0X#hoge"], doit(<<EOC,5))
+  class X
+    def hoge() end
+    private :hoge
+    def boke
+      hog
+    end
+    new.boke
+  end
+EOC
+  end
+
+end

data/test/test_doc.rb

@@ -150,6 +150,14 @@ end
 EOC
   end
 
+  def test_bare_word__Class_object_id
+    assert_equal("Object#object_id", doit(<<EOC, 2))
+class Foo
+  object_id
+end
+EOC
+  end
+
 
   def test_bare_word__self
     assert_equal("Foo#foo", doit(<<EOC, 3))
@@ -417,6 +425,20 @@ end
 EOC
     end
   end
+end
+
+class TestXMPRiFilter < Test::Unit::TestCase
+  def doit(code, lineno, column=nil, options={})
+    xmp = XMPRiFilter.new options
+    xmp.doc(code, lineno, column)
+  end
 
+  def test_class_method__IO_popen
+    assert_equal("ri 'IO::popen'", doit("IO::popen", 1))
+    assert_equal("ri 'IO::popen'", doit("IO.popen", 1))
+  end
 
+  def test_instance_method__Array
+    assert_equal("ri 'Array#length'", doit("[].length", 1))
+  end
 end

data/test/test_options.rb

@@ -0,0 +1,32 @@
+$: << ".." << "../lib"
+require 'rcodetools/options'
+require 'test/unit'
+require 'tmpdir'
+require 'fileutils'
+
+class TestOptionHandler < Test::Unit::TestCase
+  include OptionHandler
+
+  def include_paths_check
+    options = { :include_paths => [] }
+    auto_include_paths options[:include_paths], Dir.pwd
+    assert options[:include_paths].include?("#{@basedir}/lib")
+    assert options[:include_paths].include?("#{@basedir}/bin")
+  end
+
+  def test_auto_include_paths
+    Dir.chdir(Dir.tmpdir) do
+      begin
+        FileUtils.mkdir_p ["project", "project/lib/project", "project/bin", "project/share"]
+        open("project/Rakefile","w"){}
+        @basedir = File.expand_path "project"
+        Dir.chdir("project/lib/project/") { include_paths_check }
+        Dir.chdir("project/lib/") { include_paths_check }
+        Dir.chdir("project/bin/") { include_paths_check }
+        Dir.chdir("project/") { include_paths_check }
+      ensure
+        FileUtils.rm_rf "project"
+      end
+    end
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rcodetools
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.0
-date: 2007-01-13 00:00:00 +01:00
+  version: 0.5.0.0
+date: 2007-01-28 00:00:00 +01:00
 summary: rcodetools is a collection of Ruby code manipulation tools
 require_paths: 
 - lib
@@ -76,6 +76,7 @@ files:
 - test/test_method_args.rb
 - test/test_method_analyzer.rb
 - test/test_run.rb
+- test/test_options.rb
 - test/data/simple_annotation-input.rb
 - test/data/unit_test-input.rb
 - test/data/rspec-input.rb
@@ -119,6 +120,7 @@ test_files:
 - test/test_method_args.rb
 - test/test_method_analyzer.rb
 - test/test_run.rb
+- test/test_options.rb
 rdoc_options: 
 - --main
 - README