From 2b8e07e4e659145c99ba3226d945fea0758307e7 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:18:01 -0700 Subject: [PATCH 1/8] feat: Add command to generate recipe --- cmds/clean/dist.js | 3 +- cmds/core/package.js | 3 +- cmds/generate/recipe.js | 34 ++++++++++++++ .../Getting-Started/Commands-and-options.md | 13 +++++- .../Getting-Started/Commands-and-options.md | 10 +++++ lisp/_prepare.el | 5 +++ lisp/core/recipe.el | 40 ++++++++++------- lisp/generate/recipe.el | 45 +++++++++++++++++++ test/commands/local/run.sh | 1 + 9 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 cmds/generate/recipe.js create mode 100644 lisp/generate/recipe.el diff --git a/cmds/clean/dist.js b/cmds/clean/dist.js index 01f43765..4f6c4de9 100644 --- a/cmds/clean/dist.js +++ b/cmds/clean/dist.js @@ -23,8 +23,9 @@ exports.command = ['dist [destination]', 'distribution [destination]']; exports.desc = 'Delete dist subdirectory'; exports.builder = yargs => yargs .positional( - '[destination]', { + 'destination', { description: 'destination path/folder to clean up', + alias: 'dest', type: 'string', }); diff --git a/cmds/core/package.js b/cmds/core/package.js index c525f088..c1e7e8a3 100644 --- a/cmds/core/package.js +++ b/cmds/core/package.js @@ -23,8 +23,9 @@ exports.command = ['package [destination]']; exports.desc = 'Build a package artifact, and put it into the given destination'; exports.builder = yargs => yargs .positional( - '[destination]', { + 'destination', { description: 'destination path/folder', + alias: 'dest', type: 'string', }); diff --git a/cmds/generate/recipe.js b/cmds/generate/recipe.js new file mode 100644 index 00000000..c0f907d4 --- /dev/null +++ b/cmds/generate/recipe.js @@ -0,0 +1,34 @@ +/** + * Copyright (C) 2023 Jen-Chieh Shen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Emacs; see the file COPYING. If not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +"use strict"; + +exports.command = ['recipe [destination]']; +exports.desc = 'Generate recipe file'; +exports.builder = yargs => yargs + .positional( + 'destination', { + description: 'destination path/folder', + alias: 'dest', + type: 'string', + }); + +exports.handler = async (argv) => { + await UTIL.e_call(argv, 'generate/recipe', argv.dest); +}; diff --git a/docs/content/en/Getting-Started/Commands-and-options.md b/docs/content/en/Getting-Started/Commands-and-options.md index 4a7a3e44..d855670e 100644 --- a/docs/content/en/Getting-Started/Commands-and-options.md +++ b/docs/content/en/Getting-Started/Commands-and-options.md @@ -170,7 +170,7 @@ Build the package artifact. $ eask package [DESTINATION] ``` -If [DESTINATION] is not specified, it will export to the `/dist` folder +If [DESTINATION] is not specified, it will generate to the `/dist` folder by default. ## 🔍 eask compile @@ -423,6 +423,17 @@ $ eask [GLOBAL-OPTIONS] generate pkg-file [Multi-file Packages (elisp)](https://www.gnu.org/software/emacs/manual/html_node/elisp/Multi_002dfile-Packages.html#Multi_002dfile-Packages) for details. +## 🔍 eask generate recipe + +Generate recipe file. + +```sh +$ eask [GLOBAL-OPTIONS] generate recipe [DESTINATION] +``` + +If [DESTINATION] is not specified, it will generate to the `/recipes` folder +by default. + ## 🔍 eask generate license Generate LICENSE file. diff --git a/docs/content/zh-TW/Getting-Started/Commands-and-options.md b/docs/content/zh-TW/Getting-Started/Commands-and-options.md index 9841ae4c..ebbf1416 100644 --- a/docs/content/zh-TW/Getting-Started/Commands-and-options.md +++ b/docs/content/zh-TW/Getting-Started/Commands-and-options.md @@ -416,6 +416,16 @@ $ eask [GLOBAL-OPTIONS] generate pkg-file `project` 是在 `Eask` 文件中聲明的項目名稱。 有關詳細信息，請參閱 [多文件包 (elisp)](https://www.gnu.org/software/emacs/manual/html_node/elisp/Multi_002dfile-Packages.html#Multi_002dfile-Packages)。 +## 🔍 eask generate recipe + +生成 recipe 文件。 + +```sh +$ eask [GLOBAL-OPTIONS] generate recipe [DESTINATION] +``` + +如果未指定 [DESTINATION]，則默認導出到 `/recipes` 文件夾。 + ## 🔍 eask generate license 生成 LICENSE 文件。 diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 0bce38b0..52b378bd 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -1811,6 +1811,11 @@ variable we use to test validation." :type 'string :group 'eask) +(defcustom eask-recipe-path "recipes" + "Name of default target directory for placing recipes." + :type 'string + :group 'eask) + ;; ;;; Linter diff --git a/lisp/core/recipe.el b/lisp/core/recipe.el index e27e7403..83074f31 100644 --- a/lisp/core/recipe.el +++ b/lisp/core/recipe.el @@ -14,24 +14,30 @@ (locate-dominating-file dir "_prepare.el")) nil t)) +(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) + ((string-match-p "gitlab.com" url) 'gitlab) + (t 'git))) + (url-regex (if (eq fetcher 'github) + "http[s]://github.com/" + "http[s]://gitlab.com/")) + (repo (replace-regexp-in-string url-regex "" url)) + (name (eask-guess-package-name)) + (recipe `(,(intern name) :fetcher ,fetcher))) + (cond ((memq fetcher '(git hg)) + (nconc recipe `(:url ,url))) + ((memq fetcher '(gitlab github)) + (nconc recipe `(:repo ,repo)))) + (when eask-files + (nconc recipe `(:files ,(append '(:defaults) eask-files)))) + recipe))) + (eask-start - (if-let ((url (eask-package-desc-url))) - (let* ((fetcher (cond ((string-match-p "github.com" url) 'github) - ((string-match-p "gitlab.com" url) 'gitlab) - (t 'git))) - (url-regex (if (eq fetcher 'github) - "http[s]://github.com/" - "http[s]://gitlab.com/")) - (repo (replace-regexp-in-string url-regex "" url)) - (name (eask-guess-package-name)) - (recipe - `(,(intern name) :fetcher ,fetcher))) - (cond ((memq fetcher '(git hg)) - (nconc recipe `(:url ,url))) - ((memq fetcher '(gitlab github)) - (nconc recipe `(:repo ,repo)))) - (when eask-files - (nconc recipe `(:files ,(append '(:defaults) eask-files)))) + (if-let ((recipe (eask--recipe-string)) + (name (eask-guess-package-name))) + (progn (eask-msg "") (eask-msg "recipes/%s:" name) (eask-msg "") diff --git a/lisp/generate/recipe.el b/lisp/generate/recipe.el new file mode 100644 index 00000000..2548834b --- /dev/null +++ b/lisp/generate/recipe.el @@ -0,0 +1,45 @@ +;;; generate/recipe.el --- Generate recipe file -*- lexical-binding: t; -*- + +;;; Commentary: +;; +;; Command use generate recipe file, +;; +;; $ eask generate recipe [destination] +;; +;; +;; Positional options: +;; +;; [destination] destination path/folder +;; + +;;; Code: + +(let ((dir (file-name-directory (nth 1 (member "-scriptload" command-line-args))))) + (load (expand-file-name "_prepare.el" + (locate-dominating-file dir "_prepare.el")) + nil t)) + +(eask-load "core/recipe") + +;; +;;; Core + +(eask-start + (if-let ((recipe (eask--recipe-string)) + (name (eask-guess-package-name))) + (let* ((eask-recipe-path (or (eask-argv 0) eask-recipe-path)) + (eask-recipe-path (expand-file-name eask-recipe-path)) + (recipe-file (expand-file-name name eask-recipe-path)) + (recipe-string (pp-to-string recipe))) + (when (yes-or-no-p (format "%s\nIs this OK? " recipe-string)) + (ignore-errors (make-directory eask-recipe-path t)) + (with-current-buffer (find-file recipe-file) + (erase-buffer) + (insert recipe-string) + (save-buffer)) + (eask-msg "") + (eask-info "(Generated in %s)" recipe-file))) + (eask-info "(Repository URL is required to form a recipe)") + (eask-help "core/recipe"))) + +;;; generate/recipe.el ends here diff --git a/test/commands/local/run.sh b/test/commands/local/run.sh index 951fd3c9..416bb0f0 100644 --- a/test/commands/local/run.sh +++ b/test/commands/local/run.sh @@ -66,6 +66,7 @@ eask eval "(progn (require 'mini.emacs.pkg.1))" # Generation eask generate autoloads eask generate pkg-file +eask generate recipe #eask generate license gpl-3.0 # XXX: Avoid API rate limit exceeded error eask generate ignore elisp From bab6351f7eb109fb04592bc853e8caba40eb97df Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:18:56 -0700 Subject: [PATCH 2/8] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1e1cb4d..b853c0a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how * fix(vcpkg): Use workaround for `MODULE_NOT_FOUND` error (#187) * Add docker command (#188) * Enter docker directly when no arguments (#191) +* Add command to generate recipe (#192) ## 0.8.x > Released Mar 08, 2023 From 4334c0ee42850b60c1937731905673692891e7ea Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:31:28 -0700 Subject: [PATCH 3/8] Add yes option --- cmds/generate/recipe.js | 14 ++++++++++++-- lisp/_prepare.el | 4 ++++ lisp/core/recipe.el | 3 +-- lisp/generate/recipe.el | 5 +++-- test/commands/local/run.sh | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmds/generate/recipe.js b/cmds/generate/recipe.js index c0f907d4..88442cd8 100644 --- a/cmds/generate/recipe.js +++ b/cmds/generate/recipe.js @@ -27,8 +27,18 @@ exports.builder = yargs => yargs description: 'destination path/folder', alias: 'dest', type: 'string', - }); + }) + .options({ + 'yes': { + description: 'assume the answer to all prompts is yes', + alias: 'y', + type: 'boolean', + group: TITLE_CMD_OPTION, + }, + }); exports.handler = async (argv) => { - await UTIL.e_call(argv, 'generate/recipe', argv.dest); + await UTIL.e_call(argv, 'generate/recipe' + , argv.dest + , UTIL.def_flag(argv.yes, '--yes')); }; diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 52b378bd..07f52f77 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -688,6 +688,9 @@ full detials." (defun eask-strict-p () "Non-nil when flag is on (`--strict')." (eask--flag "--strict")) +(defun eask-yes-p () + "Non-nil when flag is on (`--yes')." + (eask--flag "--yes")) (defun eask-timestamps-p () "Non-nil when flag is on (`--timestamps')." (eask--flag "--timestamps")) @@ -798,6 +801,7 @@ other scripts internally. See function `eask-call'.") (eask--form-options '("-g" "-c" "-a" "-q" "-f" "--dev" "--debug" "--strict" + "--yes" "--allow-error" "--insecure" "--timestamps" "--log-level" diff --git a/lisp/core/recipe.el b/lisp/core/recipe.el index 83074f31..219ebf93 100644 --- a/lisp/core/recipe.el +++ b/lisp/core/recipe.el @@ -41,8 +41,7 @@ (eask-msg "") (eask-msg "recipes/%s:" name) (eask-msg "") - (eask-msg "%s" (pp-to-string recipe)) - (eask-msg "")) + (eask-msg "%s" (pp-to-string recipe))) (eask-msg "") (eask-info "(Repository URL is required to form a recipe)") (eask-help "core/recipe"))) diff --git a/lisp/generate/recipe.el b/lisp/generate/recipe.el index 2548834b..47acf272 100644 --- a/lisp/generate/recipe.el +++ b/lisp/generate/recipe.el @@ -31,14 +31,15 @@ (eask-recipe-path (expand-file-name eask-recipe-path)) (recipe-file (expand-file-name name eask-recipe-path)) (recipe-string (pp-to-string recipe))) - (when (yes-or-no-p (format "%s\nIs this OK? " recipe-string)) + (when (or (eask-yes-p) + (yes-or-no-p (format "%s\nIs this OK? " recipe-string))) (ignore-errors (make-directory eask-recipe-path t)) (with-current-buffer (find-file recipe-file) (erase-buffer) (insert recipe-string) (save-buffer)) - (eask-msg "") (eask-info "(Generated in %s)" recipe-file))) + (eask-msg "") (eask-info "(Repository URL is required to form a recipe)") (eask-help "core/recipe"))) diff --git a/test/commands/local/run.sh b/test/commands/local/run.sh index 416bb0f0..d9b66260 100644 --- a/test/commands/local/run.sh +++ b/test/commands/local/run.sh @@ -66,7 +66,7 @@ eask eval "(progn (require 'mini.emacs.pkg.1))" # Generation eask generate autoloads eask generate pkg-file -eask generate recipe +eask generate recipe -y #eask generate license gpl-3.0 # XXX: Avoid API rate limit exceeded error eask generate ignore elisp From 61c5716482d86a940384c99d7f20d1bb81f8291f Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:37:15 -0700 Subject: [PATCH 4/8] Add yes option --- docs/content/zh-TW/Getting-Started/Commands-and-options.md | 4 ++-- lisp/_prepare.el | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/content/zh-TW/Getting-Started/Commands-and-options.md b/docs/content/zh-TW/Getting-Started/Commands-and-options.md index ebbf1416..8d557fa6 100644 --- a/docs/content/zh-TW/Getting-Started/Commands-and-options.md +++ b/docs/content/zh-TW/Getting-Started/Commands-and-options.md @@ -840,9 +840,9 @@ $ eask -f [COMMAND] ## 🔍 --strict -Trigger error instead of warnings. +觸發錯誤代替警告。 -For instance, in **eask compile**: +例如，在 **eask compile** 中： ```elisp (setq byte-compile-error-on-warn t) diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 07f52f77..0e8bc3e4 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -688,9 +688,6 @@ full detials." (defun eask-strict-p () "Non-nil when flag is on (`--strict')." (eask--flag "--strict")) -(defun eask-yes-p () - "Non-nil when flag is on (`--yes')." - (eask--flag "--yes")) (defun eask-timestamps-p () "Non-nil when flag is on (`--timestamps')." (eask--flag "--timestamps")) @@ -721,6 +718,9 @@ full detials." (defun eask-number-p () "Non-nil when flag is on (`-n', `--number')." (eask--flag "--number")) +(defun eask-yes-p () + "Non-nil when flag is on (`--yes')." + (eask--flag "--yes")) ;;; String (with arguments) (defun eask-output () From 6150b55cc699158a3a58a5e9deec2cdf85f3743a Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:44:35 -0700 Subject: [PATCH 5/8] Fake user input --- lisp/generate/recipe.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/generate/recipe.el b/lisp/generate/recipe.el index 47acf272..381b4940 100644 --- a/lisp/generate/recipe.el +++ b/lisp/generate/recipe.el @@ -33,6 +33,9 @@ (recipe-string (pp-to-string recipe))) (when (or (eask-yes-p) (yes-or-no-p (format "%s\nIs this OK? " recipe-string))) + ;; XXX: Just to fake the user input! + (when (eask-yes-p) + (eask-msg (format "%s\nIs this OK? (yes or no) yes" recipe-string))) (ignore-errors (make-directory eask-recipe-path t)) (with-current-buffer (find-file recipe-file) (erase-buffer) From cf6c9c904c4ae15f2a93588f089b4b8f5f6236d9 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 17:45:36 -0700 Subject: [PATCH 6/8] reorder option --- lisp/_prepare.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 0e8bc3e4..9774b128 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -801,7 +801,6 @@ other scripts internally. See function `eask-call'.") (eask--form-options '("-g" "-c" "-a" "-q" "-f" "--dev" "--debug" "--strict" - "--yes" "--allow-error" "--insecure" "--timestamps" "--log-level" @@ -810,7 +809,8 @@ other scripts internally. See function `eask-call'.") "--no-color" "--clean" "--json" - "--number")) + "--number" + "--yes")) "List of boolean type options.") (defconst eask--option-args From 0626acc8bd9adacc06f25041e14a7942a4689efb Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 18:02:02 -0700 Subject: [PATCH 7/8] fix args --- lisp/_prepare.el | 5 +++-- lisp/clean/dist.el | 2 +- lisp/core/package.el | 2 +- lisp/generate/recipe.el | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 9774b128..160e29b2 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -841,7 +841,7 @@ Simply remove `--eask' for each option, like `--eask--strict' to `--strict'." (eask-s-replace "--eask" "" arg)) eask-argv)) -(defun eask-args () +(defun eask-args (&optional index) "Get all arguments except options." (let ((argv (cl-remove-if (lambda (arg) (member arg eask--option-switches)) eask-argv)) (args) (skip-next)) @@ -850,7 +850,8 @@ Simply remove `--eask' for each option, like `--eask--strict' to `--strict'." (if (member arg eask--option-args) (setq skip-next t) (push arg args)))) - (reverse args))) + (setq args (reverse args)) + (if index (nth 0 args) args))) (defmacro eask--batch-mode (&rest body) "Execute forms BODY in batch-mode." diff --git a/lisp/clean/dist.el b/lisp/clean/dist.el index b6184b33..9e08e33d 100644 --- a/lisp/clean/dist.el +++ b/lisp/clean/dist.el @@ -46,7 +46,7 @@ (- 3 deleted)))) (eask-start - (let* ((eask-dist-path (or (eask-argv 0) eask-dist-path)) + (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) diff --git a/lisp/core/package.el b/lisp/core/package.el index 4042b473..eb01ce8e 100644 --- a/lisp/core/package.el +++ b/lisp/core/package.el @@ -68,7 +68,7 @@ Argument VERSION is a string represent the version number of this package." (eask--packaged-file "el"))) (eask-start - (let* ((eask-dist-path (or (eask-argv 0) eask-dist-path)) + (let* ((eask-dist-path (or (eask-args 0) eask-dist-path)) (eask-dist-path (expand-file-name eask-dist-path)) (packaged)) (ignore-errors (make-directory eask-dist-path t)) diff --git a/lisp/generate/recipe.el b/lisp/generate/recipe.el index 381b4940..01d2f066 100644 --- a/lisp/generate/recipe.el +++ b/lisp/generate/recipe.el @@ -27,7 +27,7 @@ (eask-start (if-let ((recipe (eask--recipe-string)) (name (eask-guess-package-name))) - (let* ((eask-recipe-path (or (eask-argv 0) eask-recipe-path)) + (let* ((eask-recipe-path (or (eask-args 0) eask-recipe-path)) (eask-recipe-path (expand-file-name eask-recipe-path)) (recipe-file (expand-file-name name eask-recipe-path)) (recipe-string (pp-to-string recipe))) From 3a9d09bf136a698e63b2aef9ae3871201000dd5f Mon Sep 17 00:00:00 2001 From: JenChieh Date: Sat, 30 Sep 2023 18:04:13 -0700 Subject: [PATCH 8/8] fix docstring --- lisp/_prepare.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 160e29b2..4f5677c3 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -842,7 +842,9 @@ Simply remove `--eask' for each option, like `--eask--strict' to `--strict'." eask-argv)) (defun eask-args (&optional index) - "Get all arguments except options." + "Get all arguments except options + +If the optional argument INDEX is non-nil, return the element." (let ((argv (cl-remove-if (lambda (arg) (member arg eask--option-switches)) eask-argv)) (args) (skip-next)) (dolist (arg argv)