rcodetools 0.4.0.0 → 0.4.1.0

data/CHANGES

@@ -1,3 +1,8 @@
+rcodetools history
+==================
+User-visible changes since 0.4.0
+* rct-meth-args: implemented -I
+* many bug fixes
 
 xmpfilter was integrated into rcodetools as of 0.4.0.
 

data/README

@@ -28,6 +28,7 @@ stdout. They can run in several modes; see
  xmpfilter -h 
  rct-complete -h 
  rct-doc -h 
+ rct-meth-args -h
 README.emacs and README.vim describe how to use rcodetools from your editor.
 
 = License

data/Rakefile

@@ -1,10 +1,12 @@
 
 PKG_REVISION = ".0"
-RCT_VERSION  = "0.4.0"
 
 $:.unshift "lib" if File.directory? "lib"
+require 'rcodetools/xmpfilter'
 require 'rake/testtask'
 
+RCT_VERSION  = XMPFilter::VERSION
+
 desc "Run the unit tests in pure-Ruby mode ."
 Rake::TestTask.new(:test) do |t|
   t.libs << "ext/rcovrt"
@@ -120,4 +122,9 @@ rescue LoadError
   # RubyGems not installed
 end
 
+desc "install by setup.rb"
+task :install do
+  sh "sudo ruby setup.rb install"
+end
+
 # vim: set sw=2 ft=ruby:

data/Rakefile.method_analysis

@@ -24,7 +24,7 @@ task :analyze do
 end
 
 file "TAGS" => FileList["lib/rt/*.rb"] do
-  sh "method_args.rb -t lib/rt/*.rb > TAGS"
+  sh "rct-meth-args -t lib/rt/*.rb > TAGS"
 end
 
 

data/bin/rct-meth-args

@@ -9,22 +9,24 @@
 $VERBOSE = nil
 $__method_args_off = true
 
-if ARGV.empty?
+if ARGV.empty? or ARGV.include? '-h' or ARGV.include? '--help'
   puts <<EOF
-rct-meth-args [-i] [-m] [-c] [-n] <file> [<file> ...]
+rct-meth-args [-Idirectory] [-i] [-m] [-c] [-n] <file> [<file> ...]
 
--i    omit instance methods defined in classes
--m    omit instance methods defined in modules
--c    omit class methods
+-Idirectory   specify $LOAD_PATH directory (same as ruby)
 
--n    print the filename and line number with output lines
--t    generate TAGS output
+-i            omit instance methods defined in classes
+-m            omit instance methods defined in modules
+-c            omit class methods
+
+-n            print the filename and line number with output lines
+-t            generate TAGS output
 
 The given files will be #require()d in order.
 Examples:
-  ruby method_args.rb complex
-  ruby method_args.rb thread
-  ruby method_args.rb -c rubygems
+   rct-meth-args complex
+   rct-meth-args thread
+   rct-meth-args -c rubygems
 EOF
   exit
 end
@@ -246,13 +248,22 @@ new_args = []
 omissions = {}
 $__with_location = false
 $__printer = Printer.new
+i_opt_p = false
 
 ARGV.each do |arg|
   case arg
   when "-n"; $__with_location = true
   when "-t"; $__printer = TagsPrinter.new; $__with_location = true
+  when /-I(.+)$/; $:.unshift $1
+  when "-I"; i_opt_p = true
   when /-./; omissions[$&] = true
-  else new_args << arg
+  else
+    if i_opt_p
+      $:.unshift arg
+      i_opt_p = false
+    else
+      new_args << arg
+    end
   end
 end
 

data/icicles-rcodetools.el

@@ -21,7 +21,7 @@ See also `rct-interactive'."
                          (insert result)) ;/function
                        "rct-complete: "       ;prompt
                        rct-method-completion-table
-                       nil t pattern nil nil nil
+                       nil nil pattern nil nil nil
                        ((end (point)) beg
                         pattern klass
                         (icicle-candidate-help-fn

data/lib/rcodetools/completion.rb

@@ -190,38 +190,44 @@ class XMPCompletionFilter < XMPFilter
     @prefix = expr
     case expr
     when /^\$\w+$/              # global variable
-      __prepare_line 'global_variables'
+      __prepare_line 'nil', 'global_variables'
     when /^@@\w+$/              # class variable
-      __prepare_line 'Module === self ? class_variables : self.class.class_variables'
+      __prepare_line 'nil', 'Module === self ? class_variables : self.class.class_variables'
     when /^@\w+$/               # instance variable
-      __prepare_line 'instance_variables'
-    when /^([A-Z].*)::(.*)$/    # nested constants / class methods
+      __prepare_line 'nil', 'instance_variables'
+    when /^([A-Z].*)::([^.]*)$/    # nested constants / class methods
       @prefix = $2
-      __prepare_line "#$1.constants | #$1.methods(true)"
+      __prepare_line $1, "#$1.constants | #$1.methods(true)"
     when /^[A-Z]\w*$/           # normal constants
-      __prepare_line 'Module.constants'
-    when /^::(.+)::(.*)$/       # toplevel nested constants
+      __prepare_line 'nil', 'Module.constants'
+    when /^(.*::.+)\.(.+)$/       # toplevel class methods
       @prefix = $2
-      __prepare_line "::#$1.constants | ::#$1.methods"
+      __prepare_line $1, "#$1.methods"
+    when /^(::.+)::(.*)$/       # toplevel nested constants
+      @prefix = $2
+      __prepare_line $1, "#$1.constants | #$1.methods"
     when /^::(.*)/              # toplevel constant
       @prefix = $1
-      __prepare_line 'Object.constants'
+      __prepare_line 'nil', 'Object.constants'
     when /^(:[^:.]*)$/          # symbol
-      __prepare_line 'Symbol.all_symbols.map{|s| ":" + s.id2name}'
+      __prepare_line 'nil', 'Symbol.all_symbols.map{|s| ":" + s.id2name}'
     when /\.([^.]*)$/           # method call
       @prefix = $1
-      __prepare_line "(#{Regexp.last_match.pre_match}).methods(true)"
+      recv = Regexp.last_match.pre_match
+      __prepare_line recv, "(#{recv}).methods(true)"
     else                        # bare words
-      __prepare_line "methods | private_methods | local_variables | self.class.constants"
+      __prepare_line 'self', "methods | private_methods | local_variables | self.class.constants"
     end
   end
 
-  def __prepare_line(all_completion_expr)
+  def __prepare_line(recv, all_completion_expr)
     v = "#{VAR}"
     idx = 1
     oneline_ize(<<EOC)
 #{v} = (#{all_completion_expr}).grep(/^#{Regexp.quote(@prefix)}/)
-$stderr.puts("#{MARKER}[#{idx}] => " + #{v}.class.to_s  + " " + #{v}.join(" ")) || #{v}
+#{v}2 = (#{recv})
+#{v}2 = Module === #{v}2 ? #{v}2 : #{v}2.class
+$stderr.puts("#{MARKER}[#{idx}] => " + #{v}2.to_s  + " " + #{v}.join(" ")) || #{v}
 exit
 EOC
   end

data/lib/rcodetools/doc.rb

@@ -72,6 +72,10 @@ $stderr.print("#{MARKER}[#{idx}] => " + #{v}.class.to_s  + " ")
 if #{ancestor_class}
   $stderr.puts(#{ancestor_class}.to_s + #{flag} + '#{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

data/lib/rcodetools/xmpfilter.rb

@@ -4,7 +4,7 @@
 # Use and distribution subject to the terms of the Ruby license.
 
 class XMPFilter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   MARKER = "!XMP#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}!"
   XMP_RE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] (=>|~>|==>) (.*)')
@@ -110,8 +110,9 @@ end || #{v}
   def execute_tmpfile(code)
     stdin, stdout, stderr = (1..3).map do |i|
       fname = "xmpfilter.tmpfile_#{Process.pid}-#{i}.rb"
-      at_exit { File.unlink fname }
-      File.open(fname, "w+")
+      f = File.open(fname, "w+")
+      at_exit { f.close unless f.closed?; File.unlink fname }
+      f
     end
     stdin.puts code
     stdin.close

data/rcodetools.el

@@ -77,11 +77,11 @@ See also `rct-interactive'. "
   "Function to use rct-complete-symbol.")
 ;; (setq rct-complete-symbol-function 'rct-complete-symbol--icicles)
 
-(defun rct-complete-symbol ()
+(defun rct-complete-symbol (&optional option)
   "Perform ruby method and class completion on the text around point.
 This command only calls a function according to `rct-complete-symbol-function'.
 See also `rct-interactive', `rct-complete-symbol--normal', and `rct-complete-symbol--icicles'."
-  (interactive)
+  (interactive (rct-interactive))
   (call-interactively rct-complete-symbol-function))
 
 (defun rct-complete-symbol--normal (&optional option)

data/test/data/completion_emacs_icicles-input.rb

@@ -1 +1 @@
-Array.new(3).uni
+1.div

data/test/data/completion_emacs_icicles-output.rb

@@ -1,5 +1,5 @@
 (progn
-(setq rct-method-completion-table '(("uniq") ("uniq!") ))
-(setq pattern "uni")
-(setq klass "Array")
+(setq rct-method-completion-table '(("div") ("divmod") ))
+(setq pattern "div")
+(setq klass "Fixnum")
 )

data/test/test_completion.rb

@@ -116,6 +116,11 @@ EOC
     assert_equal(["popen"], doit('::File::pop',1))
 
     assert_equal(["popen"], doit('File.pop',1))
+    assert_equal(["popen"], doit('::File.pop',1))
+
+    assert_equal(["new"], doit('::File::Stat.ne',1))
+    assert_equal(["new"], doit('File::Stat.ne',1))
+
   end
 
 
@@ -464,4 +469,27 @@ EOC
   def XXtest_oneline
     assert_equal(["aaa"], doit('aaa=1; aa', 1))
   end
+
+################################################################  
+
+  def get_class(code, lineno, column=nil, options={})
+    xmp = XMPCompletionFilter.new options
+    klass, = xmp.runtime_data_with_class(code, lineno, column).sort
+    klass
+  end
+
+  def test_class__Class
+    assert_equal("File", get_class("File::n", 1))
+    assert_equal("File", get_class("File.n", 1))
+    assert_equal("File::Stat", get_class("File::Stat::n", 1))
+    assert_equal("File::Stat", get_class("File::Stat.n", 1))
+
+    assert_equal("FileTest", get_class("FileTest.exis", 1))
+    assert_equal("FileTest", get_class("FileTest::exis", 1))
+  end
+
+  def test_class__NotClass
+    assert_equal("Fixnum", get_class("1.ch", 1))
+    assert_equal("String", get_class("'a'.siz", 1))
+  end
 end

data/test/test_doc.rb

@@ -39,6 +39,25 @@ $hoge.popen
 EOC
   end
 
+  # not File::Stat.methods(false).include? 'new'
+  def test_class_method__File_Stat_new
+    assert_equal("File::Stat.new", doit("File::Stat.new", 1))
+    assert_equal("File::Stat.new", doit("File::Stat::new", 1))
+
+    assert_equal("File::Stat.new", doit("::File::Stat.new", 1))
+    assert_equal("File::Stat.new", doit("::File::Stat::new", 1))
+  end
+
+  # IO.methods(false).include? 'new'
+  def test_class_method__IO_new
+    assert_equal("IO.new", doit("IO.new", 1))
+    assert_equal("IO.new", doit("IO::new", 1))
+
+    assert_equal("IO.new", doit("::IO.new", 1))
+    assert_equal("IO.new", doit("::IO::new", 1))
+  end
+
+
   def test_constant__File
     assert_equal("File", doit("File", 1))
     assert_equal("File", doit("::File", 1))

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rcodetools
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.0
-date: 2006-12-29 00:00:00 +01:00
+  version: 0.4.1.0
+date: 2007-01-13 00:00:00 +01:00
 summary: rcodetools is a collection of Ruby code manipulation tools
 require_paths: 
 - lib