fix(org-drill-config): fall back to :vc when the dev checkout is absentHEADmain

org-drill-config hard-coded :load-path to ~/code/org-drill with :demand t, so on a machine without that checkout org-drill failed to load and drill broke. cj/--org-drill-source-keywords now picks the source at load time: :load-path when the checkout exists, a :vc install otherwise. The keyword is spliced through eval, since use-package needs a literal at macro-expansion.

2 files changed, 67 insertions, 19 deletions

diff --git a/modules/org-drill-config.el b/modules/org-drill-config.el
index 29f6130a..f53f36b9 100644
--- a/modules/org-drill-config.el
+++ b/modules/org-drill-config.el
@@ -134,25 +134,42 @@ With a prefix arg OTHER-DIR, prompt for the directory instead of `drill-dir'."
 
 ;; --------------------------------- Org Drill ---------------------------------
 
-(use-package org-drill
-  ;; :vc (:url "git@cjennings.net:org-drill.git"
-  ;;      :branch "main"
-  ;;      :rev :newest)
-  :load-path "~/code/org-drill"  ;; local dev checkout — switch back to :vc above when done
-  :after (org org-capture)
-  :demand t
-  :commands (org-drill org-drill-resume)
-  :custom
-  (org-drill-leech-failure-threshold 50 "leech cards = 50 wrong answers")
-  (org-drill-leech-method 'warn "leech cards show warnings")
-  (org-drill-use-visible-cloze-face-p t "cloze text shows up in a different font")
-  (org-drill-hide-item-headings-p t "don't show heading text")
-  (org-drill-maximum-items-per-session 100 "drill sessions end after 100 cards")
-  (org-drill-maximum-duration 30 "each drill session can last up to 30 mins")
-  (org-drill-add-random-noise-to-intervals-p t "vary the days to repetition slightly")
-  (org-drill-text-size-during-session 24 "24-point font for comfortable reading")
-  (org-drill-use-variable-pitch t "variable-pitch font for readability")
-  (org-drill-hide-modeline-during-session t "hide the modeline for a cleaner display"))
+(defconst cj/org-drill-dev-checkout (expand-file-name "org-drill" "~/code/")
+  "Local org-drill development checkout, preferred when it exists.")
+
+(defun cj/--org-drill-source-keywords (&optional checkout)
+  "Return the use-package source keywords for org-drill.
+With CHECKOUT (default `cj/org-drill-dev-checkout') an existing directory,
+load from it via :load-path.  Otherwise install from upstream via :vc, so
+drill still loads on a machine without the dev checkout (bare :load-path +
+:demand t would fail to load there)."
+  (let ((dir (or checkout cj/org-drill-dev-checkout)))
+    (if (file-directory-p dir)
+        (list :load-path dir)
+      (list :vc '(:url "git@cjennings.net:org-drill.git"
+                       :branch "main"
+                       :rev :newest)))))
+
+;; `use-package' keywords must be literals at macro-expansion, so the
+;; source keyword is spliced in through `eval' at load time (same idiom as
+;; the computed flycheck checker path elsewhere in the config).
+(eval
+ `(use-package org-drill
+    ,@(cj/--org-drill-source-keywords)
+    :after (org org-capture)
+    :demand t
+    :commands (org-drill org-drill-resume)
+    :custom
+    (org-drill-leech-failure-threshold 50 "leech cards = 50 wrong answers")
+    (org-drill-leech-method 'warn "leech cards show warnings")
+    (org-drill-use-visible-cloze-face-p t "cloze text shows up in a different font")
+    (org-drill-hide-item-headings-p t "don't show heading text")
+    (org-drill-maximum-items-per-session 100 "drill sessions end after 100 cards")
+    (org-drill-maximum-duration 30 "each drill session can last up to 30 mins")
+    (org-drill-add-random-noise-to-intervals-p t "vary the days to repetition slightly")
+    (org-drill-text-size-during-session 24 "24-point font for comfortable reading")
+    (org-drill-use-variable-pitch t "variable-pitch font for readability")
+    (org-drill-hide-modeline-during-session t "hide the modeline for a cleaner display")))
 
 (provide 'org-drill-config)
 ;;; org-drill-config.el ends here.
diff --git a/tests/test-org-drill-config-source.el b/tests/test-org-drill-config-source.el
new file mode 100644
index 00000000..ccda99ef
--- /dev/null
+++ b/tests/test-org-drill-config-source.el
@@ -0,0 +1,31 @@
+;;; test-org-drill-config-source.el --- Tests for org-drill source selection -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; cj/--org-drill-source-keywords decides how use-package obtains org-drill:
+;; a local dev checkout via :load-path when it exists, otherwise the upstream
+;; repo via :vc.  Without this, a machine lacking the checkout hits :demand t
+;; against a nonexistent :load-path and drill fails to load entirely.
+
+;;; Code:
+
+(require 'ert)
+
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'org-drill-config)
+
+(ert-deftest test-org-drill-source-keywords-uses-load-path-when-checkout-exists ()
+  "Normal: an existing checkout directory selects :load-path."
+  (let ((dir (make-temp-file "org-drill-checkout-" t)))
+    (unwind-protect
+        (should (equal (cj/--org-drill-source-keywords dir)
+                       (list :load-path dir)))
+      (delete-directory dir t))))
+
+(ert-deftest test-org-drill-source-keywords-falls-back-to-vc-when-absent ()
+  "Error: a missing checkout falls back to a :vc install spec."
+  (let ((kws (cj/--org-drill-source-keywords "/nonexistent/org-drill-xyz")))
+    (should (eq (car kws) :vc))
+    (should (plist-get (nth 1 kws) :url))))
+
+(provide 'test-org-drill-config-source)
+;;; test-org-drill-config-source.el ends here