Pass optional file arg to fule-mode-code-file

[factor.git] / misc / fuel / fuel-scaffold.el

diff --git a/misc/fuel/fuel-scaffold.el b/misc/fuel/fuel-scaffold.el
index 196ed83b0e68c822a12ad8501b05293ba827de1c..ab2a93495763e87aa4ae064d46f225c7cc6e342a 100644 (file)
--- a/misc/fuel/fuel-scaffold.el
+++ b/misc/fuel/fuel-scaffold.el
@@ -1,4 +1,4 @@
-;;; fuel-scaffold.el -- interaction with tools.scaffold
+;;; fuel-scaffold.el -- interaction with tools.scaffold -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 ;; See http://factorcode.org/license.txt for BSD license.
@@ -27,13 +27,6 @@
   "Options for FUEL's scaffolding."
   :group 'fuel)
 
-(defcustom fuel-scaffold-developer-name nil
-  "The name to be inserted as yours in scaffold templates."
-  :type '(choice string
-                 (const :tag "Factor's value for developer-name" nil))
-  :group 'fuel-scaffold)
-
-\f
 ;;; Auxiliary functions:
 
 (defun fuel-mode--code-file (kind &optional file)
@@ -44,19 +37,22 @@
                            (file-name-directory file)))))
 
 (defun fuel-mode--in-docs (&optional file)
-  (fuel-mode--code-file "docs"))
+  (fuel-mode--code-file "docs" file))
 
 (defun fuel-mode--in-tests (&optional file)
-  (fuel-mode--code-file "tests"))
+  (fuel-mode--code-file "tests" file))
 
 (defun fuel-scaffold--vocab-roots ()
-  (let ((cmd '(:fuel* (vocab-roots get :get) "fuel")))
-    (fuel-eval--retort-result (fuel-eval--send/wait cmd))))
+  (let ((cmd '(:fuel* (vocab-roots get)
+                      "fuel" ("namespaces" "vocabs.loader"))))
+    (nth 1 (fuel-eval--send/wait cmd))))
 
 (defun fuel-scaffold--dev-name ()
-  (or fuel-scaffold-developer-name
-      (let ((cmd '(:fuel* (developer-name get :get) "fuel")))
+  (or (let ((cmd '(:fuel* (developer-name get)
+                          "fuel"
+                          ("namespaces" "tools.scaffold"))))
         (fuel-eval--retort-result (fuel-eval--send/wait cmd)))
+      user-full-name
       "Your name"))
 
 (defun fuel-scaffold--first-vocab ()
@@ -92,17 +88,17 @@ IN: %s
       t)))
 
 (defsubst fuel-scaffold--create-docs (vocab)
-  (let ((cmd `(:fuel* (,vocab ,fuel-scaffold-developer-name fuel-scaffold-help)
+  (let ((cmd `(:fuel* (,vocab ,(fuel-scaffold--dev-name) fuel-scaffold-help)
                       "fuel")))
     (fuel-eval--send/wait cmd)))
 
 (defsubst fuel-scaffold--create-tests (vocab)
-  (let ((cmd `(:fuel* (,vocab ,fuel-scaffold-developer-name fuel-scaffold-tests)
+  (let ((cmd `(:fuel* (,vocab ,(fuel-scaffold--dev-name) fuel-scaffold-tests)
                       "fuel")))
     (fuel-eval--send/wait cmd)))
 
 (defsubst fuel-scaffold--create-authors (vocab)
-  (let ((cmd `(:fuel* (,vocab ,fuel-scaffold-developer-name
+  (let ((cmd `(:fuel* (,vocab ,(fuel-scaffold--dev-name)
                               fuel-scaffold-authors) "fuel")))
     (fuel-eval--send/wait cmd)))
 
@@ -145,8 +141,8 @@ IN: %s
 adds source and authors.txt files. Prompts the user for optional summary,
 tags, help, and test file creation.
 
-You can configure `fuel-scaffold-developer-name' (set by default to
-`user-full-name') for the name to be inserted in the generated files."
+You can configure `user-full-name' for the name to be inserted in
+the generated files."
   (interactive)
   (let* ((name (read-string "Vocab name: " name-hint))
          (root (completing-read "Vocab root: "
@@ -157,8 +153,8 @@ You can configure `fuel-scaffold-developer-name' (set by default to
          (platforms (read-string "Vocab platforms (empty for all): "))
          (help (y-or-n-p "Scaffold help? "))
          (tests (y-or-n-p "Scaffold tests? "))
-         (cmd `(:fuel* ((,root ,name ,fuel-scaffold-developer-name)
-                        (fuel-scaffold-vocab)) "fuel"))
+         (cmd `(:fuel* (,root ,name ,(fuel-scaffold--dev-name)
+                              fuel-scaffold-vocab) "fuel"))
          (ret (fuel-eval--send/wait cmd))
          (file (fuel-eval--retort-result ret)))
     (unless file
@@ -182,9 +178,9 @@ You can configure `fuel-scaffold-developer-name' (set by default to
   "Creates, if it does not already exist, a help file with
 scaffolded help for each word in the current vocabulary.
 
-With prefix argument, ask for the vocabulary name.
-You can configure `fuel-scaffold-developer-name' (set by default to
-`user-full-name') for the name to be inserted in the generated file."
+With prefix argument, ask for the vocabulary name. You can
+configure `user-full-name' for the name to be
+inserted in the generated file."
   (interactive "P")
   (let* ((vocab (or (and (not arg) (factor-current-vocab))
                     (fuel-completion--read-vocab nil)))
@@ -200,9 +196,9 @@ You can configure `fuel-scaffold-developer-name' (set by default to
   "Creates, if it does not already exist, a tests file for the current
 vocabulary.
 
-With prefix argument, ask for the vocabulary name.
-You can configure `fuel-scaffold-developer-name' (set by default to
-`user-full-name') for the name to be inserted in the generated file."
+With prefix argument, ask for the vocabulary name. You can
+configure `user-full-name' for the name to be inserted in the
+generated file."
   (interactive "P")
   (let* ((vocab (or (and (not arg) (factor-current-vocab))
                     (fuel-completion--read-vocab nil)))
@@ -217,9 +213,9 @@ You can configure `fuel-scaffold-developer-name' (set by default to
   "Creates, if it does not already exist, an authors file for the current
 vocabulary.
 
-With prefix argument, ask for the vocabulary name.
-You can configure `fuel-scaffold-developer-name' (set by default to
-`user-full-name') for the name to be inserted in the generated file."
+With prefix argument, ask for the vocabulary name. You can
+configure `user-full-name' for the name to be
+inserted in the generated file."
   (interactive "P")
   (let* ((vocab (or (and (not arg) (factor-current-vocab))
                     (fuel-completion--read-vocab nil)))