X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ruby.el;h=97f4e5ba3d9f5fdcf3cfce2be3395d4f053bae8e;hb=a6811dec177810b886ef09137f1974eef74da1c8;hp=902b4b12c62d69931c276b2ae69c3d03d6372512;hpb=e6053ac36cd57435d9ea59ff0f1cd4991b598951;p=riece

diff --git a/lisp/riece-ruby.el b/lisp/riece-ruby.el
index 902b4b1..97f4e5b 100644
--- a/lisp/riece-ruby.el
+++ b/lisp/riece-ruby.el
@@ -3,7 +3,7 @@
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1998-09-28
-;; Keywords: IRC, riece
+;; Keywords: IRC, riece, Ruby
 
 ;; This file is part of Riece.
 
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; riece-ruby.el is a library to interact with the Ruby interpreter.
+;; riece-ruby.el is a library to interact with Ruby interpreter.
 ;; It supports concurrent execution of Ruby programs in a single
 ;; session.  For example:
 ;; 
@@ -38,18 +38,21 @@
 ;; => "rubyserv2"
 ;;
 ;; (riece-ruby-inspect "rubyserv0")
-;; => ((OK nil) nil "running")
+;; => ((OK nil) nil (("running")))
 ;;
 ;; (riece-ruby-inspect "rubyserv1")
-;; => ((OK nil) "2" "finished")
+;; => ((OK nil) "2" (("finished")))
 ;;
 ;; (riece-ruby-inspect "rubyserv2")
-;; => ((OK nil) "(eval):1: unterminated string meets end of file" "exited")
+;; => ((OK nil) "(eval):1: unterminated string meets end of file" (("exited")))
 
 ;;; Code:
 
+(require 'riece-debug)
+
 (defgroup riece-ruby nil
-  "Interact with the Ruby interpreter."
+  "Interact with Ruby interpreter."
+  :prefix "riece-"
   :group 'riece)
 
 (defcustom riece-ruby-command "ruby"
@@ -57,12 +60,35 @@
   :type 'string
   :group 'riece-ruby)
 
+(defcustom riece-ruby-out-file (expand-file-name "riece-ruby.out"
+						 riece-directory)
+  "A file which records stdout of Ruby programs."
+  :type 'string
+  :group 'riece-ruby)
+
+(defcustom riece-ruby-err-file (expand-file-name "riece-ruby.err"
+						 riece-directory)
+  "A file which records stderr of Ruby programs."
+  :type 'string
+  :group 'riece-ruby)
+
+(defcustom riece-ruby-log-file (expand-file-name "riece-ruby.log"
+						 riece-directory)
+  "A file used to logging."
+  :type 'string
+  :group 'riece-ruby)
+
 (defvar riece-ruby-server-program "server.rb"
   "The server program file.  If the filename is not absolute, it is
 assumed that the file is in the same directory of this file.")
 
+(defvar riece-ruby-server-program-arguments (list "-o" riece-ruby-out-file
+						  "-e" riece-ruby-err-file
+						  "-l" riece-ruby-log-file)
+  "Command line arguments passed to `riece-ruby-server-program'.")
+
 (defvar riece-ruby-process nil
-  "Process object of the Ruby interpreter.")
+  "Process object of Ruby interpreter.")
 
 (defvar riece-ruby-lock nil
   "Lock for waiting server response.
@@ -81,6 +107,8 @@ Local to the process buffer.")
   "Status from server.
 Local to the process buffer.")
 
+(defvar riece-ruby-output-queue-alist nil
+  "An alist mapping from program name to output data.")
 (defvar riece-ruby-output-handler-alist nil
   "An alist mapping from program name to output handler.
 Output handlers are called every time \"# output\" line arrives.
@@ -156,7 +184,7 @@ Use `riece-ruby-set-property' to set this variable.")
     (set-buffer (process-buffer process))
     (goto-char (point-max))
     (insert input)
-    (goto-char (process-mark process))
+    (goto-char (point-min))
     (beginning-of-line)
     (while (looking-at ".*\r\n")
       (if (looking-at "OK\\( \\(.*\\)\\)?\r")
@@ -171,7 +199,7 @@ Use `riece-ruby-set-property' to set this variable.")
 	    (progn
 	      (setq riece-ruby-escaped-data nil
 		    riece-ruby-response
-		    (list 'ERR (string-to-number (match-string 2))
+		    (list 'ERR (string-to-number (match-string 1))
 			  (match-string 3))
 		    riece-ruby-lock nil))
 	  (if (looking-at "D \\(.*\\)\r")
@@ -187,23 +215,38 @@ Use `riece-ruby-set-property' to set this variable.")
 		      (riece-ruby-run-exit-handler
 		       (cdr (car riece-ruby-status-alist)))))
 	      (if (looking-at "# output \\([^ ]*\\) \\(.*\\)\r")
-		  (let ((entry (assoc (match-string 1)
-				      riece-ruby-output-handler-alist)))
-		    (if entry
-			(funcall (cdr entry) (car entry) (match-string 2))))
+		  (riece-ruby-run-output-handler (match-string 1)
+						 (match-string 2)
+						 (current-time))
 		(if (looking-at "# exit \\(.*\\)\r")
 		    (riece-ruby-run-exit-handler (match-string 1))))))))
       (forward-line))
-    (set-marker (process-mark process) (point-marker))))
+    (delete-region (point-min) (point))))
 
 (defun riece-ruby-run-exit-handler (name)
   (let ((entry (assoc name riece-ruby-exit-handler-alist)))
-    (if entry
-	(progn
-	  (setq riece-ruby-exit-handler-alist
-		(delq entry riece-ruby-exit-handler-alist))
-	  (funcall (cdr entry) (car entry))
-	  (riece-ruby-clear name)))))
+    (when entry
+      (setq riece-ruby-exit-handler-alist
+	    (delq entry riece-ruby-exit-handler-alist))
+      (riece-funcall-ignore-errors (if (symbolp (cdr entry))
+				       (symbol-name (cdr entry))
+				     (format "%s-exit-handler" name))
+				   (cdr entry) (car entry))
+      (riece-ruby-clear name))))
+
+(defun riece-ruby-run-output-handler (name output time)
+  (let ((handler-entry (assoc name riece-ruby-output-handler-alist))
+	(entry (assoc name riece-ruby-output-queue-alist)))
+    (if handler-entry
+	(riece-funcall-ignore-errors (if (symbolp (cdr handler-entry))
+					 (symbol-name (cdr handler-entry))
+				       (format "%s-output-handler" name))
+				     (cdr handler-entry) name output time)
+      (if entry
+	  (setcdr entry (cons output (cdr entry)))
+	(setq riece-ruby-output-queue-alist
+	      (cons (list name (cons output time))
+		    riece-ruby-output-queue-alist))))))
 
 (defun riece-ruby-sentinel (process status)
   (kill-buffer (process-buffer process)))
@@ -217,15 +260,11 @@ Return a string name assigned by the server."
 	  (coding-system-for-write 'binary)
 	  (coding-system-for-read 'binary))
       (setq riece-ruby-process
-	    (start-process "riece-ruby" (generate-new-buffer " *Ruby*")
-			   riece-ruby-command
-			   (if (file-name-absolute-p riece-ruby-server-program)
-			       riece-ruby-server-program
-			     (expand-file-name
-			      riece-ruby-server-program
-			      (file-name-directory
-			       (locate-library
-				(symbol-file 'riece-ruby-execute)))))))
+	    (apply #'start-process "riece-ruby" (generate-new-buffer " *Ruby*")
+		   riece-ruby-command
+		   (expand-file-name riece-ruby-server-program
+				     riece-data-directory)
+		   riece-ruby-server-program-arguments))
       (process-kill-without-query riece-ruby-process)
       (set-process-filter riece-ruby-process #'riece-ruby-filter)
       (set-process-sentinel riece-ruby-process #'riece-ruby-sentinel)))
@@ -300,11 +339,24 @@ is specified.  Otherwise, it should be called explicitly."
   "Set an output-handler HANDLER for the program distinguished by NAME.
 An output-handler is called when the program sends any output by using
 `output' method in the Ruby program.
-An output-handler is called with two argument.  The first argument is
-the same as NAME.  The second argument is output string."
-  (let ((entry (assoc name riece-ruby-output-handler-alist)))
+An output-handler is called with three argument.  The first argument
+is the same as NAME.  The second argument is the output string.  The
+third argument is the timestamp of the output event."
+  (let ((entry (assoc name riece-ruby-output-handler-alist))
+	queue-entry pointer)
     (if handler
 	(progn
+	  (when (setq queue-entry (assoc name riece-ruby-output-queue-alist))
+	    (setq pointer (nreverse (cdr queue-entry))
+		  riece-ruby-output-queue-alist
+		  (delq queue-entry riece-ruby-output-queue-alist))
+	    (while pointer
+	      (riece-funcall-ignore-errors (if (symbolp handler)
+					       (symbol-name handler)
+					     (format "%s-output-handler" name))
+					   handler name (car (car pointer))
+					   (cdr (car pointer)))
+	      (setq pointer (cdr pointer))))
 	  (if entry
 	      (setcdr entry handler)
 	    (setq riece-ruby-output-handler-alist