rcodetools 0.5.0.0 → 0.7.0.0

data/rcodetools.el

@@ -4,15 +4,20 @@
 ;;;
 ;;; Use and distribution subject to the terms of the Ruby license.
 
-(defvar xmpfilter-command-name "ruby -S xmpfilter --dev"
+(defvar xmpfilter-command-name "ruby -S xmpfilter --dev --detect-rbtest"
   "The xmpfilter command name.")
-(defvar rct-doc-command-name "ruby -S rct-doc --dev"
+(defvar rct-doc-command-name "ruby -S rct-doc --dev --fork --detect-rbtest"
   "The rct-doc command name.")
-(defvar rct-complete-command-name "ruby -S rct-complete --dev"
+(defvar rct-complete-command-name "ruby -S rct-complete --dev --fork --detect-rbtest"
   "The rct-complete command name.")
+(defvar ruby-toggle-file-command-name "ruby -S ruby-toggle-file"
+  "The ruby-toggle-file command name.")
 (defvar rct-option-history nil)                ;internal
 (defvar rct-option-local nil)     ;internal
 (make-variable-buffer-local 'rct-option-local)
+(defvar rct-debug nil
+  "If non-nil, output debug message into *Messages*.")
+;; (setq rct-debug t)
 
 (defadvice comment-dwim (around rct-hack activate)
   "If comment-dwim is successively called, add => mark."
@@ -55,7 +60,7 @@
 See also `rct-interactive'. "
   (interactive (rct-interactive))
   (rct-save-position
-   (lambda () (shell-command-on-region (point-min) (point-max) (xmpfilter-command option) t t))))
+   (lambda () (shell-command-on-region (point-min) (point-max) (xmpfilter-command option) t t " *rct-error*"))))
 
 (defun xmpfilter-command (&optional option)
   "The xmpfilter command line, DWIM."
@@ -76,6 +81,8 @@ See also `rct-interactive'. "
 (defvar rct-complete-symbol-function 'rct-complete-symbol--normal
   "Function to use rct-complete-symbol.")
 ;; (setq rct-complete-symbol-function 'rct-complete-symbol--icicles)
+(defvar rct-use-test-script t
+  "Whether rct-complete/rct-doc use test scripts.")
 
 (defun rct-complete-symbol (&optional option)
   "Perform ruby method and class completion on the text around point.
@@ -113,20 +120,60 @@ See also `rct-interactive'."
 
 ;; (define-key ruby-mode-map "\M-\C-i" 'rct-complete-symbol)
 
+(defun rct-debuglog (logmsg)
+  "if `rct-debug' is non-nil, output LOGMSG into *Messages*. Returns LOGMSG."
+  (if rct-debug
+      (message "%s" logmsg))
+  logmsg)
+
 (defun rct-exec-and-eval (command opt)
   "Execute rct-complete/rct-doc and evaluate the output."
   (let ((eval-buffer  (get-buffer-create " *rct-eval*")))
     ;; copy to temporary buffer to do completion at non-EOL.
     (shell-command-on-region
      (point-min) (point-max)
-     (format "%s %s %s --line=%d --column=%d"
-             command opt (or rct-option-local "")
-             (rct-current-line) (current-column))
-     eval-buffer)
+     (rct-debuglog (format "%s %s %s --line=%d --column=%d %s"
+                           command opt (or rct-option-local "")
+                           (rct-current-line) (current-column)
+                           (if rct-use-test-script (rct-test-script-option-string) "")))
+     eval-buffer nil " *rct-error*")
     (message "")
     (eval (with-current-buffer eval-buffer
             (goto-char 1)
-            (read (current-buffer))))))
+            (unwind-protect
+                (read (current-buffer))
+              (unless rct-debug (kill-buffer eval-buffer)))))))
+
+(defun rct-test-script-option-string ()
+  (if (null buffer-file-name)
+      ""
+    (let ((test-buf (rct-find-test-script-buffer))
+          (bfn buffer-file-name)
+          t-opt test-filename)
+      (if test-buf
+          ;; pass test script's filename and lineno
+          (with-current-buffer test-buf
+            (setq t-opt (format "%s@%s" buffer-file-name (rct-current-line)))
+            (format "-t %s --filename=%s" t-opt bfn))
+        ""))))
+
+(require 'cl)
+
+(defun rct-find-test-script-buffer (&optional buffer-list)
+  "Find the latest used Ruby test script buffer."
+  (setq buffer-list (or buffer-list (buffer-list)))
+  (dolist (buf buffer-list)
+    (with-current-buffer buf
+      (if (and buffer-file-name (string-match "test.*\.rb$" buffer-file-name))
+          (return buf)))))
+
+;; (defun rct-find-test-method (buffer)
+;;   "Find test method on point on BUFFER."
+;;   (with-current-buffer buffer
+;;     (save-excursion
+;;       (forward-line 1)
+;;       (if (re-search-backward "^ *def *\\(test_[A-Za-z0-9?!_]+\\)" nil t)
+;;           (match-string 1)))))
 
 (defun rct-try-completion ()
   "Evaluate the output of rct-complete."
@@ -159,4 +206,12 @@ See also `rct-interactive'. "
       (error
        (ri fullname)))))
 
+;;;;
+(defun ruby-toggle-buffer ()
+  "Open a related file to the current buffer. test<=>impl."
+  (interactive)
+  (find-file (shell-command-to-string
+              (format "%s %s" ruby-toggle-file-command-name buffer-file-name))))
+
+
 (provide 'rcodetools)

data/rcodetools.vim

@@ -46,19 +46,36 @@ endfunction
 
 
 "{{{ RCT_completion function
+
+let s:last_test_file = ""
+let s:last_test_lineno = 0
+
 let s:rct_completion_col = 0
 let s:rct_tmpfile = ""
 
+function! <SID>RCT_command_with_test_options(cmd)
+    if s:last_test_file != ""
+	return a:cmd .
+		    \ "-" . "-filename='" . expand("%:p") . "' " .
+		    \ "-t '" . s:last_test_file . "@" . s:last_test_lineno . "' "
+    endif
+    return a:cmd
+endfunction
+
 function! <SID>RCT_completion(findstart, base)
     if a:findstart
 	let s:rct_completion_col = col('.') - 1
-	let s:rct_tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%T.rb")
+	let s:rct_tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%H-%M-%S.rb")
         silent exec ":w " . s:rct_tmpfile
 	return strridx(getline('.'), '.', col('.')) + 1
     else
 	let line    = line('.')
 	let column  = s:rct_completion_col
-	let command = "rct-complete --completion-class-info --line=" . line . " --column=" . column . " " . s:rct_tmpfile
+
+	let command = "rct-complete --completion-class-info --dev --fork --line=" .
+		    \ line . " --column=" . column . " "
+	let command = <SID>RCT_command_with_test_options(command) . s:rct_tmpfile
+
 	let data = split(system(command), '\n')
 
 	for dline in data
@@ -116,23 +133,41 @@ function! RCT_find_tag_or_ri(fullname)
 endfunction
 
 function! <SID>RCT_smart_ri()
-  let tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%T.rb")
+  let tmpfile = "tmp-rcodetools" . strftime("Y-%m-%d-%H-%M-%S.rb")
   silent exec ":w " . tmpfile
 
   let line    = line('.')
   let column  = col('.') - 1
-  let command = "rct-doc --ri-vim --line=" . line . " --column=" . column . " " . tmpfile
+  let command = "rct-doc --ri-vim --line=" . line . " --column=" . column . " "
+  let command = <SID>RCT_command_with_test_options(command) . tmpfile
   "let term = matchstr(system(command), "\\v[^\n]+")
   exec system(command)
   call delete(tmpfile)
   "call RCT_find_tag_or_ri(term)
 endfunction
 
+function! <SID>RCT_ruby_toggle()
+  let curr_file = expand("%:p")
+  let cmd = "ruby -S ruby-toggle-file " . curr_file
+  if match(curr_file, '\v_test|test_') != -1
+      let s:last_test_file = curr_file
+      let s:last_test_lineno = line(".")
+  endif
+  let dest = system(cmd)
+  silent exec ":w"
+  exec ("edit " . dest)
+  silent! normal g;
+endfunction
+
 "{{{ bindings and au
 
-execute "au Filetype ruby setlocal completefunc=" . s:sid . "RCT_completion"
+if v:version >= 700
+    execute "au Filetype ruby setlocal completefunc=" . s:sid . "RCT_completion"
+endif
 execute 'au Filetype ruby nmap <buffer><silent> <C-]> :exec "call ' .
          \ 'RCT_find_tag_or_ri(''" . expand("<cword>") . "'')"<cr>'
-execute 'au Filetype ruby nmap <buffer><silent>' . s:GetOption("RCT_ri_binding", "<LocalLeader>r") . 
+execute 'au Filetype ruby nmap <buffer><silent>' . s:GetOption("RCT_ri_binding", "<LocalLeader>r") .
         \ ' :call ' .  s:sid . 'RCT_smart_ri()<cr>'
+execute 'au Filetype ruby nmap <buffer><silent>' . s:GetOption("RCT_toggle_binding", "<LocalLeader>t") .
+        \ ' :call ' .  s:sid . 'RCT_ruby_toggle()<cr>'
 let &cpo = s:save_cpo

data/test/data/completion_class_info-input.rb

@@ -0,0 +1 @@
+Array.new(3).s

data/test/data/completion_class_info-output.rb

@@ -0,0 +1,10 @@
+select	Array#select
+send	Object#send
+shift	Array#shift
+singleton_methods	Object#singleton_methods
+size	Array#size
+slice	Array#slice
+slice!	Array#slice!
+sort	Array#sort
+sort!	Array#sort!
+sort_by	Enumerable#sort_by

data/test/data/completion_class_info_no_candidates-input.rb

@@ -0,0 +1 @@
+Array.new(3).nonexisten

data/test/data/completion_class_info_no_candidates-output.rb

@@ -0,0 +1 @@
+

data/test/data/completion_detect_rbtest-input.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+=begin test_bar
+assert_equal "BAR", bar("bar")
+=end
+def bar(s)
+  s.upca
+end

data/test/data/completion_detect_rbtest-output.rb

@@ -0,0 +1,2 @@
+upcase
+upcase!

data/test/data/completion_detect_rbtest2-input.rb

@@ -0,0 +1 @@
+Array.new(3).uni

data/test/data/completion_detect_rbtest2-output.rb

@@ -0,0 +1,2 @@
+uniq
+uniq!

data/test/data/completion_in_method-input.rb

@@ -0,0 +1,3 @@
+def fooz
+  [].lengt
+end

data/test/data/completion_in_method-output.rb

@@ -0,0 +1 @@
+length

data/test/data/completion_in_method-test.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+class TestFooz < Test::Unit::TestCase
+  def test_fooz
+    assert_equal(0, fooz)
+  end
+end

data/test/data/completion_rbtest-input.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+=begin test_bar
+assert_equal "BAR", bar("bar")
+=end
+def bar(s)
+  s.upca
+end

data/test/data/completion_rbtest-output.rb

@@ -0,0 +1,2 @@
+upcase
+upcase!

data/test/data/doc_detect_rbtest-input.rb

@@ -0,0 +1 @@
+[].length

data/test/data/doc_detect_rbtest-output.rb

@@ -0,0 +1 @@
+Array#length

data/test/data/doc_detect_rbtest2-input.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+=begin test_bar
+assert_equal "BAR", bar("bar")
+=end
+def bar(s)
+  s.upcase
+end

data/test/data/doc_detect_rbtest2-output.rb

@@ -0,0 +1 @@
+String#upcase

data/test/data/doc_rbtest-input.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+=begin test_bar
+assert_equal "BAR", bar("bar")
+=end
+def bar(s)
+  s.upcase
+end

data/test/data/doc_rbtest-output.rb

@@ -0,0 +1 @@
+String#upcase

data/test/data/rspec-input.rb

@@ -11,36 +11,36 @@ class X
 end
 
 
-context "Testing xmpfilter's expectation expansion" do
-  setup do
+describe "xmpfilter's expectation expansion" do
+  before do
     @o = X.new
   end
 
-  specify "Should expand should_equal expectations" do
+  it "should expand should == expectations" do
     @o.foo(true)   # =>
     @o.foo(true).a # =>
     @o.foo(false)  # =>
   end
   
-  specify "Should expand should_raise expectations" do
+  it "should expand should raise_error expectations" do
     @o.bar         # =>
   end
 
-  specify "Should expand should_be_nil expectations" do
+  it "should expand should be_nil expectations" do
     @o.baz         # =>
   end
 
-  specify "Should expand correct expectations for complex values" do
+  it "should expand correct expectations for complex values" do
     @o.babar       # =>
   end
 
-  specify "Should expand should_be_close expectations" do
+  it "should expand should be_close expectations" do
     @o.fubar(10)   # =>
   end
 end
 
-context "Testing binding" do
-  specify "Should expand should_equal expectations" do
+describe "xmpfilter's automagic binding detection" do
+  it "should expand should == expectations" do
     a = b = c = 1
     d = a
     d                                              # =>

data/test/data/rspec-output.rb

@@ -11,42 +11,42 @@ class X
 end
 
 
-context "Testing xmpfilter's expectation expansion" do
-  setup do
+describe "xmpfilter's expectation expansion" do
+  before do
     @o = X.new
   end
 
-  specify "Should expand should_equal expectations" do
-    (@o.foo(true)).should_be_a_kind_of X::Y
-    (@o.foo(true).inspect).should_equal "#<struct X::Y a=2>"
-    (@o.foo(true).a).should_equal 2
-    (@o.foo(false)).should_equal 2
+  it "should expand should == expectations" do
+    (@o.foo(true)).should be_a_kind_of(X::Y)
+    (@o.foo(true).inspect).should == ("#<struct X::Y a=2>")
+    (@o.foo(true).a).should == (2)
+    (@o.foo(false)).should == (2)
   end
   
-  specify "Should expand should_raise expectations" do
-    lambda{@o.bar}.should_raise RuntimeError
+  it "should expand should raise_error expectations" do
+    lambda{@o.bar}.should raise_error(RuntimeError)
   end
 
-  specify "Should expand should_be_nil expectations" do
-    (@o.baz).should_be_nil
+  it "should expand should be_nil expectations" do
+    (@o.baz).should be_nil
   end
 
-  specify "Should expand correct expectations for complex values" do
-    (@o.babar).should_equal [1, 2]
+  it "should expand correct expectations for complex values" do
+    (@o.babar).should == ([1, 2])
   end
 
-  specify "Should expand should_be_close expectations" do
-    (@o.fubar(10)).should_be_close 101.0, 0.0001
+  it "should expand should be_close expectations" do
+    (@o.fubar(10)).should be_close(101.0, 0.0001)
   end
 end
 
-context "Testing binding" do
-  specify "Should expand should_equal expectations" do
+describe "xmpfilter's automagic binding detection" do
+  it "should expand should == expectations" do
     a = b = c = 1
     d = a
-    (d).should_equal a
-    (d).should_equal b
-    (d).should_equal c
-    (d).should_equal 1
+    (d).should == (a)
+    (d).should == (b)
+    (d).should == (c)
+    (d).should == (1)
   end
 end

data/test/data/rspec_poetry-input.rb

@@ -11,36 +11,36 @@ class X
 end
 
 
-context "Testing xmpfilter's expectation expansion" do
-  setup do
+describe "xmpfilter's expectation expansion" do
+  before do
     @o = X.new
   end
 
-  specify "Should expand should_equal expectations" do
+  it "should expand should == expectations" do
     @o.foo(true)   # =>
     @o.foo(true).a # =>
     @o.foo(false)  # =>
   end
   
-  specify "Should expand should_raise expectations" do
+  it "should expand should raise_error expectations" do
     @o.bar         # =>
   end
 
-  specify "Should expand should_be_nil expectations" do
+  it "should expand should be_nil expectations" do
     @o.baz         # =>
   end
 
-  specify "Should expand correct expectations for complex values" do
+  it "should expand correct expectations for complex values" do
     @o.babar       # =>
   end
 
-  specify "Should expand should_be_close expectations" do
+  it "should expand should be_close expectations" do
     @o.fubar(10)   # =>
   end
 end
 
-context "Testing binding" do
-  specify "Should expand should_equal expectations" do
+describe "xmpfilter's automagic binding detection" do
+  it "should expand should == expectations" do
     a = b = c = 1
     d = a
     d                                              # =>