From: Bruno Barbier <brubar.cs@gmail.com>
To: Ihor Radchenko <yantar92@gmail.com>
Cc: Felix Freeman <libsys@hacktivista.org>, emacs-orgmode@gnu.org
Subject: Re: [BUG] ob-shell: cmdline and stdin broken when used with TRAMP
Date: Sun, 04 Sep 2022 19:08:28 +0200 [thread overview]
Message-ID: <E1oUt3X-0001OI-88@lists.gnu.org> (raw)
In-Reply-To: <87h71nxyej.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
Ihor Radchenko <yantar92@gmail.com> writes:
>
> '->` :: `process-file'
>
Sorry: fixed.
> > lib/ob-shell.el (org-babel-sh-evaluate): Use `process-file' (instead
>
> lisp/ob-shell.el
Thanks.
>
>> + (with-connection-local-variables
>
> I tried to test your patch on various Emacs versions.
> `with-connection-local-variables' is not yet available in Emacs 26.
> Emacs 26 has `with-connection-local-profiles' though I am not sure if it
> is a full equivalent. If not, you may need to create a compatibility
> wrapper for Emacs 26.
Indeed. It's been renamed/changed in Emacs 27.
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=21f54feee8c83e2c5fd8eeb6741cbd479a7b19eb
I'm now adding a version of `with-connection-local-variables', in
org-compat.el: that should work for 26. I didn't test it as I currently
don't have an Emacs 26. But I should be able to compile one, if you think
it's needed.
Thank you for spotting this and pointing me to `with-connection-local-profiles'.
Thank you again, Ihor, for the review and the testing.
Let me know if you see further improvements,
Bruno
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 7867 bytes --]
From 9ed2f6d9e2c8bd7dd219e98ff7983fa53fd0686f Mon Sep 17 00:00:00 2001
From: Bruno BARBIER <brubar.cs@gmail.com>
Date: Sat, 18 Jun 2022 09:48:01 +0200
Subject: [PATCH] ob-shell: Use `process-file' when stdin or cmdline
lisp/ob-shell.el (org-babel-sh-evaluate): Use `process-file' (instead
of `call-process-shell-command') so that `org-babel-sh-evaluate' will
invoke file name handlers based on `default-directory', if needed,
like when using a remote directory.
lisp/org-compat.el (with-connection-local-variables): New
compatibility macro.
testing/lisp/test-ob-shell.el (ob-shell/remote-with-stdin-or-cmdline):
New test.
testing/org-test.el (org-test-with-tramp-remote-dir): New macro.
Fixes https://list.orgmode.org/CKMOBWBK709F.1RUN69SRWB64U@laptop/.
---
lisp/ob-shell.el | 16 +++++++-----
lisp/org-compat.el | 10 +++++++
testing/lisp/test-ob-shell.el | 49 +++++++++++++++++++++++++++++++++++
testing/org-test.el | 29 +++++++++++++++++++++
4 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 44efb4ea1..51071d40a 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -279,12 +279,16 @@ (defun org-babel-sh-evaluate (session body &optional params stdin cmdline)
(set-file-modes script-file #o755)
(with-temp-file stdin-file (insert (or stdin "")))
(with-temp-buffer
- (call-process-shell-command
- (concat (if shebang script-file
- (format "%s %s" shell-file-name script-file))
- (and cmdline (concat " " cmdline)))
- stdin-file
- (current-buffer))
+ (with-connection-local-variables
+ (apply #'process-file
+ (if shebang (file-local-name script-file)
+ shell-file-name)
+ stdin-file
+ (current-buffer)
+ nil
+ (if shebang (when cmdline (list cmdline))
+ (list shell-command-switch
+ (concat (file-local-name script-file) " " cmdline)))))
(buffer-string))))
(session ; session evaluation
(mapconcat
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 91972ef9c..501e64bdb 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -221,6 +221,16 @@ (if (fboundp 'string-distance)
(define-obsolete-function-alias 'org-babel-edit-distance 'org-string-distance
"9.5")
+(unless (fboundp 'with-connection-local-variables)
+ ;; Added in Emacs 27: commit:21f54feee8, 2019-03-09.
+ ;; Redefining it using the old function `with-connection-local-profiles'.
+ (defmacro with-connection-local-variables (&rest body)
+ "Apply connection-local variables according to `default-directory'.
+Execute BODY, and unwind connection-local variables."
+ (declare (debug t))
+ `(with-connection-local-profiles (connection-local-get-profiles)
+ ,@body)))
+
\f
;;; Emacs < 26.1 compatibility
diff --git a/testing/lisp/test-ob-shell.el b/testing/lisp/test-ob-shell.el
index 2f346f699..442e70372 100644
--- a/testing/lisp/test-ob-shell.el
+++ b/testing/lisp/test-ob-shell.el
@@ -106,6 +106,55 @@ (ert-deftest ob-shell/simple-list ()
"#+BEGIN_SRC sh :results output :var l='(1 2)\necho ${l}\n#+END_SRC"
(org-trim (org-babel-execute-src-block))))))
+(ert-deftest ob-shell/remote-with-stdin-or-cmdline ()
+ "Test :stdin and :cmdline with a remote directory."
+ ;; We assume 'default-directory' is a local directory.
+ (skip-unless (not (memq system-type '(ms-dos windows-nt))))
+ (org-test-with-tramp-remote-dir remote-dir
+ (dolist (spec `( ()
+ (:dir ,remote-dir)
+ (:dir ,remote-dir :cmdline t)
+ (:dir ,remote-dir :stdin t)
+ (:dir ,remote-dir :cmdline t :shebang t)
+ (:dir ,remote-dir :stdin t :shebang t)
+ (:dir ,remote-dir :cmdline t :stdin t :shebang t)
+ (:cmdline t)
+ (:stdin t)
+ (:cmdline t :shebang t)
+ (:stdin t :shebang t)
+ (:cmdline t :stdin t :shebang t)))
+ (let ((default-directory (or (plist-get spec :dir) default-directory))
+ (org-confirm-babel-evaluate nil)
+ (params-line "")
+ (who-line " export who=tramp")
+ (args-line " echo ARGS: --verbose 23 71"))
+ (when-let ((dir (plist-get spec :dir)))
+ (setq params-line (concat params-line " " ":dir " dir)))
+ (when (plist-get spec :stdin)
+ (setq who-line " read -r who")
+ (setq params-line (concat params-line " :stdin input")))
+ (when (plist-get spec :cmdline)
+ (setq args-line " echo \"ARGS: $*\"")
+ (setq params-line (concat params-line " :cmdline \"--verbose 23 71\"")))
+ (when (plist-get spec :shebang)
+ (setq params-line (concat params-line " :shebang \"#!/bin/sh\"")))
+ (let* ((result (org-test-with-temp-text
+ (mapconcat #'identity
+ (list "#+name: input"
+ "tramp"
+ ""
+ (concat "<point>"
+ "#+begin_src sh :results output " params-line)
+ args-line
+ who-line
+ " echo \"hello $who from $(pwd)/\""
+ "#+end_src")
+ "\n")
+ (org-trim (org-babel-execute-src-block))))
+ (expected (concat "ARGS: --verbose 23 71"
+ "\nhello tramp from " (file-local-name default-directory))))
+ (should (equal result expected)))))))
+
(provide 'test-ob-shell)
;;; test-ob-shell.el ends here
diff --git a/testing/org-test.el b/testing/org-test.el
index 0520e82f9..7e5d60e63 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -284,6 +284,35 @@ (defun org-test-table-target-expect (target &optional expect laps
;; on multiple lines in the ERT results buffer.
(setq pp-escape-newlines back)))))
+(defun org-test-with-tramp-remote-dir--worker (body)
+ "Worker for 'org-test-with-tramp-remote-dir'."
+ (let ((env-def (getenv "REMOTE_TEMPORARY_FILE_DIRECTORY")))
+ (cond
+ (env-def (funcall body env-def))
+ ((eq system-type 'windows-nt) (funcall body null-device))
+ (t (require 'tramp)
+ (let ((tramp-methods
+ (cons '("mock"
+ (tramp-login-program "sh")
+ (tramp-login-args (("-i")))
+ (tramp-remote-shell "/bin/sh")
+ (tramp-remote-shell-args ("-c"))
+ (tramp-connection-timeout 10))
+ tramp-methods))
+ (tramp-default-host-alist
+ `(("\\`mock\\'" nil ,(system-name)))))
+ (funcall body (format "/mock::%s" temporary-file-directory)))))))
+
+(defmacro org-test-with-tramp-remote-dir (dir &rest body)
+ "Bind the symbol DIR to a remote directory and execute BODY.
+Return the value of the last form in BODY. The directory DIR
+will be something like \"/mock::/tmp/\", which allows to test
+Tramp related features. We mostly follow
+`tramp-test-temporary-file-directory' from GNU Emacs tests."
+ (declare (debug (sexp body)) (indent 2))
+ `(org-test-with-tramp-remote-dir--worker (lambda (,dir) ,@body)))
+
+
\f
;;; Navigation Functions
--
2.35.1
next prev parent reply other threads:[~2022-09-04 17:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 18:42 [BUG] ob-shell: cmdline and stdin broken when used with TRAMP Felix Freeman via General discussions about Org-mode.
2022-06-18 18:54 ` Bruno Barbier
2022-06-23 12:46 ` Ihor Radchenko
2022-09-03 17:20 ` Bruno Barbier
2022-09-04 9:49 ` Ihor Radchenko
2022-09-04 17:08 ` Bruno Barbier [this message]
2022-09-05 10:33 ` Ihor Radchenko
2022-09-06 17:04 ` Bruno Barbier
2022-09-05 8:16 ` Bastien Guerry
2022-09-06 17:03 ` Bruno Barbier
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=E1oUt3X-0001OI-88@lists.gnu.org \
--to=brubar.cs@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=libsys@hacktivista.org \
--cc=yantar92@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).