feat(core): Lazy install on required packages

emacs-eask · Nov 21, 2024 · f9a7986 · f9a7986
1 parent 40c2d87
commit f9a7986
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 48 deletions.
diff --git a/lisp/_prepare.el b/lisp/_prepare.el
@@ -656,6 +656,13 @@ Argument BODY are forms for execution."
          "done ✓"))
      ,@body))
 
+(defun eask-archive-install-packages (archives names)
+  "Install package NAMES with ARCHIVES setup."
+  (when-let* ((names (eask-listify names))
+              ((cl-some (lambda (pkg) (not (package-installed-p pkg))) names)))
+    (eask-with-archives archives
+      (eask--package-mapc #'eask-package-install names))))
+
 (defun eask-package-installable-p (pkg)
   "Return non-nil if package (PKG) is installable."
   (assq (eask-intern pkg) package-archive-contents))

diff --git a/lisp/core/cat.el b/lisp/core/cat.el
@@ -25,8 +25,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
-    (eask-package-install 'e2ansi))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'e2ansi)
   (eask-msg "")
 
   ;; Start the task

diff --git a/lisp/core/docs.el b/lisp/core/docs.el
@@ -43,8 +43,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'el2org))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'el2org)
 
   ;; Start building...
   (require 'el2org)

diff --git a/lisp/core/loc.el b/lisp/core/loc.el
@@ -36,14 +36,14 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'markdown-mode))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'markdown-mode)
 
   (require 'markdown-mode)
   ;; Start LOC
   (if-let* ((files (or (eask-expand-file-specs (eask-args))
                        (eask-package-files)))
-           (eask-output (get-buffer-create "*eask-output*")))
+            (eask-output (get-buffer-create "*eask-output*")))
       (with-current-buffer eask-output
         (erase-buffer)
         (progn  ; Print header

diff --git a/lisp/core/package.el b/lisp/core/package.el
@@ -74,8 +74,8 @@ Argument VERSION is a string represent the version number of this package."
     (ignore-errors (make-directory eask-dist-path t))
 
     (eask-defvc< 27 (eask-pkg-init))  ; XXX: remove this after we drop 26.x
-    (eask-with-archives '("gnu" "melpa")
-      (eask-package-install 'package-build))
+    (eask-archive-install-packages '("gnu" "melpa")
+                                   'package-build)
     (eask-load "extern/package-build")  ; override
 
     (let* ((version (eask-package-version))

diff --git a/lisp/format/elfmt.el b/lisp/format/elfmt.el
@@ -46,8 +46,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa" "jcs-elpa")
-    (eask-package-install 'elfmt))
+  (eask-archive-install-packages '("gnu" "melpa" "jcs-elpa")
+                                 'elfmt)
   (setq eask-format-elfmt--version (eask-package--version-string 'elfmt))
 
   ;; Start formatting

diff --git a/lisp/format/elisp-autofmt.el b/lisp/format/elisp-autofmt.el
@@ -46,8 +46,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'elisp-autofmt))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'elisp-autofmt)
   (setq eask-format-elisp-autofmt--version (eask-package--version-string 'elisp-autofmt))
 
   ;; Start formatting

diff --git a/lisp/generate/ignore.el b/lisp/generate/ignore.el
@@ -44,8 +44,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
-    (eask-package-install 'gitignore-templates))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'gitignore-templates)
 
   ;; Start the task
   (require 'gitignore-templates)

diff --git a/lisp/generate/license.el b/lisp/generate/license.el
@@ -48,8 +48,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
-    (eask-package-install 'license-templates))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'license-templates)
 
   ;; Start the task
   (require 'license-templates)

diff --git a/lisp/generate/test/buttercup.el b/lisp/generate/test/buttercup.el
@@ -41,9 +41,8 @@
 " test-file name test-file))))))
 
 (eask-start
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'buttercup)
-    (eask-package-install 'f))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 '(buttercup f))
   (require 'buttercup)
   (require 'f)
   (eask-generate-test-buttercup--init (eask-guess-package-name)))

diff --git a/lisp/generate/test/ecukes.el b/lisp/generate/test/ecukes.el
@@ -15,8 +15,8 @@
         nil t))
 
 (eask-start
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'ecukes))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'ecukes)
   (require 'ecukes-new)
   (ecukes-new))
 

diff --git a/lisp/generate/test/ert-runner.el b/lisp/generate/test/ert-runner.el
@@ -31,8 +31,8 @@
 " name))))
 
 (eask-start
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'ert-runner))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'ert-runner)
   (advice-add 'ert-runner/run :override #'ignore)
   (load-library "ert-runner")
   (load-library "f")

diff --git a/lisp/init/cask.el b/lisp/init/cask.el
@@ -206,9 +206,8 @@ Optional argument CONTENTS is used for nested directives.  e.g. development."
 
 (eask-start
   ;; Preparation
-  (eask-with-archives `("gnu" "melpa" "jcs-elpa")
-    (eask-package-install 'package-build)
-    (eask-package-install 'cask))
+  (eask-archive-install-packages '("gnu" "melpa" "jcs-elpa")
+                                 '(package-build cask))
 
   ;; Start Converting
   (require 'cask)

diff --git a/lisp/init/eldev.el b/lisp/init/eldev.el
@@ -77,8 +77,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
-    (eask-package-install 'eldev))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'eldev)
 
   ;; Start Converting
   (require 'eldev)

diff --git a/lisp/init/keg.el b/lisp/init/keg.el
@@ -125,8 +125,8 @@ If no found the Keg file, returns nil."
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "melpa"
-    (eask-package-install 'keg))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'keg)
 
   ;; Start Converting
   (require 'keg)

diff --git a/lisp/lint/elisp-lint.el b/lisp/lint/elisp-lint.el
@@ -52,8 +52,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'elisp-lint))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'elisp-lint)
   (setq eask-lint-elisp-lint--version (eask-package--version-string 'elisp-lint))
 
   ;; Start Linting

diff --git a/lisp/lint/elsa.el b/lisp/lint/elsa.el
@@ -60,8 +60,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'elsa))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'elsa)
   (setq eask-lint-elsa--version (eask-package--version-string 'elsa))
 
   ;; Start Linting

diff --git a/lisp/lint/package.el b/lisp/lint/package.el
@@ -59,8 +59,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'package-lint))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'package-lint)
   (setq eask-lint-package--version (eask-package--version-string 'package-lint))
 
   ;; Start Linting

diff --git a/lisp/lint/regexps.el b/lisp/lint/regexps.el
@@ -60,8 +60,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives "gnu"
-    (eask-package-install 'relint))
+  (eask-archive-install-packages '("gnu")
+                                 'relint)
   (setq eask-lint-regexps--relint-version (eask-package--version-string 'relint))
 
   ;; Start Linting

diff --git a/lisp/test/buttercup.el b/lisp/test/buttercup.el
@@ -16,8 +16,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'buttercup))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'buttercup)
 
   ;; Start Testing
   (require 'buttercup)

diff --git a/lisp/test/ecukes.el b/lisp/test/ecukes.el
@@ -29,8 +29,8 @@ Modified from function `ecukes-cli/run'."
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'ecukes))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'ecukes)
 
   ;; Start Testing
   (require 'ecukes)

diff --git a/lisp/test/ert-runner.el b/lisp/test/ert-runner.el
@@ -21,8 +21,8 @@
               (setq ert-runner-verbose t))))
 
 (eask-start
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'ert-runner))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 'ert-runner)
   (require 'ert-runner))
 
 ;;; test/ert-runner.el ends here
diff --git a/lisp/test/melpazoid.el b/lisp/test/melpazoid.el
@@ -30,9 +30,8 @@
 
 (eask-start
   ;; Preparation
-  (eask-with-archives '("gnu" "melpa")
-    (eask-package-install 'package-lint)
-    (eask-package-install 'pkg-info))
+  (eask-archive-install-packages '("gnu" "melpa")
+                                 '(package-lint pkg-info))
 
   ;; Start Testing
   (let* ((dirs (or (eask-args) `(,default-directory))))