Skip to content

Commit

Permalink
finished implementing remote jack-in support, using ssh tunnels by de…
Browse files Browse the repository at this point in the history 
…fault
  • Loading branch information
@tavisrudd
tavisrudd committed Jan 24, 2012
1 parent 250c147 commit d831b52
Showing 1 changed file with 93 additions and 44 deletions.
137 changes: 93 additions & 44 deletions clojure-mode.el
View file
Expand Up @@ -949,15 +949,57 @@ returned."
;; Pipe to $SHELL to work around mackosecks GUI Emacs $PATH issues.
(defcustom clojure-swank-command
(if (or (locate-file "lein" exec-path) (locate-file "lein.bat" exec-path))
"lein jack-in %s %s"
"echo \"lein jack-in %s %s\" | $SHELL -l")
"lein jack-in %s"
"echo \"lein jack-in %s\" | $SHELL -l")
"The command used to start swank via clojure-jack-in.
For remote swank it is lein must be in your PATH and the remote
proc is launched via sh rather than bash, so it might be necessary
to specific the full path to it. The arguments are port, hostname."
to specific the full path to it. The argument is the port to connect on.
Localhost is assumed."
:type 'string
:group 'clojure-mode)

(defcustom clojure-generate-remote-swank-command-function
'clojure-generate-remote-swank-command-ssh-tunnel
"A function that is called to determine the swank command that
`clojure-jack-in` will execute and the hostname/port that slime
should connect to for remote projects that are opened via tramp.
The arguments are dir, hostname, and port. The return value should be an `alist` of the form
(:cmd \"command string\" :hostname \"hostname\" :port 1234)"
:type 'function
:group 'clojure-mode)

(defun clojure-generate-local-swank-command-default (dir hostname port)
(if (not (string-equal "localhost" hostname))
(error (concat
"If you need to jack-in to remote projects/jvms over tramp, "
"you need to define a custom `clojure-generate-swank-command-function`"))
(list :cmd (format clojure-swank-command port)
:hostname hostname
:port port)))

(defun clojure-generate-remote-swank-command-ssh-tunnel (dir hostname port)
(destructuring-bind (_method user host localname)
(append (tramp-dissect-file-name dir) nil)
(list :cmd (format-spec
"ssh -L %p:localhost:%p -l '%u' '%h' 'cd \'%d\'; lein jack-in \'%p\''"
`((?p . ,port)
(?h . ,host)
(?u . ,(or user (getenv "USER")))
(?d . ,localname)))
:hostname "localhost"
:port port)))

(defun clojure-generate-swank-cmd (dir hostname port)
(if (file-remote-p dir)
(if (functionp clojure-generate-remote-swank-command-function)
(funcall clojure-generate-remote-swank-command-function dir hostname port)
(error (concat
"If you need to jack-in to remote projects/jvms over tramp "
"you need to define a custom `clojure-generate-remote-swank-command-function`")))
(clojure-generate-local-swank-command-default dir hostname port)))

(defun clojure-jack-in-sentinel (process event)
(let ((debug-on-error t))
(error "Could not start swank server: %s"
Expand Down Expand Up @@ -985,54 +1027,63 @@ to specific the full path to it. The arguments are port, hostname."
(set-process-query-on-exit-flag process nil))
(kill-buffer swank-buffer-name))))

(defun clojure-generate-swank-connection-name (dir hostname port)
(defun clojure-generate-swank-connection-name (dir hostname)
"swank")

(defun clojure-jack-in-start-process (swank-connection-name swank-buffer-name hostname port)
;; the buffer has to be created before the proc:
(defun clojure-jack-in-start-process (swank-connection-name swank-buffer-name dir hostname)
;; The buffer has to be created before the proc if
;; `start-file-process-shell-command` is used. It doesn't hurt to do
;; it now even if `start-process-shell-command` is used:
(get-buffer-create swank-buffer-name)

(let ((swank-cmd (format clojure-swank-command port hostname)))
(lexical-let* ((proc (start-file-process-shell-command
swank-connection-name
swank-buffer-name
swank-cmd))
(hostname hostname)
(port port)
(connect-callback (lambda () (slime-connect hostname port))))
(set-process-sentinel proc 'clojure-jack-in-sentinel)
(set-process-query-on-exit-flag proc nil)
(set-process-filter proc
(lambda (process output)
(with-current-buffer (process-buffer process)
(insert output))
(when (string-match "proceed to jack in" output)
(clojure-eval-bootstrap-region process)
(with-current-buffer
;; this block is an attempt to avoid
;; creating duplicate repl windows
(or
(get-buffer "*slime-repl clojure*")
(get-buffer "*slime-repl nil*")
(current-buffer))
(funcall connect-callback)
(when (string-match "slime-repl" (buffer-name))
(goto-char (point-max))))
(set-process-sentinel process nil)
(set-process-filter process nil)))))))
(let ((port (- 65535 (mod (caddr (current-time)) 4096))))
(destructuring-bind (&key cmd hostname port)
(clojure-generate-swank-cmd dir hostname port)
(lexical-let* ((proc (start-process-shell-command
;; this command runs locally
;; `start-file-process-shell-command` would
;; run remote for tramp buffers
swank-connection-name
swank-buffer-name
cmd))
(dir dir)
(hostname hostname)
(port port)
(connect-callback (lambda () (slime-connect hostname port))))
(set-process-sentinel proc 'clojure-jack-in-sentinel)
(set-process-query-on-exit-flag proc nil)
(set-process-filter proc
(lambda (process output)
(with-current-buffer (process-buffer process)
(insert output))
(when (string-match "proceed to jack in" output)
(clojure-eval-bootstrap-region process)
(with-current-buffer
;; this block is an attempt to avoid
;; creating duplicate repl windows
(or
(get-buffer "*slime-repl clojure*")
(get-buffer "*slime-repl nil*")
(current-buffer))
(funcall connect-callback)
(when (string-match "slime-repl" (buffer-name))
;; this is most likely an old repl
;; buffer that existed prior to the
;; jack-in call.
(setq default-directory dir)
(goto-char (point-max))))
(set-process-sentinel process nil)
(set-process-filter process nil))))))))

;;;###autoload
(defun clojure-jack-in ()
(interactive)
(setq slime-net-coding-system 'utf-8-unix)
(let* ((port (- 65535 (mod (caddr (current-time)) 4096)))
(dir default-directory)
(let* ((dir default-directory)
(hostname (if (file-remote-p default-directory)
tramp-current-host
"localhost"))
(swank-connection-name
(clojure-generate-swank-connection-name dir hostname port))
(swank-buffer-name (format "*%s*" swank-connection-name)))
tramp-current-host "localhost"))
(connection-name (clojure-generate-swank-connection-name dir hostname))
(swank-buffer-name (format "*%s*" connection-name)))

(when (and (functionp 'slime-disconnect)
(slime-current-connection)
Expand All @@ -1041,9 +1092,7 @@ to specific the full path to it. The arguments are port, hostname."
)
(slime-disconnect))
(clojure-kill-swank-buffer swank-buffer-name)
(clojure-jack-in-start-process swank-connection-name
swank-buffer-name
hostname port))
(clojure-jack-in-start-process connection-name swank-buffer-name dir hostname))
(message "Starting swank server..."))

(defun clojure-find-ns ()
Expand Down

0 comments on commit d831b52

Please sign in to comment.