[PATCH] Update ob-ruby for inf-ruby 2.5

[PATCH] Update ob-ruby for inf-ruby 2.5

[Rick Frankel]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

inf-ruby (melpa stable) has recently been updated to v2.5. The library has
been significantly re-factored, and `run-ruby` no longer accepts `nil` has
the command name. The following patch updates ob-ruby so that it continues
to work w/ inf-ruby v2.5. It should still (untested) work with the previous
version (2.4).


rick


[-- Attachment #2: 0001-Update-ob-ruby-for-inf-ruby-2.5.patch --]
[-- Type: text/plain, Size: 1584 bytes --]

From aa836b45487e61de6e74b6edde3c07ab5b885eb8 Mon Sep 17 00:00:00 2001
From: Rick Frankel <rick@rickster.com>
Date: Mon, 26 Dec 2016 15:00:32 -0500
Subject: [PATCH] Update ob-ruby for inf-ruby 2.5

 * lisp/ob-ruby.el (org-babel-ruby-initiate-session): `run-ruby` has
   very different semantics in inf-ruby 2.5. Set ruby command to the
   default which used to be set by `run-ruby` and try and find already
   existing buffer before invocation.
---
 lisp/ob-ruby.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 6415f354b..e510fc753 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -150,12 +150,16 @@ If there is not a current inferior-process-buffer in SESSION
 then create one.  Return the initialized session."
   (unless (string= session "none")
     (require 'inf-ruby)
-    (let ((session-buffer (save-window-excursion
-			    (run-ruby nil session) (current-buffer))))
+    (let* ((cmd (cdr (assoc inf-ruby-default-implementation
+			    inf-ruby-implementations)))
+	   (buffer (get-buffer (format "*%s*" session)))
+	   (session-buffer (or buffer (save-window-excursion
+					(run-ruby cmd session)
+					(current-buffer)))))
       (if (org-babel-comint-buffer-livep session-buffer)
 	  (progn (sit-for .25) session-buffer)
-        (sit-for .5)
-        (org-babel-ruby-initiate-session session)))))
+	(sit-for .5)
+	(org-babel-ruby-initiate-session session)))))
 
 (defvar org-babel-ruby-eoe-indicator ":org_babel_ruby_eoe"
   "String to indicate that evaluation has completed.")
-- 
2.11.0

Re: [PATCH] Update ob-ruby for inf-ruby 2.5

[Nicolas Goaziou]

Hello,

Rick Frankel <rick@rickster.com> writes:

> inf-ruby (melpa stable) has recently been updated to v2.5. The library has
> been significantly re-factored, and `run-ruby` no longer accepts `nil` has
> the command name. The following patch updates ob-ruby so that it continues
> to work w/ inf-ruby v2.5. It should still (untested) work with the previous
> version (2.4).

I applied it to maint branch. Thank you.

Regards,

-- 
Nicolas Goaziou