rcodetools 0.8.3.0 → 0.8.4.0

data/README.emacs

@@ -26,8 +26,12 @@ If you use anything.el copy <tt>anything-rcodetools.el</tt> too.
 Then require it.
   (require 'anything-rcodetools)
 RI document on each candidate during completion.
-I think anything-rcodetools is more convenient than icicles-rcodetools.
 
+anything-show-completion.el shows selection (mehod) in buffer for completion.
+It is available in:
+  http://www.emacswiki.org/cgi-bin/wiki/download/anything-show-completion.el
+
+I think anything-rcodetools is more convenient than icicles-rcodetools.
 I'm addicted to anything!
   http://www.emacswiki.org/cgi-bin/wiki/Anything
 

data/anything-rcodetools.el

@@ -1,5 +1,5 @@
 ;;; anything-rcodetools.el --- accurate Ruby method completion with anything
-;; $Id: anything-rcodetools.el,v 1.6 2008/01/14 17:59:34 rubikitch Exp $
+;; $Id: anything-rcodetools.el,v 1.12 2009/04/18 10:12:02 rubikitch Exp $
 
 ;;; Copyright (c) 2007 rubikitch
 
@@ -20,9 +20,39 @@
 ;;       ;; See docs
 ;;       (define-key anything-map "\C-z" 'anything-execute-persistent-action)
 
+;;; Commands:
+;;
+;; Below are complete command list:
+;;
+;;
+;;; Customizable Options:
+;;
+;; Below are customizable option list:
+;;
+
 ;;; History:
 
 ;; $Log: anything-rcodetools.el,v $
+;; Revision 1.12  2009/04/18 10:12:02  rubikitch
+;; Adjust to change of `use-anything-show-completion'
+;;
+;; Revision 1.11  2009/04/17 20:21:47  rubikitch
+;; * require anything
+;; * require anything-show-completion.el if available
+;;
+;; Revision 1.10  2009/04/17 20:11:03  rubikitch
+;; removed old code
+;;
+;; Revision 1.9  2009/04/17 20:07:52  rubikitch
+;; * use --completion-emacs-anything option
+;; * New implementation of `anything-c-source-complete-ruby-all'
+;;
+;; Revision 1.8  2009/04/15 10:25:25  rubikitch
+;; Set `anything-execute-action-at-once-if-one' t
+;;
+;; Revision 1.7  2009/04/15 10:24:23  rubikitch
+;; regexp bug fix
+;;
 ;; Revision 1.6  2008/01/14 17:59:34  rubikitch
 ;; * uniform format (anything-c-source-complete-ruby, anything-c-source-complete-ruby-all)
 ;; * rename command: anything-c-ri -> anything-rct-ri
@@ -46,49 +76,21 @@
 
 ;;; Code:
 
+(require 'anything)
 (require 'rcodetools)
+(when (require 'anything-show-completion nil t)
+  (use-anything-show-completion 'rct-complete-symbol--anything
+                                '(length pattern)))
 
-;;;; Compatibility code
-(unless (fboundp 'anything-execute-persistent-action)
-  (defun anything-execute-persistent-action ()
-    "If a candidate was selected then perform the associated action without quitting anything."
-    (interactive)
-    (save-selected-window
-      (select-window (get-buffer-window anything-buffer))
-      (select-window (setq minibuffer-scroll-window
-                           (if (one-window-p t) (split-window) (next-window (selected-window) 1))))
-      (let* ((anything-window (get-buffer-window anything-buffer))
-             (selection (if anything-saved-sources
-                            ;; the action list is shown
-                            anything-saved-selection
-                          (anything-get-selection)))
-             (default-action (anything-get-action))
-             (action (assoc-default 'persistent-action (anything-get-current-source))))
-        (setq action (or action default-action))
-        (if (and (listp action)
-                 (not (functionp action))) ; lambda
-            ;; select the default action
-            (setq action (cdar action)))
-        (set-window-dedicated-p anything-window t)
-        (unwind-protect
-            (and action selection (funcall action selection))
-          (set-window-dedicated-p anything-window nil))))))
-
-(unless (boundp 'anything-current-buffer)
-  (defvar anything-current-buffer nil)
-  (defadvice anything (before get-current-buffer activate)
-    (setq anything-current-buffer (current-buffer))))
-
-;;;; Main code
-(defun anything-rct-ri (pair)
-  (ri (substring (cadr (split-string pair "\t")) 1 -1)))
-
-(defun anything-rct-complete  (pair)
+(defun anything-rct-ri (meth)
+  (ri (get-text-property 0 'desc meth)))
+
+(defun anything-rct-complete  (meth)
   (save-excursion
     (set-buffer anything-current-buffer)
     (search-backward pattern)
     (delete-char (length pattern)))
-  (insert (car (split-string pair "\t"))))
+  (insert meth))
 
 (setq rct-complete-symbol-function 'rct-complete-symbol--anything)
 (defvar anything-c-source-complete-ruby
@@ -97,7 +99,7 @@
     (init
      . (lambda ()
          (condition-case x
-             (rct-exec-and-eval rct-complete-command-name "--completion-emacs-icicles")
+             (rct-exec-and-eval rct-complete-command-name "--completion-emacs-anything")
            ((error) (setq rct-method-completion-table nil)))))
     (action
      ("Completion" . anything-rct-complete)
@@ -106,34 +108,37 @@
     (persistent-action . anything-rct-ri)))
 
 (defvar rct-get-all-methods-command "PAGER=cat fri -l")
-(defun rct-get-all-methods ()
-  (interactive)
-  (setq rct-all-methods
-        (mapcar (lambda (fullname)
-                  (replace-regexp-in-string "^.+[:#.]\\([^:#.]+\\)$"
-                                            "\\1\t[\\&]" fullname))
-                (split-string (shell-command-to-string rct-get-all-methods-command) "\n"))))
-
-(defvar rct-all-methods (rct-get-all-methods))
 (defvar anything-c-source-complete-ruby-all
   '((name . "Ruby Method Completion (ALL)")
-    (candidates
+    (init
      . (lambda ()
-        (let ((case-fold-search nil)
-              (re (format "[:#.]%s" (with-current-buffer anything-current-buffer
-                                      (regexp-quote (or (thing-at-point 'symbol) ""))))))
-          (remove-if-not
-           (lambda (meth) (string-match re meth))
-           rct-all-methods))))
+         (unless (anything-candidate-buffer)
+           (with-current-buffer (anything-candidate-buffer 'global)
+             (call-process-shell-command rct-get-all-methods-command nil t)
+             (goto-char 1)
+             (while (re-search-forward "^.+[:#.]\\([^:#.]+\\)$" nil t)
+               (replace-match "\\1\t[\\&]"))))))
+    (candidates-in-buffer
+     . (lambda ()
+         (let ((anything-pattern (format "^%s.*%s" (regexp-quote pattern) anything-pattern)))
+           (anything-candidates-in-buffer))))
+    (display-to-real
+     . (lambda (line)
+         (if (string-match "\t\\[\\(.+\\)\\]$" line)
+             (propertize (substring line 0 (match-beginning 0))
+                         'desc (match-string 1 line))
+           line)))
     (action
      ("Completion" . anything-rct-complete)
      ("RI" . anything-rct-ri))
     (persistent-action . anything-rct-ri)))
 
+
 (defun rct-complete-symbol--anything ()
   (interactive)
-  (let ((anything-sources (list anything-c-source-complete-ruby anything-c-source-complete-ruby-all)))
-    (anything)))
+  (let ((anything-execute-action-at-once-if-one t))
+    (anything '(anything-c-source-complete-ruby
+                anything-c-source-complete-ruby-all))))
 
 (provide 'anything-rcodetools)
 

data/bin/rct-complete

@@ -1,4 +1,4 @@
-#! /pkgs/ruby19/bin/ruby19
+#! /usr/local/bin/ruby18
 require 'rcodetools/xmpfilter'
 require 'rcodetools/completion'
 require 'rcodetools/options'
@@ -22,6 +22,9 @@ opts = OptionParser.new do |opts|
   opts.on("--completion-emacs-icicles", "Generate completion code for Emacs/Icicles.") do
     klass = XMPCompletionEmacsIciclesFilter
   end
+  opts.on("--completion-emacs-anything", "Generate completion code for Emacs/Anything.") do
+    klass = XMPCompletionEmacsAnythingFilter
+  end
   opts.on("--completion-class-info", "List completion candidates with class.") do
     klass = XMPCompletionClassInfoFilter
   end

data/bin/rct-doc

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

data/bin/rct-meth-args

@@ -1,4 +1,4 @@
-#! /pkgs/ruby19/bin/ruby19
+#! /usr/local/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 @@
-#! /pkgs/ruby19/bin/ruby19
+#! /usr/local/bin/ruby18
 require 'rcodetools/xmpfilter'
 require 'rcodetools/options'
 

data/lib/rcodetools/completion.rb

@@ -378,4 +378,29 @@ class XMPCompletionEmacsIciclesFilter < XMPCompletionEmacsFilter
   end
 end
 
+class XMPCompletionEmacsAnythingFilter < XMPCompletionEmacsFilter
+  @candidates_with_description_flag = true
+
+  def completion_code(code, lineno, column=nil)
+    elisp = "(progn\n"
+    table = "(setq rct-method-completion-table `("
+    
+    begin
+      klass, cands = candidates_with_class(code, lineno, column)
+      cands.sort.each do |minfo|
+        meth, description = split_method_info(minfo)
+        table << format('("%s\\t[%s]" . ,(propertize "%s" \'desc "%s")) ',
+          meth, description, meth, description)
+      end
+      table << "))\n"
+    rescue Exception => err
+      return error_code(err)
+    end
+    elisp << table
+    elisp << %Q[(setq pattern "#{prefix}")\n]
+    elisp << %Q[(setq klass "#{klass}")\n]
+    elisp << ")"                # /progn
+  end
+end
+
 end

data/lib/rcodetools/xmpfilter.rb

@@ -15,7 +15,7 @@ require 'tmpdir'
 module Rcodetools
 
 class XMPFilter
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 
   MARKER = "!XMP#{Time.new.to_i}_#{Process.pid}_#{rand(1000000)}!"
   XMP_RE = Regexp.new("^" + Regexp.escape(MARKER) + '\[([0-9]+)\] (=>|~>|==>) (.*)')

data/rcodetools.el

@@ -157,7 +157,10 @@ See also `rct-interactive'."
              command opt (or rct-option-local "")
              (rct-current-line)
              ;; specify column in BYTE
-             (string-bytes (buffer-substring (point-at-bol) (point)))
+             (string-bytes
+              (encode-coding-string
+               (buffer-substring (point-at-bol) (point))
+               buffer-file-coding-system))
              (if rct-use-test-script (rct-test-script-option-string) ""))
      eval-buffer)
     (message "")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rcodetools
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.0
+  version: 0.8.4.0
 platform: ruby
 authors: 
 - rubikitch and Mauricio Fernandez
@@ -9,11 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-09 00:00:00 +09:00
+date: 2009-04-18 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: "rcodetools is a collection of Ruby code manipulation tools.  It includes xmpfilter and editor-independent Ruby development helper tools, as well as emacs and vim interfaces.  Currently, rcodetools comprises: * xmpfilter: Automagic Test::Unit assertions/RSpec expectations and code annotations * rct-complete: Accurate method/class/constant etc. completions * rct-doc: Document browsing and code navigator * rct-meth-args: Precise method info (meta-prog. aware) and TAGS generation"
+description: |
+  rcodetools is a collection of Ruby code manipulation tools. 
+  It includes xmpfilter and editor-independent Ruby development helper tools,
+  as well as emacs and vim interfaces.
+  
+  Currently, rcodetools comprises:
+  * xmpfilter: Automagic Test::Unit assertions/RSpec expectations and code annotations
+  * rct-complete: Accurate method/class/constant etc. completions
+  * rct-doc: Document browsing and code navigator
+  * rct-meth-args: Precise method info (meta-prog. aware) and TAGS generation
+
 email: "\"rubikitch\" <rubikitch@ruby-lang.org>, \"Mauricio Fernandez\" <mfp@acm.org>"
 executables: 
 - rct-complete
@@ -176,6 +186,8 @@ files:
 - test/data/xmpfilter/multi_line_annotation_5.taf
 has_rdoc: true
 homepage: http://eigenclass.org/hiki.rb?rcodetools
+licenses: []
+
 post_install_message: |+
   
   ==============================================================================
@@ -215,9 +227,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: rcodetools is a collection of Ruby code manipulation tools
 test_files: 
 - test/test_functional.rb