From a5568f24b637231f4a7878265781b2c2c7affbc0 Mon Sep 17 00:00:00 2001 From: Jen-Chieh Shen Date: Tue, 20 Feb 2024 16:15:45 -0800 Subject: [PATCH] style(lisp): Fix naming convention (#228) * style(lisp): Fix naming convetion * fix indent --- cmds/checker/check-eask.js | 2 +- lisp/checker/check-eask.el | 54 ++++++++++++++--------------- lisp/clean/all.el | 20 +++++------ lisp/clean/dist.el | 6 ++-- lisp/clean/log-file.el | 4 +-- lisp/core/archives.el | 25 ++++++------- lisp/core/bump.el | 20 +++++------ lisp/core/compile.el | 32 ++++++++--------- lisp/core/eval.el | 2 +- lisp/core/exec-path.el | 6 ++-- lisp/core/exec.el | 16 ++++----- lisp/core/files.el | 4 +-- lisp/core/info.el | 20 +++++------ lisp/core/install.el | 12 +++---- lisp/core/list.el | 46 ++++++++++++------------ lisp/core/load-path.el | 8 ++--- lisp/core/loc.el | 14 ++++---- lisp/core/outdated.el | 2 +- lisp/core/package.el | 14 ++++---- lisp/core/recipe.el | 4 +-- lisp/core/reinstall.el | 4 +-- lisp/core/repl.el | 16 ++++----- lisp/core/search.el | 6 ++-- lisp/core/status.el | 50 +++++++++++++------------- lisp/core/uninstall.el | 4 +-- lisp/core/upgrade.el | 16 ++++----- lisp/create/elpa.el | 2 +- lisp/create/package.el | 28 +++++++-------- lisp/generate/ignore.el | 4 +-- lisp/generate/license.el | 4 +-- lisp/generate/pkg-file.el | 20 +++++------ lisp/generate/recipe.el | 2 +- lisp/generate/workflow/circle-ci.el | 10 +++--- lisp/generate/workflow/gitlab.el | 10 +++--- lisp/help/core/bump | 2 +- lisp/init/eldev.el | 8 ++--- lisp/init/keg.el | 8 ++--- lisp/init/source.el | 4 +-- lisp/link/add.el | 34 +++++++++--------- lisp/link/delete.el | 12 +++---- lisp/link/list.el | 4 +-- lisp/lint/checkdoc.el | 16 ++++----- lisp/lint/declare.el | 4 +-- lisp/lint/elint.el | 4 +-- lisp/lint/elisp-lint.el | 10 +++--- lisp/lint/elsa.el | 10 +++--- lisp/lint/indent.el | 12 +++---- lisp/lint/keywords.el | 4 +-- lisp/lint/license.el | 54 ++++++++++++++--------------- lisp/lint/package.el | 10 +++--- lisp/lint/regexps.el | 10 +++--- lisp/run/command.el | 20 +++++------ lisp/run/script.el | 22 ++++++------ lisp/source/add.el | 24 ++++++------- lisp/source/delete.el | 4 +-- lisp/test/ert.el | 10 +++--- lisp/test/melpazoid.el | 4 +-- 57 files changed, 389 insertions(+), 388 deletions(-) diff --git a/cmds/checker/check-eask.js b/cmds/checker/check-eask.js index 2bb2f5d8..2bdbc1f9 100644 --- a/cmds/checker/check-eask.js +++ b/cmds/checker/check-eask.js @@ -18,7 +18,7 @@ "use strict"; exports.command = ['check-eask [files..]']; -exports.desc = 'Run eask checker'; +exports.desc = 'Run Eask checker'; exports.builder = yargs => yargs .positional( '[files..]', { diff --git a/lisp/checker/check-eask.el b/lisp/checker/check-eask.el index ca7e8412..f8418c84 100644 --- a/lisp/checker/check-eask.el +++ b/lisp/checker/check-eask.el @@ -24,24 +24,24 @@ nil t)) ;; Plain Text -(defvar eask--checker-log nil) +(defvar eask-checker--log nil) ;; JSON format -(defvar eask--checker-warnings nil) -(defvar eask--checker-errors nil) +(defvar eask-checker--warnings nil) +(defvar eask-checker--errors nil) -(defun eask--pretty-json (json) +(defun eask-checker--pretty-json (json) "Return pretty JSON." (with-temp-buffer (insert json) (json-pretty-print-buffer) (buffer-string))) -(defun eask--load-buffer () +(defun eask-checker--load-buffer () "Return the current file loading session." (car (cl-remove-if-not (lambda (elm) (string-prefix-p " *load*-" (buffer-name elm))) (buffer-list)))) -(defun eask--write-json-format (level msg) +(defun eask-checker--write-json-format (level msg) "Prepare log for JSON format. -For arguments LEVEL and MSG, please see function `eask--write-log' for more +For arguments LEVEL and MSG, please see function `eask-checker--write-log' for more information." (let* ((bounds (bounds-of-thing-at-point 'sexp)) (filename (or load-file-name eask-file)) @@ -63,13 +63,13 @@ information." (filename . ,filename) (message . ,msg)) (cl-case level - (`error eask--checker-errors) - (`warn eask--checker-warnings))))) + (`error eask-checker--errors) + (`warn eask-checker--warnings))))) -(defun eask--write-plain-text (level msg) +(defun eask-checker--write-plain-text (level msg) "Prepare log for plain text format. -For arguments LEVEL and MSG, please see function `eask--write-log' for more +For arguments LEVEL and MSG, please see function `eask-checker--write-log' for more information." (let* ((level-string (cl-case level (`error "Error") @@ -80,20 +80,20 @@ information." (if load-file-name (current-column) 0) level-string msg))) - (push (ansi-color-filter-apply log) eask--checker-log))) + (push (ansi-color-filter-apply log) eask-checker--log))) -(defun eask--write-log (level msg) +(defun eask-checker--write-log (level msg) "Write the log. Argument LEVEL and MSG are data from the debug log signal." (unless (string= " *temp*" (buffer-name)) ; avoid error from `package-file' directive - (with-current-buffer (or (eask--load-buffer) (buffer-name)) + (with-current-buffer (or (eask-checker--load-buffer) (buffer-name)) (funcall - (cond ((eask-json-p) #'eask--write-json-format) - (t #'eask--write-plain-text)) + (cond ((eask-json-p) #'eask-checker--write-json-format) + (t #'eask-checker--write-plain-text)) level msg)))) -(defun eask--check-file (files) +(defun eask-checker--check-file (files) "Lint list of Eask FILES." (let (checked-files content) ;; Linting @@ -105,19 +105,19 @@ Argument LEVEL and MSG are data from the debug log signal." ;; Print result (eask-msg "") (cond ((and (eask-json-p) ; JSON format - (or eask--checker-warnings eask--checker-errors)) + (or eask-checker--warnings eask-checker--errors)) (setq content - (eask--pretty-json (json-encode - `((warnings . ,eask--checker-warnings) - (errors . ,eask--checker-errors))))) + (eask-checker--pretty-json (json-encode + `((warnings . ,eask-checker--warnings) + (errors . ,eask-checker--errors))))) (eask-msg content)) - (eask--checker-log ; Plain text + (eask-checker--log ; Plain text (setq content (with-temp-buffer - (dolist (msg (reverse eask--checker-log)) + (dolist (msg (reverse eask-checker--log)) (insert msg "\n")) (buffer-string))) - (mapc #'eask-msg (reverse eask--checker-log))) + (mapc #'eask-msg (reverse eask-checker--log))) (t (eask-info "(Checked %s file%s)" (length checked-files) @@ -131,8 +131,8 @@ Argument LEVEL and MSG are data from the debug log signal." ;;; Program Entry ;; Preparation -(add-hook 'eask-on-error-hook #'eask--write-log) -(add-hook 'eask-on-warning-hook #'eask--write-log) +(add-hook 'eask-on-error-hook #'eask-checker--write-log) +(add-hook 'eask-on-warning-hook #'eask-checker--write-log) (let* ((default-directory (cond ((eask-global-p) eask-homedir) ((eask-config-p) user-emacs-directory) @@ -144,7 +144,7 @@ Argument LEVEL and MSG are data from the debug log signal." (cond ;; Files found, do the action! (files - (eask--check-file files)) + (eask-checker--check-file files)) ;; Pattern defined, but no file found! (patterns (eask-info "(No files match wildcard: %s)" diff --git a/lisp/clean/all.el b/lisp/clean/all.el index eabb435d..6dae01c7 100644 --- a/lisp/clean/all.el +++ b/lisp/clean/all.el @@ -17,31 +17,31 @@ (defvar eask-no-cleaning-operation-p nil "Set to non-nil if there is no cleaning operation done.") -(defconst eask--clean-tasks-total 6 +(defconst eask-clean-all--tasks-total 6 "Count cleaning task.") -(defvar eask--clean-tasks-count 0 +(defvar eask-clean-all--tasks-count 0 "Count cleaning task.") -(defvar eask--clean-tasks-cleaned 0 +(defvar eask-clean-all--tasks-cleaned 0 "Total cleaned tasks.") (defmacro eask--clean-section (title &rest body) "Print clean up TITLE and execute BODY." (declare (indent 1)) `(let (eask-no-cleaning-operation-p) - (cl-incf eask--clean-tasks-count) + (cl-incf eask-clean-all--tasks-count) (eask-with-progress - (concat (format " - [%s/%s] " eask--clean-tasks-count eask--clean-tasks-total) + (concat (format " - [%s/%s] " eask-clean-all--tasks-count eask-clean-all--tasks-total) (format "%s... " ,title)) (eask-with-verbosity 'debug ,@body) (if eask-no-cleaning-operation-p "skipped ✗" - (cl-incf eask--clean-tasks-cleaned) + (cl-incf eask-clean-all--tasks-cleaned) "done ✓")))) (eask-start - (eask-msg "Applying %s cleaning tasks..." eask--clean-tasks-total) + (eask-msg "Applying %s cleaning tasks..." eask-clean-all--tasks-total) (eask-msg "") (eask--clean-section (format "Cleaning %s" (ansi-green "workspace")) (eask-call "clean/workspace")) @@ -57,8 +57,8 @@ (eask-call "clean/log-file")) (eask-msg "") (eask-info "(Total of %s task%s cleaned, %s skipped)" - eask--clean-tasks-cleaned - (eask--sinr eask--clean-tasks-cleaned "" "s") - (- eask--clean-tasks-count eask--clean-tasks-cleaned))) + eask-clean-all--tasks-cleaned + (eask--sinr eask-clean-all--tasks-cleaned "" "s") + (- eask-clean-all--tasks-count eask-clean-all--tasks-cleaned))) ;;; clean/all.el ends here diff --git a/lisp/clean/dist.el b/lisp/clean/dist.el index 9e08e33d..f46bf168 100644 --- a/lisp/clean/dist.el +++ b/lisp/clean/dist.el @@ -21,13 +21,13 @@ (eask-load "core/package") ; load dist path -(defun eask--clean-dist (path) +(defun eask-clean-dist (path) "Clean up dist PATH." (let* ((name (eask-guess-package-name)) (version (eask-package-version)) (readme (expand-file-name (format "%s-readme.txt" name) path)) (entry (expand-file-name (format "%s-%s.entry" name version) path)) - (packaged (eask-packaged-file)) + (packaged (eask-package-packaged-file)) (deleted 0) (delete-dir)) (when (eask-delete-file readme) (cl-incf deleted)) @@ -49,7 +49,7 @@ (let* ((eask-dist-path (or (eask-args 0) eask-dist-path)) (eask-dist-path (expand-file-name eask-dist-path))) (if (file-directory-p eask-dist-path) - (eask--clean-dist eask-dist-path) + (eask-clean-dist eask-dist-path) (eask-info "(No dist folder needs to be cleaned)" eask-dist-path) (setq eask-no-cleaning-operation-p t)))) diff --git a/lisp/clean/log-file.el b/lisp/clean/log-file.el index 11171300..6a733f04 100644 --- a/lisp/clean/log-file.el +++ b/lisp/clean/log-file.el @@ -14,7 +14,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--clean-log (path) +(defun eask-clean-log-file (path) "Clean up .log PATH." (let ((log-files '("messages.log" "warnings.log" @@ -41,7 +41,7 @@ (eask-start (let ((log-dir (expand-file-name eask-log-path eask-file-root))) (if (file-directory-p log-dir) - (eask--clean-log log-dir) + (eask-clean-log-file log-dir) (eask-info "(No log file found in workspace)") (setq eask-no-cleaning-operation-p t)))) diff --git a/lisp/core/archives.el b/lisp/core/archives.el index a0535949..05ab4827 100644 --- a/lisp/core/archives.el +++ b/lisp/core/archives.el @@ -14,42 +14,43 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask--length-name) -(defvar eask--length-url) -(defvar eask--length-priority) +(defvar eask-archive--length-name) +(defvar eask-archive--length-url) +(defvar eask-archive--length-priority) -(defun eask--print-archive (archive) +(defun eask-archive--print (archive) "Print the ARCHIVE." (let* ((name (car archive)) (url (cdr archive)) (priority (assoc name package-archive-priorities)) (priority (cdr priority))) (eask-println - (concat " %-" eask--length-name "s %-" eask--length-url "s %-" eask--length-priority "s") + (concat " %-" eask-archive--length-name "s %-" eask-archive--length-url + "s %-" eask-archive--length-priority "s") name (eask-2url url) (or priority 0)))) -(defun eask--print-archive-alist (alist) +(defun eask-archive--print-alist (alist) "Print the archvie ALIST." (let* ((names (mapcar #'car alist)) - (eask--length-name (eask-2str (eask-seq-str-max names))) + (eask-archive--length-name (eask-2str (eask-seq-str-max names))) (urls (mapcar #'cdr alist)) - (eask--length-url (eask-2str (eask-seq-str-max urls))) + (eask-archive--length-url (eask-2str (eask-seq-str-max urls))) (priorities (mapcar #'cdr package-archive-priorities)) - (eask--length-priority (eask-2str (eask-seq-str-max priorities)))) - (mapc #'eask--print-archive alist))) + (eask-archive--length-priority (eask-2str (eask-seq-str-max priorities)))) + (mapc #'eask-archive--print alist))) (eask-start (cond ((eask-all-p) (eask-info "Available archives:") (eask-msg "") - (eask--print-archive-alist eask-source-mapping) + (eask-archive--print-alist eask-source-mapping) (eask-info "(Total of %s archive%s available)" (length eask-source-mapping) (eask--sinr eask-source-mapping "" "s"))) (package-archives (eask-info "In used archives:") (eask-msg "") - (eask--print-archive-alist package-archives) + (eask-archive--print-alist package-archives) (eask-info "(Total of %s archive%s listed)" (length package-archives) (eask--sinr package-archives "" "s"))) (t diff --git a/lisp/core/bump.el b/lisp/core/bump.el index 96e1b070..89a9da34 100644 --- a/lisp/core/bump.el +++ b/lisp/core/bump.el @@ -19,23 +19,23 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask-bump-version--version (version index) +(defun eask-bump--version (version index) "Bump VERSION with INDEX." (let ((lst (if (stringp version) (version-to-list version) version))) (setf (nth index lst) (cl-incf (nth index lst))) (mapconcat #'eask-2str lst version-separator))) -(defun eask-bump-version--major-version (version) +(defun eask-bump--version-major-version (version) "Bump VERSION major level." - (eask-bump-version--version version 0)) + (eask-bump--version version 0)) -(defun eask-bump-version--minor-version (version) +(defun eask-bump--version-minor-version (version) "Bump VERSION minor level." - (eask-bump-version--version version 1)) + (eask-bump--version version 1)) -(defun eask-bump-version--patch-level (version) +(defun eask-bump--version-patch-level (version) "Bump VERSION patch level." - (eask-bump-version--version version 2)) + (eask-bump--version version 2)) (eask-start (let ((package-file (or eask-package-file @@ -58,11 +58,11 @@ (setq desc (package-buffer-info))) (setq version (package-desc-version desc)) (when (member "major" levels) - (setq version (eask-bump-version--major-version version))) + (setq version (eask-bump--version-major-version version))) (when (member "minor" levels) - (setq version (eask-bump-version--minor-version version))) + (setq version (eask-bump--version-minor-version version))) (when (member "patch" levels) - (setq version (eask-bump-version--patch-level version))) + (setq version (eask-bump--version-patch-level version))) (eask-msg "New version: %s" version) (let (success) (eask-with-progress diff --git a/lisp/core/compile.el b/lisp/core/compile.el index eb9fc96c..0be2c263 100644 --- a/lisp/core/compile.el +++ b/lisp/core/compile.el @@ -37,19 +37,19 @@ ;; ;;; Core -(defconst eask-compile-log-buffer-name "*Compile-Log*" +(defconst eask-compile--log-buffer-name "*Compile-Log*" "Byte-compile log buffer name.") -(defun eask--print-compile-log () +(defun eask-compile--print-log () "Print `*Compile-Log*' buffer." - (when (get-buffer eask-compile-log-buffer-name) - (with-current-buffer eask-compile-log-buffer-name + (when (get-buffer eask-compile--log-buffer-name) + (with-current-buffer eask-compile--log-buffer-name (if (and (eask-clean-p) (eask-strict-p)) (eask-error (buffer-string)) ; Exit with error code! (eask-print-log-buffer)) (eask-msg "")))) -(defun eask--byte-compile-file-external-contetnt (filename cmd) +(defun eask-compile--byte-compile-file-external-contetnt (filename cmd) "Extract result after executing byte-compile the FILENAME. The CMD is the command to start a new Emacs session." @@ -69,7 +69,7 @@ The CMD is the command to start a new Emacs session." (delete-region (line-beginning-position -1) (point-max))) (string-trim (buffer-string)))) -(defun eask--byte-compile-file-external (filename) +(defun eask-compile--byte-compile-file-external (filename) "Byte compile FILENAME with clean environment by opening a new Emacs session." (let* ((cmd (split-string eask-invocation "\n" t)) (cmd (format "\"%s\""(mapconcat #'identity cmd "\" \""))) @@ -82,37 +82,37 @@ The CMD is the command to start a new Emacs session." (args (append `(,(eask-command) ,(concat "\"" filename "\"")) argv)) (args (mapconcat #'identity args " ")) (cmd (concat cmd " " args)) - (content (eask--byte-compile-file-external-contetnt filename cmd))) + (content (eask-compile--byte-compile-file-external-contetnt filename cmd))) (if (string-empty-p content) t ; no error, good! - (with-current-buffer (get-buffer-create eask-compile-log-buffer-name) + (with-current-buffer (get-buffer-create eask-compile--log-buffer-name) (insert content))))) -(defun eask--byte-compile-file (filename) +(defun eask-compile--byte-compile-file (filename) "Byte compile FILENAME." ;; *Compile-Log* does not kill itself. Make sure it's clean before we do ;; next byte-compile task. - (ignore-errors (kill-buffer eask-compile-log-buffer-name)) + (ignore-errors (kill-buffer eask-compile--log-buffer-name)) (let* ((filename (expand-file-name filename)) (result)) (eask-with-progress (unless byte-compile-verbose (format "Compiling %s... " filename)) (eask-with-verbosity 'debug (setq result (if (eask-clean-p) - (eask--byte-compile-file-external filename) + (eask-compile--byte-compile-file-external filename) (byte-compile-file filename)) result (eq result t))) (if result "done ✓" "skipped ✗")) - (eask--print-compile-log) + (eask-compile--print-log) result)) -(defun eask--compile-files (files) +(defun eask-compile--files (files) "Compile sequence of FILES." - (let* ((compiled (cl-remove-if-not #'eask--byte-compile-file files)) + (let* ((compiled (cl-remove-if-not #'eask-compile--byte-compile-file files)) (compiled (length compiled)) (skipped (- (length files) compiled))) ;; XXX: Avoid last newline from the log buffer! - (unless (get-buffer eask-compile-log-buffer-name) + (unless (get-buffer eask-compile--log-buffer-name) (eask-msg "")) (eask-info "(Total of %s file%s compiled, %s skipped)" compiled (eask--sinr compiled "" "s") @@ -127,7 +127,7 @@ The CMD is the command to start a new Emacs session." (cond ;; Files found, do the action! (files - (eask--compile-files files)) + (eask-compile--files files)) ;; Pattern defined, but no file found! (patterns (eask-info "(No files match wildcard: %s)" diff --git a/lisp/core/eval.el b/lisp/core/eval.el index 6445590c..247b3b8d 100644 --- a/lisp/core/eval.el +++ b/lisp/core/eval.el @@ -23,7 +23,7 @@ (if-let ((name (eask-argv 0))) (eask-with-progress (ansi-green "Exporting environment variables... ") - (eask--export-env) + (eask-exec-export-env) (ansi-green "done ✓")) (eask-info "(No expression found)") (eask-help "core/eval"))) diff --git a/lisp/core/exec-path.el b/lisp/core/exec-path.el index 16b0ce27..291a6ef3 100644 --- a/lisp/core/exec-path.el +++ b/lisp/core/exec-path.el @@ -16,7 +16,7 @@ (eask-load "core/load-path") -(defun eask--print-exec-path (path) +(defun eask-exec-path--print (path) "Print out the PATH." (eask-println "%s" path)) @@ -24,10 +24,10 @@ (eask-pkg-init) (let* ((patterns (eask-args)) (exec-path (if patterns - (cl-remove-if-not #'eask--filter-path exec-path) + (cl-remove-if-not #'eask-load-path--filter exec-path) exec-path))) (eask-msg "") - (mapc #'eask--print-exec-path exec-path) + (mapc #'eask-exec-path--print exec-path) (if (zerop (length exec-path)) (eask-info "(No exec-path found)") (eask-info "(Total of %s exec-path)" (length exec-path))))) diff --git a/lisp/core/exec.el b/lisp/core/exec.el index aece1f77..c39b5c30 100644 --- a/lisp/core/exec.el +++ b/lisp/core/exec.el @@ -19,19 +19,19 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defconst eask--exec-path-file (expand-file-name "exec-path" eask-homedir) +(defconst eask-exec--exec-path-file (expand-file-name "exec-path" eask-homedir) "Target file to export the variable `exec-path'.") -(defconst eask--load-path-file (expand-file-name "load-path" eask-homedir) +(defconst eask-exec--load-path-file (expand-file-name "load-path" eask-homedir) "Target file to export the variable `load-path'.") -(defun eask--export-env () +(defun eask-exec-export-env () "Export environments." - (ignore-errors (delete-file eask--exec-path-file)) - (ignore-errors (delete-file eask--load-path-file)) + (ignore-errors (delete-file eask-exec--exec-path-file)) + (ignore-errors (delete-file eask-exec--load-path-file)) (ignore-errors (make-directory eask-homedir t)) ; generate dir `~/.eask/' - (write-region (getenv "PATH") nil eask--exec-path-file) - (write-region (getenv "EMACSLOADPATH") nil eask--load-path-file)) + (write-region (getenv "PATH") nil eask-exec--exec-path-file) + (write-region (getenv "EMACSLOADPATH") nil eask-exec--load-path-file)) (eask-start (eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x @@ -40,7 +40,7 @@ (if (eask-argv 1) (eask-with-progress (ansi-green "Exporting environment variables... ") - (eask--export-env) + (eask-exec-export-env) (ansi-green "done ✓")) (eask-info "(No exeuction output)") (eask-help "core/exec"))) diff --git a/lisp/core/files.el b/lisp/core/files.el index 1e308dd5..7ce67def 100644 --- a/lisp/core/files.el +++ b/lisp/core/files.el @@ -14,7 +14,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--print-filename (filename) +(defun eask-files--print-filename (filename) "Print out the FILENAME." (eask-println "%s" filename)) @@ -23,7 +23,7 @@ (files (if patterns (eask-expand-file-specs patterns) (eask-package-files)))) - (mapc #'eask--print-filename files) + (mapc #'eask-files--print-filename files) (if (zerop (length files)) (eask-info "(No package files found)") (eask-info "(Total of %s item%s listed)" (length files) (eask--sinr files "" "s"))))) diff --git a/lisp/core/info.el b/lisp/core/info.el index 40b849bf..1ed624d9 100644 --- a/lisp/core/info.el +++ b/lisp/core/info.el @@ -14,17 +14,17 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask--max-offset 0) +(defvar eask-info--max-offset 0) -(defun eask--print-deps (title dependencies) +(defun eask-info--print-deps (title dependencies) "Print DEPENDENCIES with TITLE identifier." (when dependencies (eask-println "") (eask-println title) (let* ((names (mapcar #'car dependencies)) (offset (eask-seq-str-max names))) - (setq eask--max-offset (max offset eask--max-offset) - offset (eask-2str eask--max-offset)) + (setq eask-info--max-offset (max offset eask-info--max-offset) + offset (eask-2str eask-info--max-offset)) (dolist (dep dependencies) (let* ((target-version (cdr dep)) (target-version (if (= (length target-version) 1) @@ -37,10 +37,10 @@ (if eask-package (progn (eask-println "%s (%s) | deps: %s | devDeps: %s" - (ansi-green (eask-package-name)) - (ansi-yellow (eask-package-version)) - (ansi-cyan (eask-2str (length eask-depends-on))) - (ansi-cyan (eask-2str (length eask-depends-on-dev)))) + (ansi-green (eask-package-name)) + (ansi-yellow (eask-package-version)) + (ansi-cyan (eask-2str (length eask-depends-on))) + (ansi-cyan (eask-2str (length eask-depends-on-dev)))) (unless (string-empty-p (eask-package-description)) (eask-println (eask-package-description))) (when-let* ((url (or (eask-package-desc-url) eask-website-url)) @@ -57,8 +57,8 @@ (eask-println "dist") (eask-println ".total-files: %s" (length (eask-package-files))) (eask-println ".unpacked-size: %s" (eask-unpacked-size)) - (eask--print-deps "dependencies:" eask-depends-on) - (eask--print-deps "devDependencies:" eask-depends-on-dev)) + (eask-info--print-deps "dependencies:" eask-depends-on) + (eask-info--print-deps "devDependencies:" eask-depends-on-dev)) (eask-info "(Eask file has no package information)") (eask-help "core/info"))) diff --git a/lisp/core/install.el b/lisp/core/install.el index 1b032488..b63ab1db 100644 --- a/lisp/core/install.el +++ b/lisp/core/install.el @@ -23,7 +23,7 @@ (eask-load "core/package") ; load dist path -(defun eask--install-packages (names) +(defun eask-install-packages (names) "Install packages with their NAMES." (let* ((names (mapcar #'eask-intern names)) (len (length names)) (s (eask--sinr len "" "s")) @@ -39,7 +39,7 @@ ;; NOTE: This is copied from `eldev'! Great thanks! ;; ;; XXX: remove this after we drop 28.x -(defun eask--package-install-file (file) +(defun eask-install--package-file (file) "Old compatible version of function `package-install-file'. For argument FILE, please see function `package-install-file' for the details." @@ -80,11 +80,11 @@ For argument FILE, please see function `package-install-file' for the details." (eask-pkg-init) (if-let ((names (eask-args))) ;; If package [name..] are specified, we try to install it - (eask--install-packages names) + (eask-install-packages names) ;; Else we try to install package from the working directory (eask-install-dependencies) (let* ((name (eask-guess-package-name)) - (packaged (eask-packaged-file)) + (packaged (eask-package-packaged-file)) (packaged (when (file-exists-p packaged) packaged)) (target (or packaged eask-package-file))) (eask-log "Searching for artifact to install...") @@ -92,9 +92,9 @@ For argument FILE, please see function `package-install-file' for the details." (eask-info "💡 Missing artifact, install directly from %s" target)) (if target (progn - (add-to-list 'load-path (expand-file-name (eask-packaged-name) package-user-dir)) + (add-to-list 'load-path (expand-file-name (eask-package-packaged-name) package-user-dir)) ;; XXX: Use regular `package-install-file' function after we drop 28.x - (eask--package-install-file target) + (eask-install--package-file target) (eask-msg "") (eask-info "(Installed in %s)" (file-name-directory (locate-library name)))) diff --git a/lisp/core/list.el b/lisp/core/list.el index 15960266..f531a69e 100644 --- a/lisp/core/list.el +++ b/lisp/core/list.el @@ -19,15 +19,15 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask--list-pkg-name-offset nil) -(defvar eask--list-pkg-version-offset nil) -(defvar eask--list-pkg-archive-offset nil) +(defvar eask-list--pkg-name-offset nil) +(defvar eask-list--pkg-version-offset nil) +(defvar eask-list--pkg-archive-offset nil) -(defun eask--format-s (offset) +(defun eask-list--format-s (offset) "Format OFFSET." (concat " %-" (number-to-string offset) "s ")) -(defun eask--align (depth &optional rest) +(defun eask-list--align (depth &optional rest) "Format string to align starting from the version number. Argument DEPTH is used to calculate the indentation. REST is a list of string @@ -35,12 +35,12 @@ for string concatenation." (let ((prefix (if (= depth 0) "[+]" "[+]"))) (concat (spaces-string (* depth 2)) ; indent for depth " " prefix - (eask--format-s (- eask--list-pkg-name-offset (* depth 2))) - (eask--format-s eask--list-pkg-version-offset) - (eask--format-s eask--list-pkg-archive-offset) + (eask-list--format-s (- eask-list--pkg-name-offset (* depth 2))) + (eask-list--format-s eask-list--pkg-version-offset) + (eask-list--format-s eask-list--pkg-archive-offset) rest))) -(defun eask-print-pkg (name depth max-depth pkg-alist) +(defun eask-list--print-pkg (name depth max-depth pkg-alist) "Print NAME package information. Argument DEPTH is the current dependency nested level. MAX-DEPTH is the @@ -55,14 +55,14 @@ contents." (archive (or (package-desc-archive desc) "")) (summary (package-desc-summary desc))) (if (= depth 0) - (eask-msg (eask--align depth " %-80s") name version archive summary) - (eask-msg (eask--align depth) name "" "" "")) + (eask-msg (eask-list--align depth " %-80s") name version archive summary) + (eask-msg (eask-list--align depth) name "" "" "")) (when-let ((reqs (package-desc-reqs desc)) ((< depth max-depth))) (dolist (req reqs) - (eask-print-pkg (car req) (1+ depth) max-depth pkg-alist))))) + (eask-list--print-pkg (car req) (1+ depth) max-depth pkg-alist))))) -(defun eask--version-list (pkg-alist) +(defun eask-list--version-list (pkg-alist) "Return a list of versions. PKG-ALIST is the archive contents." @@ -70,7 +70,7 @@ PKG-ALIST is the archive contents." (package-version-join (package-desc-version (cadr elm)))) pkg-alist)) -(defun eask--archive-list (pkg-alist) +(defun eask-list--archive-list (pkg-alist) "Return list of archives. PKG-ALIST is the archive contents." @@ -78,31 +78,31 @@ PKG-ALIST is the archive contents." (or (package-desc-archive (cadr elm)) "")) pkg-alist)) -(defun eask--list (list pkg-alist &optional depth) +(defun eask-list (list pkg-alist &optional depth) "List packages. Argument LIST is the list of packages we want to list. PKG-ALIST is the archive contents we want to retrieve package's metadate from. Optional argument DEPTH is the deepness of the dependency nested level we want to go." - (let* ((eask--list-pkg-name-offset (eask-seq-str-max list)) - (version-list (eask--version-list pkg-alist)) - (eask--list-pkg-version-offset (eask-seq-str-max version-list)) - (archive-list (eask--archive-list pkg-alist)) - (eask--list-pkg-archive-offset (eask-seq-str-max archive-list))) + (let* ((eask-list--pkg-name-offset (eask-seq-str-max list)) + (version-list (eask-list--version-list pkg-alist)) + (eask-list--pkg-version-offset (eask-seq-str-max version-list)) + (archive-list (eask-list--archive-list pkg-alist)) + (eask-list--pkg-archive-offset (eask-seq-str-max archive-list))) (dolist (name list) - (eask-print-pkg name 0 (or depth (eask-depth) 999) pkg-alist)))) + (eask-list--print-pkg name 0 (or depth (eask-depth) 999) pkg-alist)))) (eask-start (cond ((eask-all-p) (eask-pkg-init) ; XXX: You must have this! (let ((pkg-list (reverse (mapcar #'car package-archive-contents)))) - (eask--list pkg-list package-archive-contents)) + (eask-list pkg-list package-archive-contents)) (eask-msg "") (eask-info "(Total of %s package%s available)" (length package-archive-contents) (eask--sinr package-archive-contents "" "s"))) (t (eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x - (eask--list package-activated-list package-alist) + (eask-list package-activated-list package-alist) (unless (zerop (length package-activated-list)) (eask-msg "")) (eask-info "(Total of %s package%s installed)" diff --git a/lisp/core/load-path.el b/lisp/core/load-path.el index f679c3df..d6f0e526 100644 --- a/lisp/core/load-path.el +++ b/lisp/core/load-path.el @@ -14,11 +14,11 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--print-load-path (path) +(defun eask-load-path--print (path) "Print out the PATH." (eask-println "%s" path)) -(defun eask--filter-path (path) +(defun eask-load-path--filter (path) "Filter the PATH out by search regex." (cl-some (lambda (regex) (string-match-p regex path)) @@ -28,10 +28,10 @@ (eask-pkg-init) (let* ((patterns (eask-args)) (load-path (if patterns - (cl-remove-if-not #'eask--filter-path load-path) + (cl-remove-if-not #'eask-load-path--filter load-path) load-path))) (eask-msg "") - (mapc #'eask--print-load-path load-path) + (mapc #'eask-load-path--print load-path) (if (zerop (length load-path)) (eask-info "(No load-path found)") (eask-info "(Total of %s load-path)" (length load-path))))) diff --git a/lisp/core/loc.el b/lisp/core/loc.el index 6db966c3..a547e3ce 100644 --- a/lisp/core/loc.el +++ b/lisp/core/loc.el @@ -19,10 +19,10 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask-loc-lines 0) -(defvar eask-loc-chars 0) +(defvar eask-loc--lines 0) +(defvar eask-loc--chars 0) -(defun eask--loc-file (file) +(defun eask-loc--file (file) "Insert LOC information for FILE." (unless (file-directory-p file) (let ((lines) (chars)) @@ -30,8 +30,8 @@ (insert-file-contents file) (setq lines (line-number-at-pos (point-max)) chars (point-max))) - (cl-incf eask-loc-lines lines) - (cl-incf eask-loc-chars chars) + (cl-incf eask-loc--lines lines) + (cl-incf eask-loc--chars chars) (insert (format "| %s | %s | %s |\n" file lines chars))))) (eask-start @@ -52,11 +52,11 @@ (insert (format "|---|---|---|\n"))) (eask-with-progress "Retrieving LOC information... " - (mapc #'eask--loc-file files) + (mapc #'eask-loc--file files) "done ✓") (progn ; Print total (insert (format "|---|---|---|\n")) - (insert (format "| Total | %s | %s |\n" eask-loc-lines eask-loc-chars))) + (insert (format "| Total | %s | %s |\n" eask-loc--lines eask-loc--chars))) (progn ; Organize (goto-char (point-min)) (markdown-table-align)) diff --git a/lisp/core/outdated.el b/lisp/core/outdated.el index 48489cc5..8f6557ec 100644 --- a/lisp/core/outdated.el +++ b/lisp/core/outdated.el @@ -25,7 +25,7 @@ (when (eask-local-p) ;; Remove current developing packages (setq pkg-list (remove (intern (eask-guess-package-name)) pkg-list))) - (eask--list pkg-list package-alist 0) + (eask-list pkg-list package-alist 0) (eask-msg "") (eask-info "(Total of %s dependenc%s %s outdated)" (length pkg-list) (eask--sinr pkg-list "y" "ies") diff --git a/lisp/core/package.el b/lisp/core/package.el index 26b1bc64..d5bb43ba 100644 --- a/lisp/core/package.el +++ b/lisp/core/package.el @@ -52,20 +52,20 @@ Argument VERSION is a string represent the version number of this package." (setf (slot-value rcp 'time) (eask-current-time)) rcp)) -(defun eask-packaged-name () +(defun eask-package-packaged-name () "Find a possible packaged name." (let ((name (eask-guess-package-name)) (version (eask-package-version))) (concat name "-" version))) -(defun eask--packaged-file (ext) +(defun eask-package--packaged-file (ext) "Find a possible packaged file with extension (EXT)." - (expand-file-name (concat (eask-packaged-name) "." ext) eask-dist-path)) + (expand-file-name (concat (eask-package-packaged-name) "." ext) eask-dist-path)) -(defun eask-packaged-file () +(defun eask-package-packaged-file () "Return generated package artifact; it could be a tar or el." - (if (eask-package-multi-p) (eask--packaged-file "tar") - (eask--packaged-file "el"))) + (if (eask-package-multi-p) (eask-package--packaged-file "tar") + (eask-package--packaged-file "el"))) (eask-start (let* ((eask-dist-path (or (eask-args 0) eask-dist-path)) @@ -88,7 +88,7 @@ Argument VERSION is a string represent the version number of this package." (package-build--package rcp) "done ✓")) - (setq packaged (eask-packaged-file) + (setq packaged (eask-package-packaged-file) packaged (when (file-exists-p packaged) packaged)) (when (and eask-is-windows (eask-package-single-p)) diff --git a/lisp/core/recipe.el b/lisp/core/recipe.el index 219ebf93..01f1a7c6 100644 --- a/lisp/core/recipe.el +++ b/lisp/core/recipe.el @@ -14,7 +14,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--recipe-string () +(defun eask-recipe-string () "Return the recipe format in string." (when-let ((url (eask-package-desc-url))) (let* ((fetcher (cond ((string-match-p "github.com" url) 'github) @@ -35,7 +35,7 @@ recipe))) (eask-start - (if-let ((recipe (eask--recipe-string)) + (if-let ((recipe (eask-recipe-string)) (name (eask-guess-package-name))) (progn (eask-msg "") diff --git a/lisp/core/reinstall.el b/lisp/core/reinstall.el index cd19466f..8f137ea2 100644 --- a/lisp/core/reinstall.el +++ b/lisp/core/reinstall.el @@ -21,7 +21,7 @@ (eask-load "core/package") ; load dist path -(defun eask--reinstall-packages (names) +(defun eask-reinstall--packages (names) "Install packages by its NAMES." (let* ((names (mapcar #'eask-intern names)) (len (length names)) (s (eask--sinr len "" "s")) @@ -38,7 +38,7 @@ (eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x (if-let ((names (eask-args))) ;; If package [name..] are specified, we try to install it - (eask--reinstall-packages names) + (eask-reinstall--packages names) (if-let* ((name (intern (eask-guess-package-name))) ((package-installed-p name))) (progn diff --git a/lisp/core/repl.el b/lisp/core/repl.el index 34be061e..16cd5e06 100644 --- a/lisp/core/repl.el +++ b/lisp/core/repl.el @@ -14,14 +14,14 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask--repl-old-pos nil +(defvar eask-repl--old-pos nil "Record the last position to output on the screen for the `ielm' buffer.") -(defun eask--repl-output () +(defun eask-repl--output () "Print the REPL result to screen." - (unless eask--repl-old-pos (setq eask--repl-old-pos (point-min))) + (unless eask-repl--old-pos (setq eask-repl--old-pos (point-min))) (with-current-buffer "*ielm*" - (goto-char eask--repl-old-pos) + (goto-char eask-repl--old-pos) (while (not (eobp)) (let ((line (thing-at-point 'line t))) (unless (string-prefix-p "ELISP> " line) @@ -29,18 +29,18 @@ (forward-line 1) (end-of-line)) ;; Record last output position - (setq eask--repl-old-pos (point)))) + (setq eask-repl--old-pos (point)))) (eask-start (require 'ielm) (ielm) - (eask--repl-output) + (eask-repl--output) (let ((input)) (while (setq input (read-from-minibuffer (ansi-blue "ELISP> "))) (with-current-buffer "*ielm*" (insert input) - (setq eask--repl-old-pos (1+ (point))) ; skip all input, move to next line + (setq eask-repl--old-pos (1+ (point))) ; skip all input, move to next line (eask--silent (ielm-send-input)) - (eask--repl-output))))) + (eask-repl--output))))) ;;; core/repl.el ends here diff --git a/lisp/core/search.el b/lisp/core/search.el index 8bed6b51..a9065927 100644 --- a/lisp/core/search.el +++ b/lisp/core/search.el @@ -21,7 +21,7 @@ (eask-load "core/list") -(defun eask--search-packages (query) +(defun eask-search--packages (query) "Filter available packages with QUERY." (let ((result)) (dolist (package (mapcar #'car package-archive-contents)) @@ -34,9 +34,9 @@ (if-let ((queries (eask-args))) (let ((result)) (dolist (query queries) - (setq result (append result (eask--search-packages query)))) + (setq result (append result (eask-search--packages query)))) (delete-dups result) - (eask--list result package-archive-contents) + (eask-list result package-archive-contents) (eask-msg "") (eask-info "(Search result of %s package%s)" (length result) (eask--sinr result "" "s"))) diff --git a/lisp/core/status.el b/lisp/core/status.el index 1dd2378e..04eb112f 100644 --- a/lisp/core/status.el +++ b/lisp/core/status.el @@ -23,22 +23,22 @@ ;; ;;; Core -(defvar eask--status-info-count 0 +(defvar eask-status--info-count 0 "Count of the stratus info.") -(defun eask--environment-name () +(defun eask-status--environment-name () "Get the working environment name." (cond ((eask-global-p) "global (~/)") ((eask-config-p) (format "configuration (%s)" user-emacs-directory)) (t "development (./)"))) -(defun eask--print-title (title) +(defun eask-status--print-title (title) "Print section TITLE." (eask-println "") (eask-println (ansi-underscore title)) (eask-println "")) -(defun eask--print-info (fmt pair) +(defun eask-status--print-info (fmt pair) "Print environment info with FMT and PAIR." (let ((title (eask-2str (nth 0 pair))) (content (eask-2str (nth 1 pair))) @@ -48,7 +48,7 @@ (ansi-bright-black content) note))) -(defun eask--list-max-length (lst index) +(defun eask-status--list-max-length (lst index) "Return the LST max length by its INDEX." (let ((max-len 0) (max-current)) @@ -60,27 +60,27 @@ max-len (max (length max-current) max-len))) max-len)) -(defun eask--print-infos (lst) +(defun eask-status--print-infos (lst) "Print environment info LST." - (let* ((len-0 (eask-2str (eask--list-max-length lst 0))) - (len-1 (eask-2str (+ (eask--list-max-length lst 1) 2))) + (let* ((len-0 (eask-2str (eask-status--list-max-length lst 0))) + (len-1 (eask-2str (+ (eask-status--list-max-length lst 1) 2))) (fmt (concat " %-21s %-" len-1 "s %s"))) (dolist (pair lst) (when pair - (eask--print-info fmt pair) - (cl-incf eask--status-info-count))))) + (eask-status--print-info fmt pair) + (cl-incf eask-status--info-count))))) -(defun eask--status-file-dir (path) +(defun eask-status--file-dir (path) "Return file directory status from PATH." (unless (file-exists-p path) (ansi-red "(missing)"))) (eask-start - (eask-println "In the %s environment" (eask--environment-name)) + (eask-println "In the %s environment" (eask-status--environment-name)) (eask-println "Your emacs home is point to %s" (expand-file-name user-emacs-directory)) - (eask--print-title "System:") - (eask--print-infos + (eask-status--print-title "System:") + (eask-status--print-infos `(("Emacs version" ,emacs-version) ("Invocation" ,invocation-directory) ("Build No." ,emacs-build-number) @@ -90,27 +90,27 @@ `("Build time" ,time)) ("System type" ,system-type))) - (eask--print-title "Environment:") - (eask--print-infos + (eask-status--print-title "Environment:") + (eask-status--print-infos `(("Emacs directory" ,(expand-file-name user-emacs-directory) - ,(eask--status-file-dir user-emacs-directory)) + ,(eask-status--file-dir user-emacs-directory)) ("ELPA directory" ,(expand-file-name package-user-dir) - ,(eask--status-file-dir package-user-dir)) + ,(eask-status--file-dir package-user-dir)) ("early-init.el" ,(expand-file-name early-init-file) - ,(eask--status-file-dir early-init-file)) + ,(eask-status--file-dir early-init-file)) (".emacs" ,(expand-file-name eask-dot-emacs-file) - ,(eask--status-file-dir eask-dot-emacs-file)) + ,(eask-status--file-dir eask-dot-emacs-file)) ("init.el" ,(expand-file-name user-init-file) - ,(eask--status-file-dir user-init-file)) + ,(eask-status--file-dir user-init-file)) ("custom.el" ,(if custom-file (expand-file-name custom-file) "nil") - ,(when custom-file (eask--status-file-dir custom-file))))) + ,(when custom-file (eask-status--file-dir custom-file))))) - (eask--print-title "Eask-file:") - (eask--print-infos + (eask-status--print-title "Eask-file:") + (eask-status--print-infos `(("Eask file" ,(or eask-file "missing")) ("Eask-file Count" ,(length (eask--find-files default-directory))))) - (eask-info "(Total of %s states listed)" eask--status-info-count)) + (eask-info "(Total of %s states listed)" eask-status--info-count)) ;;; core/status.el ends here diff --git a/lisp/core/uninstall.el b/lisp/core/uninstall.el index 5344e6d7..3e687559 100644 --- a/lisp/core/uninstall.el +++ b/lisp/core/uninstall.el @@ -20,7 +20,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--uninstall-packages(names) +(defun eask-uninstall--packages(names) "Uninstall packages by its NAMES." (let* ((names (mapcar #'eask-intern names)) (len (length names)) (s (eask--sinr len "" "s")) @@ -36,7 +36,7 @@ (eask-start (eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x (if-let ((names (eask-args))) - (eask--uninstall-packages names) + (eask-uninstall--packages names) (if-let* ((name (intern (eask-guess-package-name))) ((package-installed-p name))) (progn diff --git a/lisp/core/upgrade.el b/lisp/core/upgrade.el index b97b65ea..963715e1 100644 --- a/lisp/core/upgrade.el +++ b/lisp/core/upgrade.el @@ -19,18 +19,18 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--package-version-string (pkg-desc) +(defun eask-upgrade--package-version-string (pkg-desc) "Get package version string with color from PKG-DESC." (let ((version (package-desc-version pkg-desc))) (ansi-yellow (package-version-join version)))) -(defun eask-package-upgrade (pkg-desc) +(defun eask-upgrade--package (pkg-desc) "Upgrade package using PKG-DESC." (let* ((name (package-desc-name pkg-desc)) (pkg-string (ansi-green (eask-2str name))) - (version-new (eask--package-version-string pkg-desc)) + (version-new (eask-upgrade--package-version-string pkg-desc)) (old-pkg-desc (eask-package-desc name t)) - (version-old (eask--package-version-string old-pkg-desc))) + (version-old (eask-upgrade--package-version-string old-pkg-desc))) (eask-with-progress (format " - Upgrading %s (%s) -> (%s)..." pkg-string version-old version-new) (eask-with-verbosity 'debug @@ -56,11 +56,11 @@ (ansi-green "done ✓")) upgrades)) -(defun eask-package-upgrade-all () +(defun eask-upgrade--package-all () "Upgrade for archive packages." (if-let ((upgrades (eask-package--upgrades))) (progn - (mapc #'eask-package-upgrade upgrades) + (mapc #'eask-upgrade--package upgrades) (eask-msg "") (eask-info "(Done upgrading all packages)")) (eask-msg "") @@ -73,9 +73,9 @@ (setq name (intern name)) (if (package-installed-p name) (if (or (eask-package--upgradable-p name) (eask-force-p)) - (eask-package-upgrade (cadr (assq name package-archive-contents))) + (eask-upgrade--package (cadr (assq name package-archive-contents))) (eask-warn "Package `%s` is already up to date" name)) (eask-error "Package does not exists `%s`, you need to install before upgrade" name))) - (eask-package-upgrade-all))) + (eask-upgrade--package-all))) ;;; core/upgrade.el ends here diff --git a/lisp/create/elpa.el b/lisp/create/elpa.el index aa7deb17..9125dc02 100644 --- a/lisp/create/elpa.el +++ b/lisp/create/elpa.el @@ -19,7 +19,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defconst eask--template-elpa-name "template-elpa" +(defconst eask-create-elpa--template-name "template-elpa" "Holds template project name.") (eask-start diff --git a/lisp/create/package.el b/lisp/create/package.el index 14b7e1e6..2fb5d271 100644 --- a/lisp/create/package.el +++ b/lisp/create/package.el @@ -19,10 +19,10 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defconst eask--template-project-name "template-elisp" +(defconst eask-create-package--template-name "template-elisp" "Holds template project name.") -(defun eask--replace-string-in-buffer (old new) +(defun eask-create-package--replace-s-in-buffer (old new) "Replace OLD to NEW in buffer." (let ((str (buffer-string))) (setq str (eask-s-replace old new str)) @@ -31,13 +31,13 @@ ;; XXX: we can't use `user-full-name' in batch-mode. It will always return ;; empty string. -(defun eask--get-user () +(defun eask-create-package--get-user () "Return user name." (string-trim (shell-command-to-string "git config user.name"))) ;; XXX: we can't use `user-mail-address' in batch-mode. It will always return ;; empty string. -(defun eask--get-mail () +(defun eask-create-package--get-mail () "Return user email." (string-trim (shell-command-to-string "git config user.email"))) @@ -45,18 +45,18 @@ (ignore-errors (delete-directory ".git" t)) (eask-with-progress "Preparing your new elisp project... " - (let ((template-package-file (expand-file-name (concat eask--template-project-name ".el")))) + (let ((template-package-file (expand-file-name (concat eask-create-package--template-name ".el")))) (rename-file template-package-file eask-package-file) (with-current-buffer (find-file eask-package-file) - (eask--replace-string-in-buffer eask--template-project-name (eask-package-name)) - (eask--replace-string-in-buffer "{ SUMMARY }" (eask-package-description)) - (eask--replace-string-in-buffer "{ YEAR }" (format-time-string "%Y")) - (eask--replace-string-in-buffer "{ FULL_NAME }" (eask--get-user)) - (eask--replace-string-in-buffer "{ MAIL_ADDR }" (eask--get-mail)) - (eask--replace-string-in-buffer "{ WEBSITE_URL }" (or eask-website-url "")) - (eask--replace-string-in-buffer "{ VERSION }" (eask-package-version)) - (eask--replace-string-in-buffer "{ EMACS_VERSION }" (eask-depends-emacs-version)) - (eask--replace-string-in-buffer "{ KEYWORDS }" (string-join eask-keywords " ")) + (eask-create-package--replace-s-in-buffer eask-create-package--template-name (eask-package-name)) + (eask-create-package--replace-s-in-buffer "{ SUMMARY }" (eask-package-description)) + (eask-create-package--replace-s-in-buffer "{ YEAR }" (format-time-string "%Y")) + (eask-create-package--replace-s-in-buffer "{ FULL_NAME }" (eask-create-package--get-user)) + (eask-create-package--replace-s-in-buffer "{ MAIL_ADDR }" (eask-create-package--get-mail)) + (eask-create-package--replace-s-in-buffer "{ WEBSITE_URL }" (or eask-website-url "")) + (eask-create-package--replace-s-in-buffer "{ VERSION }" (eask-package-version)) + (eask-create-package--replace-s-in-buffer "{ EMACS_VERSION }" (eask-depends-emacs-version)) + (eask-create-package--replace-s-in-buffer "{ KEYWORDS }" (string-join eask-keywords " ")) (save-buffer))) "done ✓") (eask-msg "") diff --git a/lisp/generate/ignore.el b/lisp/generate/ignore.el index b569dff8..ff337b66 100644 --- a/lisp/generate/ignore.el +++ b/lisp/generate/ignore.el @@ -31,7 +31,7 @@ ;; ;;; Core -(defun eask--print-ignore-menu () +(defun eask-generate-ignore--print-menu () "Print all available ignore." (eask-msg "available via `eask generate ignore`") (eask-msg "") @@ -58,7 +58,7 @@ ((not (member name (eask-with-verbosity 'debug (gitignore-templates-names)))) (eask-info "(Invalid ignore type: `%s`)" name) - (eask--print-ignore-menu)) + (eask-generate-ignore--print-menu)) (t (eask-with-progress (format " - [1/1] Generating ignore file in %s... " filename) diff --git a/lisp/generate/license.el b/lisp/generate/license.el index 1b071776..5cd7ab8a 100644 --- a/lisp/generate/license.el +++ b/lisp/generate/license.el @@ -33,7 +33,7 @@ ;; ;;; Core -(defun eask--print-license-menu () +(defun eask-generate-license--print-menu () "Print all available license." (eask-msg "available via `eask generate license`") (eask-msg "") @@ -62,7 +62,7 @@ (eask-info "(The license file already exists `%s`)" filename)) ((not (member name (license-templates-keys))) (eask-info "(Invalid license type: `%s`)" name) - (eask--print-license-menu)) + (eask-generate-license--print-menu)) (t (eask-with-progress (format " - [1/1] Generating license file in %s... " filename) diff --git a/lisp/generate/pkg-file.el b/lisp/generate/pkg-file.el index 4cc3a346..409670d7 100644 --- a/lisp/generate/pkg-file.el +++ b/lisp/generate/pkg-file.el @@ -14,16 +14,16 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defvar eask--pkg-filename) +(defvar eask-generate-pkg-file--filename) -(defun eask--generate-from-pkg-desc () +(defun eask-generate-pkg-file--from-pkg-desc () "Generate pkg-file from a package-descriptor." (let* ((name (package-desc-name eask-package-desc)) (pkg-file (expand-file-name (format "%s-pkg.el" name)))) - (setq eask--pkg-filename pkg-file) + (setq eask-generate-pkg-file--filename pkg-file) (package-generate-description-file eask-package-desc pkg-file))) -(defun eask--generate-from-eask-file () +(defun eask-generate-pkg-file--from-eask-file () "Generate pkg-file from Eask file." (let* ((name (eask-guess-package-name)) (pkg-file (expand-file-name (concat name "-pkg.el"))) @@ -35,22 +35,22 @@ (nth 0 (cdr elm)) "0"))) (append eask-depends-on-emacs eask-depends-on)))) - (setq eask--pkg-filename pkg-file) + (setq eask-generate-pkg-file--filename pkg-file) (write-region (pp-to-string `(define-package ,name ,version ,description ',reqs)) nil pkg-file))) (eask-start - (if eask-package-desc (eask--generate-from-pkg-desc) - (eask--generate-from-eask-file)) - (eask-info "%s:" (file-name-nondirectory (directory-file-name eask--pkg-filename))) + (if eask-package-desc (eask-generate-pkg-file--from-pkg-desc) + (eask-generate-pkg-file--from-eask-file)) + (eask-info "%s:" (file-name-nondirectory (directory-file-name eask-generate-pkg-file--filename))) (eask-msg "") (eask-msg "%s" (with-temp-buffer (emacs-lisp-mode) - (insert-file-contents eask--pkg-filename) + (insert-file-contents eask-generate-pkg-file--filename) (pp-buffer) (eask--silent (indent-region (point-min) (point-max))) (buffer-string))) - (eask-info "(Generated -pkg.el file in %s)" eask--pkg-filename)) + (eask-info "(Generated -pkg.el file in %s)" eask-generate-pkg-file--filename)) ;;; generate/pkg-file.el ends here diff --git a/lisp/generate/recipe.el b/lisp/generate/recipe.el index 01d2f066..a16b7f53 100644 --- a/lisp/generate/recipe.el +++ b/lisp/generate/recipe.el @@ -25,7 +25,7 @@ ;;; Core (eask-start - (if-let ((recipe (eask--recipe-string)) + (if-let ((recipe (eask-recipe-string)) (name (eask-guess-package-name))) (let* ((eask-recipe-path (or (eask-args 0) eask-recipe-path)) (eask-recipe-path (expand-file-name eask-recipe-path)) diff --git a/lisp/generate/workflow/circle-ci.el b/lisp/generate/workflow/circle-ci.el index 2ab01dc9..9c5d3530 100644 --- a/lisp/generate/workflow/circle-ci.el +++ b/lisp/generate/workflow/circle-ci.el @@ -19,7 +19,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--circle-ci-insert-jobs (version) +(defun eask-generate-workflow-circle-ci--insert-jobs (version) "Insert Circle CI's jobs instruction for specific Emacs' VERSION." (insert " test-ubuntu-emacs-" version ":" "\n") (insert " docker:" "\n") @@ -50,16 +50,16 @@ (search-backward "{ EMACS_VERSION }" nil t) (delete-region (point) (line-end-position)) (when (version<= minimum-version "26.1") - (eask--circle-ci-insert-jobs "26")) + (eask-generate-workflow-circle-ci--insert-jobs "26")) (when (version<= minimum-version "27.1") (insert "\n") - (eask--circle-ci-insert-jobs "27")) + (eask-generate-workflow-circle-ci--insert-jobs "27")) (when (version<= minimum-version "28.1") (insert "\n") - (eask--circle-ci-insert-jobs "28")) + (eask-generate-workflow-circle-ci--insert-jobs "28")) (when (version<= minimum-version "29.1") (insert "\n") - (eask--circle-ci-insert-jobs "master"))) + (eask-generate-workflow-circle-ci--insert-jobs "master"))) ;; Config matrix (when (search-forward "{ MATRIX_JOBS }" nil t) (search-backward "{ MATRIX_JOBS }" nil t) diff --git a/lisp/generate/workflow/gitlab.el b/lisp/generate/workflow/gitlab.el index 80f39927..1df210cc 100644 --- a/lisp/generate/workflow/gitlab.el +++ b/lisp/generate/workflow/gitlab.el @@ -19,7 +19,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--gitlab-insert-jobs (version) +(defun eask-generate-workflow-gitlab--insert-jobs (version) "Insert GitLab Runner's jobs instruction for specific Emacs' VERSION." (insert "test-" version ":" "\n") (insert " image: silex/emacs:" version "-ci" "\n") @@ -48,13 +48,13 @@ (search-backward "{ EMACS_VERSION }" nil t) (delete-region (point) (line-end-position)) (when (version<= minimum-version "26.3") - (eask--gitlab-insert-jobs "26.3")) + (eask-generate-workflow-gitlab--insert-jobs "26.3")) (when (version<= minimum-version "27.2") - (eask--gitlab-insert-jobs "27.2")) + (eask-generate-workflow-gitlab--insert-jobs "27.2")) (when (version<= minimum-version "28.2") - (eask--gitlab-insert-jobs "28.2")) + (eask-generate-workflow-gitlab--insert-jobs "28.2")) (when (version<= minimum-version "29.2") - (eask--gitlab-insert-jobs "29.2")) + (eask-generate-workflow-gitlab--insert-jobs "29.2")) (when (version<= minimum-version "30") ;; TODO: snapshot? )) diff --git a/lisp/help/core/bump b/lisp/help/core/bump index 671402db..ebd23027 100644 --- a/lisp/help/core/bump +++ b/lisp/help/core/bump @@ -5,4 +5,4 @@ 💡 The `bump` command accepts multiple values: - $ eask bump major + $ eask bump major minor patch diff --git a/lisp/init/eldev.el b/lisp/init/eldev.el index 3a8deabb..5363a3f8 100644 --- a/lisp/init/eldev.el +++ b/lisp/init/eldev.el @@ -14,13 +14,13 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--eldev-map-elpa (name) +(defun eask-init-eldev--map-elpa (name) "Convert Eldev mapping to Eask mapping." (pcase name ("melpa-unstable" 'melpa) (_ name))) -(defun eask--convert-eldev (filename) +(defun eask-init-eldev--convert (filename) "Convert Eldev FILENAME to Eask." (let* ((filename (expand-file-name filename)) (file (file-name-nondirectory (eask-root-del filename))) @@ -66,7 +66,7 @@ (insert content) (when-let* ((names (mapcar #'car package-archives)) - (sources (mapcar #'eask--eldev-map-elpa names))) + (sources (mapcar #'eask-init-eldev--map-elpa names))) (insert "\n") (dolist (source sources) (insert "(source '" (eask-2str source) ")\n")))) @@ -95,7 +95,7 @@ (files (eldev--set-up) ; XXX: Load once! (dolist (file files) - (when (eask--convert-eldev file) + (when (eask-init-eldev--convert file) (cl-incf converted))) (eask-msg "") (eask-info "(Total of %s Eldev-file%s converted)" converted diff --git a/lisp/init/keg.el b/lisp/init/keg.el index fbaa7d1a..0cd7b28c 100644 --- a/lisp/init/keg.el +++ b/lisp/init/keg.el @@ -15,7 +15,7 @@ nil t)) ;; Copied from `keg.el' -(defun eask--keg-file-read (path) +(defun eask-init-keg--file-read (path) "Return sexp from Keg file (PATH) search from `deafult-directory'. If no found the Keg file, returns nil." (let (sources devs packages lint-disables scripts) @@ -42,13 +42,13 @@ If no found the Keg file, returns nil." (disables . ,(nreverse (delete-dups lint-disables))) (scripts . ,(nreverse (delete-dups scripts))))))) -(defun eask--convert-keg (filename) +(defun eask-init-key--convert (filename) "Convert Keg FILENAME to Eask." (let* ((filename (expand-file-name filename)) (file (file-name-nondirectory (eask-root-del filename))) (new-file (eask-s-replace "Keg" "Eask" file)) (new-filename (expand-file-name new-file)) - (contents (ignore-errors (eask--keg-file-read filename))) ; Read it! + (contents (ignore-errors (eask-init-keg--file-read filename))) ; Read it! (converted)) (eask-with-progress (format "Converting file `%s` to `%s`... " file new-file) @@ -142,7 +142,7 @@ If no found the Keg file, returns nil." ;; Files found, do the action! (files (dolist (file files) - (when (eask--convert-keg file) + (when (eask-init-key--convert file) (cl-incf converted))) (eask-msg "") (eask-info "(Total of %s Keg-file%s converted)" converted diff --git a/lisp/init/source.el b/lisp/init/source.el index 777a1f79..0535231e 100644 --- a/lisp/init/source.el +++ b/lisp/init/source.el @@ -14,7 +14,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--convert-source (filename) +(defun eask-init-source--convert (filename) "Convert elisp source FILENAME to Eask." (let* ((filename (expand-file-name filename)) (file (file-name-nondirectory (eask-root-del filename))) @@ -88,7 +88,7 @@ ;; Files found, do the action! (files (dolist (file files) - (when-let ((new-filename (eask--convert-source file))) + (when-let ((new-filename (eask-init-source--convert file))) (push new-filename converted-files))) ;; Automatically rename file into Eask file when only one file is converted! (when (= (length converted-files) 1) diff --git a/lisp/link/add.el b/lisp/link/add.el index a3eab083..a29b8e47 100644 --- a/lisp/link/add.el +++ b/lisp/link/add.el @@ -24,23 +24,23 @@ (eask-load "link/delete") (eask-load "core/install") -(defun eask--package-desc-reqs (desc) +(defun eask-link-add--package-desc-reqs (desc) "Return a list of requirements from package DESC." (cl-remove-if (lambda (name) (string= name "emacs")) (mapcar #'car (package-desc-reqs desc)))) -(defvar eask--link-package-name nil "Used to form package name.") -(defvar eask--link-package-version nil "Used to form package name.") +(defvar eask-link-add--package-name nil "Used to form package name.") +(defvar eask-link-add--package-version nil "Used to form package name.") -(defun eask--create-link (source) +(defun eask-link-add--create (source) "Add link with SOURCE path." - (let* ((dir-name (format "%s-%s" eask--link-package-name eask--link-package-version)) + (let* ((dir-name (format "%s-%s" eask-link-add--package-name eask-link-add--package-version)) (link-path (expand-file-name dir-name package-user-dir))) (when (file-exists-p link-path) (eask-msg "") (eask-with-progress (ansi-yellow "!! The link is already presented; override the existing link... ") - (eask--delete-symlink link-path) + (eask-link-delete-symlink link-path) (ansi-yellow "done !!"))) (make-symbolic-link source link-path) (eask-msg "") @@ -61,7 +61,7 @@ (eask-info "(Can't create link %s to non-existing path: %s)" name source)) ;; Create the link (t - (let ((links (eask--links)) + (let ((links (eask-link-list)) (pkg-el (expand-file-name (package--description-file name) source)) (pkg-eask (car (eask--all-files source))) (pkg-desc)) @@ -74,22 +74,22 @@ (if pkg-el (package--read-pkg-desc 'dir) (package-buffer-info))))) - (setq eask--link-package-name (package-desc-name pkg-desc) - eask--link-package-version (package-version-join - (package-desc-version pkg-desc))) + (setq eask-link-add--package-name (package-desc-name pkg-desc) + eask-link-add--package-version (package-version-join + (package-desc-version pkg-desc))) ;; XXX: Install dependencies for linked package (eask-msg "") - (eask--install-packages (eask--package-desc-reqs pkg-desc)) - (eask--create-link source) + (eask-install-packages (eask-link-add--package-desc-reqs pkg-desc)) + (eask-link-add--create source) (when (and (zerop (length links)) ; if no link previously, - (= 1 (length (eask--links)))) ; and first link created! + (= 1 (length (eask-link-list)))) ; and first link created! (eask-help "link/add/success/pkg"))) ((ignore-errors (file-exists-p pkg-eask)) (eask-log "💡 Validating package through %s... done!" pkg-eask) (eask--save-load-eask-file pkg-eask (progn - (setq eask--link-package-name (eask-package-name) - eask--link-package-version (eask-package-version)) + (setq eask-link-add--package-name (eask-package-name) + eask-link-add--package-version (eask-package-version)) ;; XXX: Install dependencies for linked package (eask-msg "") (eask-install-dependencies) @@ -110,9 +110,9 @@ (unless pkg-file-presented (eask-with-verbosity 'debug (eask-call "generate/pkg-file"))) (if pkg-file-presented "already presented ✗" "done ✓"))) - (eask--create-link source) + (eask-link-add--create source) (when (and (zerop (length links)) ; if no link previously, - (= 1 (length (eask--links)))) ; and first link created! + (= 1 (length (eask-link-list)))) ; and first link created! (eask-help "link/add/success/eask"))) (eask-error "✗ Error loading Eask-file: %s" pkg-eask))) (t diff --git a/lisp/link/delete.el b/lisp/link/delete.el index de8bbcb6..3036c03a 100644 --- a/lisp/link/delete.el +++ b/lisp/link/delete.el @@ -21,19 +21,19 @@ (eask-load "link/list") -(defun eask--delete-symlink (path) +(defun eask-link-delete-symlink (path) "Delete symlink PATH." (ignore-errors (delete-file path)) (ignore-errors (delete-directory path t))) -(defun eask--delete-link (name) +(defun eask-link-delete--link (name) "Delete a link by its' NAME." - (let* ((links (eask--links)) + (let* ((links (eask-link-list)) (source (assoc name links)) (link (expand-file-name name package-user-dir))) (if (and source (file-symlink-p link)) (progn - (eask--delete-symlink link) + (eask-link-delete-symlink link) (eask-info "✓ Package `%s` unlinked" name) t) (eask-info "✗ No linked package name `%s`" name) @@ -41,7 +41,7 @@ (eask-start (let* ((names (eask-args)) - (links (eask--links)) + (links (eask-link-list)) (link-names (mapcar #'car links)) (deleted 0)) (cond @@ -68,7 +68,7 @@ ;; Okay! Good to go! (t (dolist (name names) - (when (eask--delete-link name) + (when (eask-link-delete--link name) (cl-incf deleted))) (eask-msg "") (eask-info "(Total of %s package%s unlinked, %s skipped)" diff --git a/lisp/link/list.el b/lisp/link/list.el index c4a7b2a9..133b4b3c 100644 --- a/lisp/link/list.el +++ b/lisp/link/list.el @@ -14,7 +14,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--links () +(defun eask-link-list () "Return a list of all links." (mapcar (lambda (file) @@ -28,7 +28,7 @@ The argument OFFSET is used to align the result." (eask-println (concat " %-" (eask-2str offset) "s %s") (car link) (cdr link))) (eask-start - (if-let* ((links (eask--links)) + (if-let* ((links (eask-link-list)) (offset (eask-seq-str-max (mapcar #'car links)))) (progn (eask-info "Available linked packages:") diff --git a/lisp/lint/checkdoc.el b/lisp/lint/checkdoc.el index beff02e4..c8a469db 100644 --- a/lisp/lint/checkdoc.el +++ b/lisp/lint/checkdoc.el @@ -35,14 +35,14 @@ ;; ;;; Core -(defvar eask--checkdoc-errors nil "Error flag.") +(defvar eask-lint-checkdoc--errors nil "Error flag.") -(defun eask--checkdoc-print-error (text start _end &optional _unfixable) +(defun eask-lint-checkdoc--print-error (text start _end &optional _unfixable) "Print error for checkdoc. Arguments TEXT, START, END and UNFIXABLE are required for this function to be assigned to variable `checkdoc-create-error-function'." - (setq eask--checkdoc-errors t) + (setq eask-lint-checkdoc--errors t) (let ((msg (concat (checkdoc-buffer-label) ":" (int-to-string (count-lines (point-min) (or start (point-min)))) ": " text))) @@ -50,17 +50,17 @@ be assigned to variable `checkdoc-create-error-function'." ;; Return nil because we *are* generating a buffered list of errors. nil)) -(setq checkdoc-create-error-function #'eask--checkdoc-print-error) +(setq checkdoc-create-error-function #'eask-lint-checkdoc--print-error) -(defun eask--checkdoc-file (filename) +(defun eask-lint-checkdoc--file (filename) "Run checkdoc on FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) - (eask--checkdoc-errors)) + (eask-lint-checkdoc--errors)) (eask-lint-first-newline) (eask-msg "`%s` with checkdoc (%s)" (ansi-green file) checkdoc-version) (checkdoc-file filename) - (unless eask--checkdoc-errors (eask-msg "No issues found")))) + (unless eask-lint-checkdoc--errors (eask-msg "No issues found")))) (eask-start (require 'checkdoc) @@ -71,7 +71,7 @@ be assigned to variable `checkdoc-create-error-function'." (cond ;; Files found, do the action! (files - (mapcar #'eask--checkdoc-file files) + (mapcar #'eask-lint-checkdoc--file files) (eask-msg "") (eask-info "(Total of %s file%s %s checked)" (length files) (eask--sinr files "" "s") diff --git a/lisp/lint/declare.el b/lisp/lint/declare.el index 837bfd22..9809ae10 100644 --- a/lisp/lint/declare.el +++ b/lisp/lint/declare.el @@ -27,7 +27,7 @@ ;; ;;; Core -(defun eask--check-declare-file (filename) +(defun eask-lint-declare--file (filename) "Run check-declare on FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) @@ -49,7 +49,7 @@ (cond ;; Files found, do the action! (files - (mapcar #'eask--check-declare-file files) + (mapcar #'eask-lint-declare--file files) (eask-msg "") (eask-info "(Total of %s file%s %s checked)" (length files) (eask--sinr files "" "s") diff --git a/lisp/lint/elint.el b/lisp/lint/elint.el index bccf82e9..99d28ac7 100644 --- a/lisp/lint/elint.el +++ b/lisp/lint/elint.el @@ -32,7 +32,7 @@ ;; ;;; Core -(defun eask--elint-file (filename) +(defun eask-lint-elint--file (filename) "Run elint on FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) @@ -52,7 +52,7 @@ (cond ;; Files found, do the action! (files - (mapcar #'eask--elint-file files) + (mapcar #'eask-lint-elint--file files) (eask-msg "") (eask-info "(Total of %s file%s %s checked)" (length files) (eask--sinr files "" "s") diff --git a/lisp/lint/elisp-lint.el b/lisp/lint/elisp-lint.el index 80f3bbb2..9506761f 100644 --- a/lisp/lint/elisp-lint.el +++ b/lisp/lint/elisp-lint.el @@ -32,16 +32,16 @@ ;; ;;; Core -(defconst eask--elisp-lint-version nil +(defconst eask-lint-elisp-lint--version nil "`elisp-lint' version.") -(defun eask--elisp-lint-process-file (filename) +(defun eask-lint-elisp-lint--process-file (filename) "Process FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) success) (eask-msg "") - (eask-msg "`%s` with elisp-lint (%s)" (ansi-green file) eask--elisp-lint-version) + (eask-msg "`%s` with elisp-lint (%s)" (ansi-green file) eask-lint-elisp-lint--version) (eask-with-verbosity 'debug (setq success (elisp-lint-file filename))) ;; Report result! @@ -54,7 +54,7 @@ ;; Preparation (eask-with-archives '("gnu" "melpa") (eask-package-install 'elisp-lint)) - (setq eask--elisp-lint-version (eask-package--version-string 'elisp-lint)) + (setq eask-lint-elisp-lint--version (eask-package--version-string 'elisp-lint)) ;; Start Linting (require 'elisp-lint) @@ -65,7 +65,7 @@ (cond ;; Files found, do the action! (files - (mapcar #'eask--elisp-lint-process-file files) + (mapcar #'eask-lint-elisp-lint--process-file files) (eask-msg "") (eask-info "(Total of %s file%s linted)" (length files) (eask--sinr files "" "s"))) diff --git a/lisp/lint/elsa.el b/lisp/lint/elsa.el index 1c89374b..b04dccbc 100644 --- a/lisp/lint/elsa.el +++ b/lisp/lint/elsa.el @@ -38,16 +38,16 @@ ;; ;;; Core -(defconst eask--elsa-version nil +(defconst eask-lint-elsa--version nil "Elsa version.") -(defun eask--elsa-analyse-file (filename) +(defun eask-lint-elsa--analyse-file (filename) "Process FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) errors) (eask-msg "") - (eask-msg "`%s` with elsa (%s)" (ansi-green file) eask--elsa-version) + (eask-msg "`%s` with elsa (%s)" (ansi-green file) eask-lint-elsa--version) (eask-with-verbosity 'debug (setq errors (oref (elsa-analyse-file filename elsa-global-state) errors))) (if errors @@ -62,7 +62,7 @@ ;; Preparation (eask-with-archives '("gnu" "melpa") (eask-package-install 'elsa)) - (setq eask--elsa-version (eask-package--version-string 'elsa)) + (setq eask-lint-elsa--version (eask-package--version-string 'elsa)) ;; Start Linting (require 'elsa) @@ -74,7 +74,7 @@ ;; Files found, do the action! (files (elsa-load-config) - (mapcar #'eask--elsa-analyse-file files) + (mapcar #'eask-lint-elsa--analyse-file files) (eask-msg "") (eask-info "(Total of %s file%s linted)" (length files) (eask--sinr files "" "s"))) diff --git a/lisp/lint/indent.el b/lisp/lint/indent.el index 20bd1749..1d7388e8 100644 --- a/lisp/lint/indent.el +++ b/lisp/lint/indent.el @@ -27,24 +27,24 @@ ;; ;;; Core -(defun eask--undo-pos (entry) +(defun eask-lint-indent--undo-pos (entry) "Return the undo pos from ENTRY." (cl-typecase (car entry) (number (car entry)) (string (abs (cdr entry))))) -(defun eask--undo-infos (undo-list) +(defun eask-lint-indent--undo-infos (undo-list) "Return list of infos in UNDO-LIST." (let ((infos)) (dolist (elm undo-list) - (when-let* ((pos (eask--undo-pos elm)) + (when-let* ((pos (eask-lint-indent--undo-pos elm)) (line (line-number-at-pos pos)) (expected (progn (eask--goto-line line) (current-indentation)))) (push (list line expected) infos))) infos)) -(defun eask--indent-lint-file (file) +(defun eask-lint-indent--file (file) "Lint indent for FILE." (eask-msg "") (eask-msg "`%s` with indent-lint" (ansi-green (eask-root-del file))) @@ -55,7 +55,7 @@ (eask--silent (indent-region (point-min) (point-max))) (if (/= tick (buffer-modified-tick)) ;; Indentation changed: warn for each line. - (dolist (info (eask--undo-infos buffer-undo-list)) + (dolist (info (eask-lint-indent--undo-infos buffer-undo-list)) (let* ((line (nth 0 info)) (column (nth 1 info)) (current (eask-with-buffer @@ -74,7 +74,7 @@ (cond ;; Files found, do the action! (files - (mapcar #'eask--indent-lint-file files) + (mapcar #'eask-lint-indent--file files) (eask-msg "") (eask-info "(Total of %s file%s linted)" (length files) (eask--sinr files "" "s"))) diff --git a/lisp/lint/keywords.el b/lisp/lint/keywords.el index a67e9938..fa2f41f0 100644 --- a/lisp/lint/keywords.el +++ b/lisp/lint/keywords.el @@ -24,7 +24,7 @@ (require 'finder) -(defun eask--defined-keywords (keywords) +(defun eask-lint-keywords--defined (keywords) "Return t if KEYWORDS are defined correctly." (let ((available-keywords (mapcar #'car finder-known-keywords)) (result)) @@ -46,7 +46,7 @@ (t (eask-lint-first-newline) (eask-msg "`%s` with keywords-lint" (ansi-green file)) - (if (eask--defined-keywords keywords) + (if (eask-lint-keywords--defined keywords) (progn (eask-msg "") (eask-info "(No issues found.)")) diff --git a/lisp/lint/license.el b/lisp/lint/license.el index 60757900..25746b65 100644 --- a/lisp/lint/license.el +++ b/lisp/lint/license.el @@ -27,13 +27,13 @@ ;; ;;; Core -(defun eask--string-match-all (contents) +(defun eask-lint-license--s-match-all (contents) "Return t when every CONTENTS match the `buffer-string'." (cl-every (lambda (content) (string-match-p (eask-s-replace "\n" " " content) (buffer-string))) contents)) -(defun eask--scan-license (file) +(defun eask-lint-license--scan (file) "Scan the license FILE." (with-temp-buffer (insert-file-contents file) @@ -44,87 +44,87 @@ (insert content)) ;; See https://api.github.com/licenses (cond - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Licensed under the Academic Free License version 3.0")) '("afl-3.0" "Academic Free License v3.0" "AFL-3.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("You should have received a copy of the GNU Affero General Public License")) '("agpl-3.0" "GNU Affero General Public License v3.0" "AGPL-3.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Everyone is permitted to copy and distribute verbatim copies" "but changing it is not allowed." "artistic")) '("artistic-2.0" "Artistic License 2.0" "Artistic-2.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Licensed under the Apache License, Version 2.0")) '("apache-2.0" "Apache License 2.0" "Apache-2.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Redistribution and use in source and binary forms" "Redistributions in binary form must reproduce")) '("bsd-2-clause" "BSD 2-Clause \"Simplified\" License" "BSD-2-Clause")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Redistribution and use in source and binary forms" "Neither the name of the copyright holder nor")) '("bsd-3-clause" "BSD 3-Clause \"New\" or \"Revised\" License" "BSD-3-Clause")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Permission is hereby granted, free of charge, to any person or organization")) '("bsl-1.0" "Boost Software License 1.0" "BSL-1.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("The laws of most jurisdictions throughout the world automatically confer exclusive Copyright")) '("cc0-1.0" "Creative Commons Zero v1.0 Universal" "CC0-1.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Eclipse Public License - v 2.0" "Eclipse Foundation")) '("epl-2.0" "Eclipse Public License 2.0" "EPL-2.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Copying and distribution of this file, with or without")) '("fsfap" "FSF All Permissive License" "FSFAP")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("is free software." "you can redistribute it" "version 2 of the")) '("gpl-2.0" "GNU General Public License v2.0" "GPL-2.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("is free software." "you can redistribute it" "version 3 of the")) '("gpl-3.0" "GNU General Public License v3.0" "GPL-3.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Permission to use, copy, modify, and/or distribute this")) '("isc" " Internet Systems Consortium" "ISC")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Lesser" "GNU" "version 2")) '("lgpl-2.1" "GNU Lesser General Public License v2.1" "LGPL-2.1")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("This license governs use of the accompanying software." "If you use the software, you accept this license." "If you do not accept the license, do not use the software.")) '("ms-pl" "Microsoft Public License" "MS-PL")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Permission is hereby granted, free of charge, to any person")) '("mit" "MIT License" "MIT")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("http://mozilla.org/MPL/2.0/")) '("mpl-2.0" "Mozilla Public License 2.0" "MPL-2.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Licensed under the Open Software License version 3.0")) '("osl-3.0" "Open Software License 3.0" "OSL-3.0")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("This is free and unencumbered software released into")) '("unlicense" "The Unlicense" "Unlicense")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Everyone is permitted to copy and distribute verbatim copies")) '("wtfpl-1" "Do What the Fuck You Want To Public License (Version 1)" "WTFPL-1")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Everyone is permitted to copy and distribute verbatim or modified")) '("wtfpl-2" "Do What the Fuck You Want To Public License (Version 2)" "WTFPL-2")) - ((eask--string-match-all + ((eask-lint-license--s-match-all '("Permission is granted to anyone to use this software for any purpose,")) '("zlib" "zlib License" "Zlib")) (t '("unknown" "Unknown license" "unknown"))))) -(defun eask--print-scanned-license (scanned) +(defun eask-lint-license--print-scanned (scanned) "Print all SCANNED license." (eask-msg "available via `eask lint license`") (eask-msg "") @@ -151,9 +151,9 @@ (eask-progress-seq " - Sanning" files "done! ✓" (lambda (file) - (push (append (eask--scan-license file) `(,file)) scanned))) + (push (append (eask-lint-license--scan file) `(,file)) scanned))) (eask-msg "") - (eask--print-scanned-license (reverse scanned)))))) + (eask-lint-license--print-scanned (reverse scanned)))))) ;;; lint/license.el ends here diff --git a/lisp/lint/package.el b/lisp/lint/package.el index 3b3eaa50..866eb20f 100644 --- a/lisp/lint/package.el +++ b/lisp/lint/package.el @@ -43,15 +43,15 @@ ;; ;;; Core -(defconst eask--package-lint-version nil +(defconst eask-lint-package--version nil "`package-lint' version.") -(defun eask--package-lint-file (filename) +(defun eask-lint-package--file (filename) "Package lint FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename))) (eask-msg "") - (eask-msg "`%s` with package-lint (%s)" (ansi-green file) eask--package-lint-version) + (eask-msg "`%s` with package-lint (%s)" (ansi-green file) eask-lint-package--version) (with-current-buffer (find-file filename) (package-lint-current-buffer) (kill-this-buffer))) @@ -61,7 +61,7 @@ ;; Preparation (eask-with-archives '("gnu" "melpa") (eask-package-install 'package-lint)) - (setq eask--package-lint-version (eask-package--version-string 'package-lint)) + (setq eask-lint-package--version (eask-package--version-string 'package-lint)) ;; Start Linting (require 'package-lint) @@ -74,7 +74,7 @@ (files (eask-pkg-init) ; XXX: Avoid not installable error! (setq package-lint-main-file eask-package-file) - (mapcar #'eask--package-lint-file files) + (mapcar #'eask-lint-package--file files) (eask-msg "") (eask-info "(Total of %s file%s linted)" (length files) (eask--sinr files "" "s"))) diff --git a/lisp/lint/regexps.el b/lisp/lint/regexps.el index fdd43881..a631d6e0 100644 --- a/lisp/lint/regexps.el +++ b/lisp/lint/regexps.el @@ -32,16 +32,16 @@ ;; ;;; Core -(defconst eask--relint-version nil +(defconst eask-lint-regexps--relint-version nil "`relint' version.") -(defun eask--relint-file (filename) +(defun eask-lint-regexps--relint-file (filename) "Package lint FILENAME." (let* ((filename (expand-file-name filename)) (file (eask-root-del filename)) (errors)) (eask-msg "") - (eask-msg "`%s` with relint (%s)" (ansi-green file) eask--relint-version) + (eask-msg "`%s` with relint (%s)" (ansi-green file) eask-lint-regexps--relint-version) (with-current-buffer (find-file filename) (setq errors (relint-buffer (current-buffer))) (dolist (err errors) @@ -62,7 +62,7 @@ ;; Preparation (eask-with-archives "gnu" (eask-package-install 'relint)) - (setq eask--relint-version (eask-package--version-string 'relint)) + (setq eask-lint-regexps--relint-version (eask-package--version-string 'relint)) ;; Start Linting (require 'relint) @@ -74,7 +74,7 @@ ;; Files found, do the action! (files (setq package-lint-main-file eask-package-file) - (mapcar #'eask--relint-file files) + (mapcar #'eask-lint-regexps--relint-file files) (eask-msg "") (eask-info "(Total of %s file%s linted)" (length files) (eask--sinr files "" "s"))) diff --git a/lisp/run/command.el b/lisp/run/command.el index 1d06ae8c..7062169d 100644 --- a/lisp/run/command.el +++ b/lisp/run/command.el @@ -19,11 +19,11 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--command-desc (name) +(defun eask-run-command--desc (name) "Return command's description by its command's NAME." (car (split-string (or (documentation name) "") "\n"))) -(defun eask--print-commands () +(defun eask-run-command--print-commands () "Print all available commands." (eask-msg "available via `eask run command`") (eask-msg "") @@ -31,17 +31,17 @@ (offset (eask-seq-str-max keys)) (fmt (concat " %-" (eask-2str offset) "s %s"))) (dolist (key keys) - (eask-msg fmt key (eask--command-desc key))) + (eask-msg fmt key (eask-run-command--desc key))) (eask-msg "") (eask-info "(Total of %s available script%s)" (length keys) (eask--sinr keys "" "s")))) -(defun eask--execute-command (name) +(defun eask-run-command--execute (name) "Execute the command by NAME." (eask-info "[RUN]: %s" name) (funcall (eask-intern name))) -(defun eask--unmatched-commands (commands) +(defun eask-run-command--unmatched-commands (commands) "Return a list of COMMANDS that cannot be found in `eask-commands'." (let (unmatched) (dolist (command commands) @@ -55,18 +55,18 @@ (eask-help "run/command")) ((eask-all-p) (dolist (name (reverse eask-commands)) - (eask--execute-command name))) + (eask-run-command--execute name))) ((when-let ((commands (eask-args))) - (if-let ((unmatched (eask--unmatched-commands commands))) + (if-let ((unmatched (eask-run-command--unmatched-commands commands))) (progn ; if there are unmatched commands, don't even try to execute (eask-info "(Missing command%s: `%s`)" (eask--sinr unmatched "" "s") (mapconcat #'identity unmatched ", ")) (eask-msg "") - (eask--print-commands)) + (eask-run-command--print-commands)) (dolist (command commands) - (eask--execute-command command)) + (eask-run-command--execute command)) t))) - (t (eask--print-commands)))) + (t (eask-run-command--print-commands)))) ;;; run/command.el ends here diff --git a/lisp/run/script.el b/lisp/run/script.el index 3678f613..5673d4e0 100644 --- a/lisp/run/script.el +++ b/lisp/run/script.el @@ -19,10 +19,10 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defconst eask--run-file (expand-file-name "run" eask-homedir) +(defconst eask-run-script--file (expand-file-name "run" eask-homedir) "Target file to export the `run' scripts.") -(defun eask--print-scripts () +(defun eask-run-script--print-scripts () "Print all available scripts." (eask-msg "available via `eask run script`") (eask-msg "") @@ -35,7 +35,7 @@ (eask-info "(Total of %s available script%s)" (length keys) (eask--sinr keys "" "s")))) -(defun eask--export-command (command) +(defun eask-run-command--export (command) "Export COMMAND instruction." (ignore-errors (make-directory eask-homedir t)) ; generate dir `~/.eask/' (when eask-is-pkg @@ -45,9 +45,9 @@ ;; We must split up all commands! (setq command (eask-s-replace " && " "\n" command))) (setq command (concat command " " (eask-rest))) - (write-region (concat command "\n") nil eask--run-file t)) + (write-region (concat command "\n") nil eask-run-script--file t)) -(defun eask--unmatched-scripts (scripts) +(defun eask-run-script--unmatched-scripts (scripts) "Return a list of SCRIPTS that cannot be found in `eask-scripts'." (let (unmatched) (dolist (script scripts) @@ -57,7 +57,7 @@ (eask-start ;; Preparation - (ignore-errors (delete-file eask--run-file)) + (ignore-errors (delete-file eask-run-script--file)) ;; Start the task (cond @@ -66,21 +66,21 @@ (eask-help "run/script")) ((eask-all-p) ; Run all scripts (dolist (data (reverse eask-scripts)) - (eask--export-command (cdr data)))) + (eask-run-command--export (cdr data)))) ((when-let ((scripts (eask-args))) - (if-let ((unmatched (eask--unmatched-scripts scripts))) + (if-let ((unmatched (eask-run-script--unmatched-scripts scripts))) (progn ; if there are unmatched scripts, don't even try to execute (eask-info "(Missing script%s: `%s`)" (eask--sinr unmatched "" "s") (mapconcat #'identity unmatched ", ")) (eask-msg "") - (eask--print-scripts)) + (eask-run-script--print-scripts)) (dolist (script scripts) (let* ((data (assoc script eask-scripts)) (name (car data)) (command (cdr data))) - (eask--export-command command))) + (eask-run-command--export command))) t))) - (t (eask--print-scripts)))) + (t (eask-run-script--print-scripts)))) ;;; run/script.el ends here diff --git a/lisp/source/add.el b/lisp/source/add.el index 4ac55bdd..11d640c9 100644 --- a/lisp/source/add.el +++ b/lisp/source/add.el @@ -20,11 +20,11 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--source-from-mapping (name url) +(defun eask-source-add--from-mapping (name url) "Return t if NAME and URL matched our database." (string= (eask-source-url name) url)) -(defun eask--source-add (name url exists) +(defun eask-source-add (name url exists) "Add an archive source by NAME. If argument URL is nil; ignore the insertion. @@ -33,13 +33,13 @@ Arguments EXISTS is used to print the information." (let* ((style-sym (string-match "([ \t\n\r]*source[ \t\n\r]*[']+" (buffer-string))) (name-str (if style-sym (concat "'" name) (concat "\"" name "\""))) - (built-in (eask--source-from-mapping name url))) + (built-in (eask-source-add--from-mapping name url))) (if (and url (not built-in)) (insert "(source " name-str " \"" url "\")\n") (insert "(source " name-str ")\n")) (eask-info "(New source `%s' added and points to `%s')" name (or url (cdr exists))))) -(defun eask--source-write (name url exists) +(defun eask-source-add--write (name url exists) "Write source construct by NAME and URL. The argument URL can be nil. @@ -51,7 +51,7 @@ The argument EXISTS is use to search for correct position to insert new source." (exists (if (re-search-forward (concat "([ \t\n\r]*source[ \t\n\r]*['\"]+" name) nil t) (let ((start (point)) - (built-in (eask--source-from-mapping name url))) + (built-in (eask-source-add--from-mapping name url))) (when (string= "\"" (string (char-after))) (cl-incf start)) (re-search-forward "[ \t\r\n\")]*" nil t) ; Forward to non-space characters! @@ -74,15 +74,15 @@ The argument EXISTS is use to search for correct position to insert new source." (eask-info "(Changed archive `%s''s location from `%s' to `%s')" name (cdr exists) url)) (goto-char (point-max)) - (eask--source-add name url exists))) + (eask-source-add name url exists))) (t (if (re-search-forward "([ \t\n\r]*source[ \t\n\r]*['\"]+" nil t) (forward-paragraph) (goto-char (point-max))) - (eask--source-add name url exists))) + (eask-source-add name url exists))) (save-buffer))) -(defun eask--source-ask-if-overwrite (name url) +(defun eask-source-add--ask-if-overwrite (name url) "Ask source overwrite if needed. Arguments NAME and URL are main arguments for this command." @@ -97,23 +97,23 @@ Arguments NAME and URL are main arguments for this command." Do you want to overwrite it? ") name old-url)) - (eask--source-write name url exists)) + (eask-source-add--write name url exists)) (t (eask-info "(Nothing has changed, aborted)"))) - (eask--source-write name url nil))) + (eask-source-add--write name url nil))) (eask-start (let* ((args (eask-args)) (name (nth 0 args)) (url (nth 1 args))) (cond - (url (eask--source-ask-if-overwrite name url)) + (url (eask-source-add--ask-if-overwrite name url)) (t (if-let* ((archive (assoc (eask-intern name) eask-source-mapping)) (name (car archive)) (name (eask-2str name)) (url (eask-source-url name))) ; Use the URL from our database! - (eask--source-ask-if-overwrite name url) + (eask-source-add--ask-if-overwrite name url) (eask-info "(Invalid source name, `%s')" name) (eask-help "source/add")))))) diff --git a/lisp/source/delete.el b/lisp/source/delete.el index 67173d21..f70a62ab 100644 --- a/lisp/source/delete.el +++ b/lisp/source/delete.el @@ -19,7 +19,7 @@ (locate-dominating-file dir "_prepare.el")) nil t)) -(defun eask--source-delete (name) +(defun eask-source-delete (name) "Delete an archive source by NAME." (with-current-buffer (find-file eask-file) (goto-char (point-min)) @@ -32,7 +32,7 @@ (let* ((args (eask-args)) (name (nth 0 args))) (if-let ((exists (assoc name package-archives))) - (eask--source-delete name) + (eask-source-delete name) (eask-info "(Invalid source name, `%s')" name) (eask-help "source/delete")))) diff --git a/lisp/test/ert.el b/lisp/test/ert.el index b68a0846..fafcd752 100644 --- a/lisp/test/ert.el +++ b/lisp/test/ert.el @@ -21,15 +21,15 @@ (require 'ert) -(defvar eask--message-loop nil +(defvar eask-test-ert--message-loop nil "Prevent inifinite recursive message function.") -(defun eask--ert-message (fnc &rest args) +(defun eask-test-ert--message (fnc &rest args) "Colorized ert messages. Arguments FNC and ARGS are used for advice `:around'." - (if eask--message-loop (apply fnc args) - (let ((eask--message-loop t)) + (if eask-test-ert--message-loop (apply fnc args) + (let ((eask-test-ert--message-loop t)) (cond ((string-match-p "^[ ]+FAILED " (apply #'format args)) (eask-msg (ansi-red (apply #'format args)))) @@ -39,7 +39,7 @@ Arguments FNC and ARGS are used for advice `:around'." (eask-msg (ansi-green (apply #'format args)))) (t (apply fnc args)))))) -(advice-add 'message :around #'eask--ert-message) +(advice-add 'message :around #'eask-test-ert--message) (eask-start (let* ((patterns (eask-args)) diff --git a/lisp/test/melpazoid.el b/lisp/test/melpazoid.el index 2658a6bd..7ebc5854 100644 --- a/lisp/test/melpazoid.el +++ b/lisp/test/melpazoid.el @@ -22,7 +22,7 @@ ;; ;;; Core -(defcustom eask-melpazoid-el-url +(defcustom eask-test-melpazoid-el-url "https://raw.githubusercontent.com/riscy/melpazoid/master/melpazoid/melpazoid.el" "Url path to melpazoid's elisp file." :type 'string @@ -41,7 +41,7 @@ (dolist (dir dirs) (let ((default-directory (expand-file-name dir))) (eask-info "[+] %s" default-directory) - (eask-import eask-melpazoid-el-url)))) + (eask-import eask-test-melpazoid-el-url)))) ;; Default, print help! (t (eask-info "(No tests found.)")