rcodetools 0.8.1.0 → 0.8.2.0

data/CHANGES

@@ -1,5 +1,9 @@
 rcodetools history
 ==================
+User-visible changes since 0.8.0
+--------------------------------
+* xmpfilter: fixed multi-line annotation bugs
+
 User-visible changes since 0.7.0
 --------------------------------
 * Support Ruby 1.9!

data/anything-rcodetools.el

@@ -121,7 +121,7 @@
      . (lambda ()
         (let ((case-fold-search nil)
               (re (format "[:#.]%s" (with-current-buffer anything-current-buffer
-                                   (symbol-at-point)))))
+                                      (regexp-quote (or (thing-at-point 'symbol) ""))))))
           (remove-if-not
            (lambda (meth) (string-match re meth))
            rct-all-methods))))

data/bin/rct-complete

@@ -1,4 +1,4 @@
-#! /usr/local/bin/ruby
+#! /pkgs/ruby18/bin/ruby18
 require 'rcodetools/xmpfilter'
 require 'rcodetools/completion'
 require 'rcodetools/options'

data/bin/rct-doc

@@ -1,4 +1,4 @@
-#! /usr/local/bin/ruby
+#! /pkgs/ruby18/bin/ruby18
 require 'rcodetools/xmpfilter'
 require 'rcodetools/doc'
 require 'rcodetools/options'

data/bin/rct-meth-args

@@ -1,4 +1,4 @@
-#! /usr/local/bin/ruby
+#! /pkgs/ruby18/bin/ruby18
 # Copyright (c) 
 #  2006-2007 Mauricio Fernandez <mfp@acm.org>    http://eigenclass.org
 #  2006-2007 rubikitch <rubikitch@ruby-lang.org> http://www.rubyist.net/~rubikitch/

data/bin/xmpfilter

@@ -1,4 +1,4 @@
-#! /usr/local/bin/ruby
+#! /pkgs/ruby18/bin/ruby18
 require 'rcodetools/xmpfilter'
 require 'rcodetools/options'
 

data/lib/rcodetools/xmpfilter.rb

@@ -11,7 +11,7 @@ require 'tmpdir'
 module Rcodetools
 
 class XMPFilter
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 
   MARKER = "!XMP#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}!"
   XMP_RE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] (=>|~>|==>) (.*)')
@@ -125,6 +125,7 @@ class XMPFilter
   MULTI_LINE_RE = /^(.*)\n(( *)# ?=>.*(?:\n|\z))(?: *#    .*\n)*/
   def annotate(code)
     idx = 0
+    code = code.gsub(/ # !>.*/, '')
     newcode = code.gsub(SINGLE_LINE_RE){ prepare_line($1, idx += 1) }
     newcode.gsub!(MULTI_LINE_RE){ prepare_line($1, idx += 1, true)}
     File.open(@dump, "w"){|f| f.puts newcode} if @dump
@@ -159,7 +160,7 @@ class XMPFilter
   def annotated_multi_line(line, expression, indent, runtime_data, idx)
     pretty = (runtime_data.results[idx].map{|x| x[1]} || []).join(", ")
     first, *rest = pretty.to_a
-    rest.inject("#{expression}\n#{indent}# => #{first}") {|s, l| s << "#{indent}#    " << l }
+    rest.inject("#{expression}\n#{indent}# => #{first || "\n"}") {|s, l| s << "#{indent}#    " << l }
   end
   
   def prepare_line_annotation(expr, idx, multi_line=false)

data/rcodetools.el

@@ -65,8 +65,8 @@
     (shell-command
      (rct-debuglog (format "%s %s > %s" command input-rb output-rb))
      t " *rct-error*")
-    (and buffer (set-buffer buffer))
-    (insert-file-contents output-rb nil nil nil t)
+    (with-current-buffer (or buffer (current-buffer))
+      (insert-file-contents output-rb nil nil nil t))
     (delete-file input-rb)
     (delete-file output-rb)))
 
@@ -170,8 +170,10 @@ See also `rct-interactive'."
       ""
     (let ((test-buf (rct-find-test-script-buffer))
           (bfn buffer-file-name)
-          t-opt test-filename)
-      (if test-buf
+          bfn2 t-opt test-filename)
+      (if (and test-buf
+               (setq bfn2 (buffer-local-value 'buffer-file-name test-buf))
+               (file-exists-p bfn2))
           ;; pass test script's filename and lineno
           (with-current-buffer test-buf
             (setq t-opt (format "%s@%s" buffer-file-name (rct-current-line)))
@@ -241,11 +243,24 @@ Rct-fork makes xmpfilter and completion MUCH FASTER because it pre-loads heavy l
 When rct-fork is running, the mode-line indicates it to avoid unnecessary run.
 To kill rct-fork process, use \\[rct-fork-kill].
 "
-  (interactive "srct-fork options (-e CODE -I LIBDIR -r LIB): ")
+  (interactive (list
+                (read-string "rct-fork options (-e CODE -I LIBDIR -r LIB): "
+                             (rct-fork-default-options))))
   (rct-fork-kill)
   (rct-fork-minor-mode 1)
   (start-process-shell-command
    "rct-fork" "*rct-fork*" rct-fork-command-name options))
+
+(defun rct-fork-default-options ()
+  "Default options for rct-fork by collecting requires."
+  (mapconcat
+   (lambda (lib) (format "-r %s" lib))
+   (save-excursion
+     (goto-char (point-min))
+     (loop while (re-search-forward "\\<require\\> ['\"]\\([^'\"]+\\)['\"]" nil t)
+           collect (match-string-no-properties 1)))
+   " "))
+
 (defun rct-fork-kill ()
   "Kill rct-fork process invoked by \\[rct-fork]."
   (interactive)

data/test/data/xmpfilter/multi_line_annotation_6.taf

@@ -0,0 +1,12 @@
+==========
+multi_line_annotation_6
+==========
+xmpfilter 
+==========
+
+1 + 2 # !> warning
+# =>
+==========
+
+1 + 2
+# => 3

data/test/data/xmpfilter/multi_line_annotation_7.taf

@@ -0,0 +1,23 @@
+==========
+multi_line_annotation_7
+==========
+xmpfilter 
+==========
+
+[1,2]
+# =>
+raise
+[3,4]
+# =>
+[5,6]
+# =>
+==========
+
+[1,2]
+# => [1, 2]
+raise
+[3,4]
+# => 
+[5,6]
+# => 
+# ~> -:2: unhandled exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rcodetools
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.0
+  version: 0.8.2.0
 platform: ruby
 authors: 
 - rubikitch and Mauricio Fernandez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 +09:00
+date: 2009-04-03 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -157,6 +157,7 @@ files:
 - test/data/xmpfilter/unit_test_detect_rbtest2.taf
 - test/data/xmpfilter/bindings.taf
 - test/data/xmpfilter/multi_line_annotation_4.taf
+- test/data/xmpfilter/multi_line_annotation_7.taf
 - test/data/xmpfilter/unit_test.taf
 - test/data/xmpfilter/unit_test_rbtest.taf
 - test/data/xmpfilter/unit_test_poetry.taf
@@ -165,6 +166,7 @@ files:
 - test/data/xmpfilter/last_match.taf
 - test/data/xmpfilter/nospace.taf
 - test/data/xmpfilter/simple_annotation.taf
+- test/data/xmpfilter/multi_line_annotation_6.taf
 - test/data/xmpfilter/unit_test_detect_rbtest.taf
 - test/data/xmpfilter/multi_line_annotation_3.taf
 - test/data/xmpfilter/rspec.taf
@@ -213,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: rcodetools is a collection of Ruby code manipulation tools