From: Eric Schulte <schulte.eric@gmail.com>
To: Oleh <ohwoeowho@gmail.com>
Cc: org mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] ob-ruby.el fix for :session parameter
Date: Mon, 21 Oct 2013 13:09:53 -0600 [thread overview]
Message-ID: <87y55msany.fsf@gmail.com> (raw)
In-Reply-To: <CAA01p3ozN6xPdzDON5kKVe4rKtaw92q_XX0p4z-ykT7w7imcgA@mail.gmail.com> (Oleh's message of "Mon, 21 Oct 2013 19:55:18 +0200")
Applied, Thanks!
Oleh <ohwoeowho@gmail.com> writes:
> Hi Eric,
>
> Here's the update.
>
> regards,
> Oleh
>
> On Mon, Oct 21, 2013 at 7:42 PM, Eric Schulte <schulte.eric@gmail.com> wrote:
>> Hi Oleh,
>>
>> Thanks for submitting this patch. Instead of the current progn/setq
>> approach could you simply add your the "conf.echo=false\n" lines to the
>> following list?
>>
>> (list body org-babel-ruby-eoe-indicator)
>>
>> With that change I'd be happy to apply this patch.
>>
>> Also, extra thanks for submitting tests along with your patch, much
>> appreciated!
>>
>> Oleh <ohwoeowho@gmail.com> writes:
>>
>>> Hi all,
>>>
>>> I attach a patch to change from this behavior:
>>>
>>> #+begin_src ruby :session :results output
>>> s = "1"
>>> s = "2"
>>> s = "3"
>>> puts s
>>> #+end_src
>>>
>>> #+RESULTS:
>>> : => "1"
>>> : => "2"
>>> : => "3"
>>> : 3
>>>
>>> To this behavior
>>>
>>> #+begin_src ruby :session :results output
>>> s = "1"
>>> s = "2"
>>> s = "3"
>>> puts s
>>> #+end_src
>>>
>>> #+RESULTS:
>>> :
>>> : 3
>>>
>>> I just wrap the code in "conf.echo=false\n" and "\nconf.echo=true\n".
>>> I have to set it back to true, otherwise it hangs.
>>>
>>> regards,
>>> Oleh
>>>
>>> From e27f248f58258b78280e69cd78140e935527245e Mon Sep 17 00:00:00 2001
>>> From: Oleh Krehel <ohwoeowho@gmail.com>
>>> Date: Mon, 21 Oct 2013 13:03:28 +0200
>>> Subject: [PATCH] ob-ruby.el: fix result of :results output :session
>>> combination.
>>>
>>> * lisp/ob-ruby.el (org-babel-ruby-evaluate):
>>> set conf.echo=false for the duration of evaluation.
>>>
>>> * testing/lisp/test-ob-ruby.el (test-ob-ruby/session-output): new test.
>>> ---
>>> lisp/ob-ruby.el | 32 +++++++++++++++--------------
>>> testing/lisp/test-ob-ruby.el | 49 ++++++++++++++++++++++++++++++++++++++++++++
>>> 2 files changed, 66 insertions(+), 15 deletions(-)
>>> create mode 100644 testing/lisp/test-ob-ruby.el
>>>
>>> diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
>>> index af52831..ddbd0f8 100644
>>> --- a/lisp/ob-ruby.el
>>> +++ b/lisp/ob-ruby.el
>>> @@ -213,21 +213,23 @@ return the value of the last statement in BODY, as elisp."
>>> ;; comint session evaluation
>>> (case result-type
>>> (output
>>> - (mapconcat
>>> - #'identity
>>> - (butlast
>>> - (split-string
>>> - (mapconcat
>>> - #'org-babel-trim
>>> - (butlast
>>> - (org-babel-comint-with-output
>>> - (buffer org-babel-ruby-eoe-indicator t body)
>>> - (mapc
>>> - (lambda (line)
>>> - (insert (org-babel-chomp line)) (comint-send-input nil t))
>>> - (list body org-babel-ruby-eoe-indicator))
>>> - (comint-send-input nil t)) 2)
>>> - "\n") "[\r\n]")) "\n"))
>>> + (progn
>>> + (setq body (concat "conf.echo=false\n" body "\nconf.echo=true\n"))
>>> + (mapconcat
>>> + #'identity
>>> + (butlast
>>> + (split-string
>>> + (mapconcat
>>> + #'org-babel-trim
>>> + (butlast
>>> + (org-babel-comint-with-output
>>> + (buffer org-babel-ruby-eoe-indicator t body)
>>> + (mapc
>>> + (lambda (line)
>>> + (insert (org-babel-chomp line)) (comint-send-input nil t))
>>> + (list body org-babel-ruby-eoe-indicator))
>>> + (comint-send-input nil t)) 2)
>>> + "\n") "[\r\n]")) "\n")))
>>> (value
>>> (let* ((tmp-file (org-babel-temp-file "ruby-"))
>>> (ppp (or (member "code" result-params)
>>> diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
>>> new file mode 100644
>>> index 0000000..74cf163
>>> --- /dev/null
>>> +++ b/testing/lisp/test-ob-ruby.el
>>> @@ -0,0 +1,49 @@
>>> +;;; test-ob-ruby.el --- tests for ob-ruby.el
>>> +
>>> +;; Copyright (c) 2013 Oleh Krehel
>>> +;; Authors: Oleh Krehel
>>> +
>>> +;; This program is free software; you can redistribute it and/or modify
>>> +;; it under the terms of the GNU General Public License as published by
>>> +;; the Free Software Foundation, either version 3 of the License, or
>>> +;; (at your option) any later version.
>>> +
>>> +;; This program is distributed in the hope that it will be useful,
>>> +;; but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>>> +;; GNU General Public License for more details.
>>> +
>>> +;; You should have received a copy of the GNU General Public License
>>> +;; along with this program. If not, see <http://www.gnu.org/licenses/>.
>>> +
>>> +;;; Code:
>>> +(org-test-for-executable "ruby")
>>> +(unless (featurep 'ob-ruby)
>>> + (signal 'missing-test-dependency "Support for Ruby code blocks"))
>>> +
>>> +(ert-deftest test-ob-ruby/session-output ()
>>> + (should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
>>> +s = \"1\"
>>> +s = \"2\"
>>> +s = \"3\"
>>> +puts s
>>> +#+end_src"
>>> + (org-ctrl-c-ctrl-c)
>>> + (substring-no-properties
>>> + (buffer-string)))
>>> + "#+begin_src ruby :session :results output
>>> +s = \"1\"
>>> +s = \"2\"
>>> +s = \"3\"
>>> +puts s
>>> +#+end_src
>>> +
>>> +#+RESULTS:
>>> +:
>>> +: 3
>>> +
>>> +")))
>>> +
>>> +(provide 'test-ob-ruby)
>>> +
>>> +;;; test-ob-ruby.el ends here
>>
>> --
>> Eric Schulte
>> https://cs.unm.edu/~eschulte
>> PGP: 0x614CA05D
>
> From 089bbf66a7ba632a34dacb4f42479d7d55dd49bd Mon Sep 17 00:00:00 2001
> From: Oleh Krehel <ohwoeowho@gmail.com>
> Date: Mon, 21 Oct 2013 13:03:28 +0200
> Subject: [PATCH] ob-ruby.el: fix result of :results output :session
> combination.
>
> * lisp/ob-ruby.el (org-babel-ruby-evaluate):
> set conf.echo=false for the duration of evaluation.
>
> * testing/lisp/test-ob-ruby.el (test-ob-ruby/session-output): new test.
> ---
> lisp/ob-ruby.el | 2 +-
> testing/lisp/test-ob-ruby.el | 49 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644 testing/lisp/test-ob-ruby.el
>
> diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
> index af52831..eea517d 100644
> --- a/lisp/ob-ruby.el
> +++ b/lisp/ob-ruby.el
> @@ -225,7 +225,7 @@ return the value of the last statement in BODY, as elisp."
> (mapc
> (lambda (line)
> (insert (org-babel-chomp line)) (comint-send-input nil t))
> - (list body org-babel-ruby-eoe-indicator))
> + (list "conf.echo=false" body "conf.echo=true" org-babel-ruby-eoe-indicator))
> (comint-send-input nil t)) 2)
> "\n") "[\r\n]")) "\n"))
> (value
> diff --git a/testing/lisp/test-ob-ruby.el b/testing/lisp/test-ob-ruby.el
> new file mode 100644
> index 0000000..74cf163
> --- /dev/null
> +++ b/testing/lisp/test-ob-ruby.el
> @@ -0,0 +1,49 @@
> +;;; test-ob-ruby.el --- tests for ob-ruby.el
> +
> +;; Copyright (c) 2013 Oleh Krehel
> +;; Authors: Oleh Krehel
> +
> +;; This program is free software; you can redistribute it and/or modify
> +;; it under the terms of the GNU General Public License as published by
> +;; the Free Software Foundation, either version 3 of the License, or
> +;; (at your option) any later version.
> +
> +;; This program is distributed in the hope that it will be useful,
> +;; but WITHOUT ANY WARRANTY; without even the implied warranty of
> +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +;; GNU General Public License for more details.
> +
> +;; You should have received a copy of the GNU General Public License
> +;; along with this program. If not, see <http://www.gnu.org/licenses/>.
> +
> +;;; Code:
> +(org-test-for-executable "ruby")
> +(unless (featurep 'ob-ruby)
> + (signal 'missing-test-dependency "Support for Ruby code blocks"))
> +
> +(ert-deftest test-ob-ruby/session-output ()
> + (should (equal (org-test-with-temp-text "#+begin_src ruby :session :results output
> +s = \"1\"
> +s = \"2\"
> +s = \"3\"
> +puts s
> +#+end_src"
> + (org-ctrl-c-ctrl-c)
> + (substring-no-properties
> + (buffer-string)))
> + "#+begin_src ruby :session :results output
> +s = \"1\"
> +s = \"2\"
> +s = \"3\"
> +puts s
> +#+end_src
> +
> +#+RESULTS:
> +:
> +: 3
> +
> +")))
> +
> +(provide 'test-ob-ruby)
> +
> +;;; test-ob-ruby.el ends here
--
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D
next prev parent reply other threads:[~2013-10-21 19:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-21 11:15 [PATCH] ob-ruby.el fix for :session parameter Oleh
2013-10-21 17:42 ` Eric Schulte
2013-10-21 17:55 ` Oleh
2013-10-21 19:09 ` Eric Schulte [this message]
2014-09-20 21:54 ` Achim Gratz
2014-09-21 11:02 ` Achim Gratz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y55msany.fsf@gmail.com \
--to=schulte.eric@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=ohwoeowho@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).