Remove compiled binary on buffer close.

Also all 'rs-' renamed to 'rust-'.

Author: grafov

rs-playground.el

@@ -1,11 +1,11 @@
-;;; rs-playground.el --- Local Rust playground for short code snippets.
+;;; rust-playground.el --- Local Rust playground for short code snippets.
 
 ;; Copyright (C) 2016  Alexander I.Grafov (axel)
 
 ;; Author: Alexander I.Grafov <[email protected]>
-;; URL: https://github.com/grafov/rs-playground
+;; URL: https://github.com/grafov/rust-playground
 ;; Keywords: tools, rust
-;; Package-Requires: ((emacs "24") (rust-mode "1.0.0"))
+;; Package-Requires: ((emacs "24") (rust-mode "0.3.0"))
 
 ;; 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
@@ -23,7 +23,7 @@
 ;;; Commentary:
 
 ;; Local playground for the Rust programs similar to play.rust-lang.org.
-;; `M-x rs-playground` and type you rust code then make&run it with `C-Return`.
+;; `M-x rust-playground` and type you rust code then make&run it with `C-Return`.
 
 ;; Playground works in conjunction with `rust-mode` and requires
 ;; preconfigured environment for Rust language.
@@ -46,46 +46,44 @@
   :type 'string
   :group 'rust-mode)
 
-(defgroup rs-playground nil
+(defgroup rust-playground nil
   "Options specific to Rust Playground."
   :group 'rust-mode)
 
-(defcustom rs-playground-ask-file-name nil
+(defcustom rust-playground-ask-file-name nil
   "Non-nil means we ask for a name for the snippet.
 
 By default it will be created as snippet.go"
   :type 'boolean
-  :group 'rs-playground)
+  :group 'rust-playground)
 
-(defcustom rs-playground-confirm-deletion t
-  "Non-nil means you will be asked for confirmation on the snippet deletion with `rs-playground-rm'.
+(defcustom rust-playground-confirm-deletion t
+  "Non-nil means you will be asked for confirmation on the snippet deletion with `rust-playground-rm'.
 
 By default confirmation required."
   :type 'boolean
-  :group 'rs-playground)
+  :group 'rust-playground)
 
-(defcustom rs-playground-basedir "~/rs-playground"
+(defcustom rust-playground-basedir (locate-user-emacs-file "rust-playground")
   "Base directory for playground snippets."
-  :group 'rs-playground)
+  :group 'rust-playground)
 
-(defvar-local rs-playground-current-snippet-file "snippet.rs"
+(defvar-local rust-playground-current-snippet-file "snippet.rs"
   "The current snippet file.")
 
-(define-minor-mode rs-playground-mode
+(define-minor-mode rust-playground-mode
   "A place for playing with golang code and export it in short snippets."
   :init-value nil
-  :lighter ""
-  :keymap '(([C-return] . rs-playground-exec))
-  (setq mode-name "Play(Rust)"))
-
-(defun rs-playground-snippet-file-name(&optional snippet-name)
- (setq-local rs-playground-current-snippet-file (let ((file-name (cond (snippet-name)
-                         (rs-playground-ask-file-name
-                          (read-string "Rust Playground filename: "))
-                         ("snippet"))))
-    (concat (rs-playground-snippet-unique-dir file-name) "/" file-name ".rs"))))
-
-(defun rs-playground-exec ()
+  :lighter "Play(Rust)"
+  :keymap '(([C-return] . rust-playground-exec)))
+
+(defun rust-playground-snippet-file-name(&optional snippet-name)
+ (setq-local rust-playground-current-snippet-file (let ((file-name (cond (snippet-name)
+                         (rust-playground-ask-file-name
+                           (read-string "Rust Playground filename: ")) ("snippet"))))
+    (concat (rust-playground-snippet-unique-dir file-name) "/" file-name ".rs"))))
+
+(defun rust-playground-exec ()
   "Save the buffer then runs Rust compiler for executing the code."
   (interactive)
   (make-local-variable 'compile-command)
@@ -94,83 +92,89 @@ By default confirmation required."
 	(compile (concat rust-bin " " snippet-file " -o snippet && " (file-name-directory snippet-file) "snippet"))))
 
 ;;;###autoload
-(defun rs-playground ()
+(defun rust-playground ()
   "Run playground for Rust language in a new buffer."
   (interactive)
-  (let ((snippet-file-name (rs-playground-snippet-file-name)))
+  (let ((snippet-file-name (rust-playground-snippet-file-name)))
     (switch-to-buffer (create-file-buffer snippet-file-name))
-	(rs-playground-insert-template-head "snippet of code")
+    (add-hook 'kill-buffer-hook 'rust-playground-on-buffer-kill nil t)
+	(rust-playground-insert-template-head "snippet of code")
 (insert "fn main() {
 
     println!(\"Results:\")
 
-}
-")
-    (backward-char 3)
-    (rust-mode)
-    (rs-playground-mode)
-    (set-visited-file-name snippet-file-name t)))
+}")
+(backward-char 3)
+(rust-mode)
+(rust-playground-mode)
+(set-visited-file-name snippet-file-name t)))
+
+; remove compiled binary from snippet dir but not touch source files
+(defun rust-playground-on-buffer-kill ()
+  (if (string-match-p (file-truename rust-playground-basedir) (file-truename (buffer-file-name)))
+	  (delete-file (concat (file-name-directory (buffer-file-name)) "snippet"))))
 
-(defun rs-playground-insert-template-head (description)
-  (insert "// -*- mode:rust;mode:rs-playground -*-
+(defun rust-playground-insert-template-head (description)
+  (insert "// -*- mode:rust;mode:rust-playground -*-
 // " description " @ " (time-stamp-string "%:y-%02m-%02d %02H:%02M:%02S") "
 
 // === Rust Playground ===
 // Execute the snippet with Ctl-Return
-// Remove the snippet completely with its dir and all files M-x `rs-playground-rm`
+// Remove the snippet completely with its dir and all files M-x `rust-playground-rm`
 
 "))
 
 ;;;###autoload
-(defun rs-playground-rm ()  
+(defun rust-playground-rm ()  
   "Remove files of the current snippet together with directory of this snippet."
   (interactive)
-  (if (string-match-p (file-truename rs-playground-basedir) (file-truename (buffer-file-name)))
-      (if (or (not rs-playground-confirm-deletion)
+  (if (string-match-p (file-truename rust-playground-basedir) (file-truename (buffer-file-name)))
+      (if (or (not rust-playground-confirm-deletion)
 	       (y-or-n-p (format "Do you want delete whole snippet dir %s? "
 				 (file-name-directory (buffer-file-name)))))
 		  (progn
 			(save-buffer)
 			(delete-directory (file-name-directory (buffer-file-name)) t t)
+			(remove-hook 'kill-buffer-hook 'rust-playground-on-buffer-kill t)
 			(kill-buffer)))
 	(message "Won't delete this! Because %s is not under the path %s. Remove the snippet manually!"
-			 (buffer-file-name) rs-playground-basedir)))
+			 (buffer-file-name) rust-playground-basedir)))
 
 ;; ;;;###autoload
-;; (defun rs-playground-download (url)
+;; (defun rust-playground-download (url)
 ;;   "Download a paste from the play.golang.org and insert it in a new local playground buffer.
 ;; Tries to look for a URL at point."
 ;;   (interactive (list (read-from-minibuffer "Playground URL: " (ffap-url-p (ffap-string-at-point 'url)))))
 ;;   (with-current-buffer
 ;;       (let ((url-request-method "GET") url-request-data url-request-extra-headers)
 ;;         (url-retrieve-synchronously (concat url ".go")))
-;;     (let* ((snippet-file-name (rs-playground-snippet-file-name)) (buffer (create-file-buffer snippet-file-name)))
+;;     (let* ((snippet-file-name (rust-playground-snippet-file-name)) (buffer (create-file-buffer snippet-file-name)))
 ;;       (goto-char (point-min))
 ;;       (re-search-forward "\n\n")
 ;;       (copy-to-buffer buffer (point) (point-max))
 ;;       (kill-buffer)
 ;;       (with-current-buffer buffer
 ;; 		(goto-char (point-min))
-;; 		(rs-playground-insert-template-head (concat url " imported"))
+;; 		(rust-playground-insert-template-head (concat url " imported"))
 ;; 		(rust-mode)
-;; 		(rs-playground-mode)
+;; 		(rust-playground-mode)
 ;; 		(set-visited-file-name snippet-file-name t)
 ;;         (switch-to-buffer buffer)))))
 
-;; (defun rs-playground-upload ()
+;; (defun rust-playground-upload ()
 ;;   "Upload the current buffer to play.golang.org and return the short URL of the playground."
 ;;   (interactive)
 ;;   (goto-char (point-min))
 ;;   (forward-line)
 ;;   (insert (rust-playpen-buffer)))
 
-(defun rs-playground-snippet-unique-dir (prefix)
-  "Get unique directory under `rs-playground-basedir`."
-  (let ((dir-name (concat rs-playground-basedir "/"
-                          (if (and prefix rs-playground-ask-file-name) (concat prefix "-"))
+(defun rust-playground-snippet-unique-dir (prefix)
+  "Get unique directory under `rust-playground-basedir`."
+  (let ((dir-name (concat rust-playground-basedir "/"
+                          (if (and prefix rust-playground-ask-file-name) (concat prefix "-"))
                           (time-stamp-string "at-%:y-%02m-%02d-%02H%02M%02S"))))
     (make-directory dir-name t)
     dir-name))
 
-(provide 'rs-playground)
-;;; rs-playground.el ends here
+(provide 'rust-playground)
+;;; rust-playground.el ends here