diff options
author | Oleh Krehel <ohwoeowho@gmail.com> | 2013-10-21 13:03:28 +0200 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2013-10-21 13:09:28 -0600 |
commit | a24775dc7932ff840c6949f966331a769f0377e6 (patch) | |
tree | 3e7365343945222e11c33c628a400635fcf3c62c | |
parent | 7a17f8a5a7803977a4209f33da3d7e8a27a503de (diff) | |
download | org-mode-a24775dc7932ff840c6949f966331a769f0377e6.tar.gz |
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.
-rw-r--r-- | lisp/ob-ruby.el | 2 | ||||
-rw-r--r-- | testing/lisp/test-ob-ruby.el | 49 |
2 files changed, 50 insertions, 1 deletions
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 |