fix: Improve file expand error message (#102)

* fix: Improve file expand error message

* fix

* show help on fail

* comment

* print no issue for relint

Author: jcs090218

cmds/checker/check-eask.js

@@ -41,5 +41,6 @@ exports.builder = {
 exports.handler = async (argv) => {
   await UTIL.e_call(argv, 'checker/check-eask'
                     , argv.files
-                    , UTIL.def_flag(argv.json, '--json', argv.json));
+                    , UTIL.def_flag(argv.json, '--json', argv.json)
+                    , UTIL.def_flag(argv.output, '--output', argv.output));
 };

cmds/core/clean.js

@@ -26,7 +26,8 @@ exports.builder = function (yargs) {
     .usage(`${exports.desc}
 
 Usage: eask clean <command> [options..]`)
-    .commandDir('../clean/');
+    .commandDir('../clean/')
+    .demandCommand();
 };
 
 exports.handler = async (argv) => { };

cmds/core/concat.js

@@ -32,11 +32,17 @@ exports.builder = {
     requiresArg: true,
     alias: 'dest',
     type: 'string',
-  }
+  },
+  output: {
+    description: 'Output result to a file',
+    alias: 'o',
+    type: 'string',
+  },
 };
 
 exports.handler = async (argv) => {
   await UTIL.e_call(argv, 'core/concat'
                     , argv.names
-                    , UTIL.def_flag(argv.dest, '--dest', argv.dest));
+                    , UTIL.def_flag(argv.dest, '--dest', argv.dest)
+                    , UTIL.def_flag(argv.output, '--output', argv.output));
 };

cmds/core/create.js

@@ -26,7 +26,8 @@ exports.builder = function (yargs) {
     .usage(`${exports.desc}
 
 Usage: eask create <command> [options..]`)
-    .commandDir('../create/');
+    .commandDir('../create/')
+    .demandCommand();
 };
 
 exports.handler = async (argv) => { };

cmds/core/lint.js

@@ -26,7 +26,8 @@ exports.builder = function (yargs) {
     .usage(`${exports.desc}
 
 Usage: eask lint <command> [options..]`)
-    .commandDir('../lint/');
+    .commandDir('../lint/')
+    .demandCommand();
 };
 
 exports.handler = async (argv) => { };

cmds/core/test.js

@@ -26,7 +26,8 @@ exports.builder = function (yargs) {
     .usage(`${exports.desc}
 
 Usage: eask test <command> [options..]`)
-    .commandDir('../test/');
+    .commandDir('../test/')
+    .demandCommand();
 };
 
 exports.handler = async (argv) => { };

lisp/_prepare.el

@@ -444,7 +444,7 @@ the `eask-start' execution.")
 (defun eask-json-p ()          (eask--flag "--json"))           ; --json
 
 ;;; String (with arguments)
-(defun eask-output ()      (eask--flag-value "-o"))             ; --o, --output
+(defun eask-output ()      (eask--flag-value "--output"))       ; --o, --output
 (defun eask-proxy ()       (eask--flag-value "--proxy"))        ; --proxy
 (defun eask-http-proxy ()  (eask--flag-value "--http-proxy"))   ; --http-proxy
 (defun eask-https-proxy () (eask--flag-value "--https-proxy"))  ; --https-proxy
@@ -511,7 +511,7 @@ other scripts internally.  See function `eask-call'.")
 
 (defconst eask--option-args
   (eask--form-options
-   '("-o"
+   '("--output"
      "--proxy" "--http-proxy" "--https-proxy" "--no-proxy"
      "--verbose" "--silent"
      "--depth" "--dest"))
@@ -1128,12 +1128,6 @@ Standard is, 0 (error), 1 (warning), 2 (info), 3 (log), 4 or above (debug)."
     (setq elcs (cl-remove-if-not (lambda (elm) (file-exists-p elm)) elcs))
     elcs))
 
-(defun eask-args-or-package-el-files ()
-  "Return args if specified, else return package files by default."
-  (if (eask-args)
-      (eask-expand-file-specs (eask-args))
-    (eask-package-el-files)))
-
 (defun eask-package-multi-p ()
   "Return t if multi-files package."
   (< 1 (length (eask-package-files))))
@@ -1225,12 +1219,6 @@ Standard is, 0 (error), 1 (warning), 2 (info), 3 (log), 4 or above (debug)."
             (eask-msg (ansi-white (buffer-string)))))
       (eask-error "Help manual missig %s" help-file))))
 
-(defun eask--print-no-matching-files ()
-  "Print message for no matching files found."
-  (eask-log "")
-  (eask-log "Cannot find matching files with given pattern %s" (eask-args))
-  (eask-log ""))
-
 ;;
 ;;; Checker
 

lisp/checker/check-eask.el

@@ -104,6 +104,42 @@
          eask-depends-on-dev)
      ,@body))
 
+(defun eask--check-file (files)
+  "Lint list of Eask FILES."
+  (let (checked-files content)
+    ;; Linting
+    (dolist (file files)
+      (eask--save-eask-file-state
+        (eask--setup-env
+          (eask--alias-env
+            (when (ignore-errors (load file 'noerror t))
+              (push file checked-files))))))
+
+    ;; Print result
+    (eask-msg "")
+    (cond ((and (eask-json-p)  ; JSON format
+                (or eask--checker-warnings eask--checker-errors))
+           (setq content
+                 (eask--pretty-json (json-encode
+                                     `((warnings . ,eask--checker-warnings)
+                                       (errors   . ,eask--checker-errors)))))
+           (eask-msg content))
+          (eask--checker-log  ; Plain text
+           (setq content
+                 (with-temp-buffer
+                   (dolist (msg (reverse eask--checker-log))
+                     (insert msg "\n"))
+                   (buffer-string)))
+           (mapc #'eask-msg (reverse eask--checker-log)))
+          (t
+           (eask-info "(Checked %s file%s)"
+                      (length checked-files)
+                      (eask--sinr checked-files "" "s"))))
+
+    ;; Output file
+    (when (and content (eask-output))
+      (write-region content nil (eask-output)))))
+
 ;;
 ;;; Program Entry
 
@@ -113,41 +149,21 @@
 
 (let* ((default-directory (if (eask-global-p) user-emacs-directory
                             default-directory))
-       (files (or (eask-expand-file-specs (eask-args))
-                  (eask-expand-file-specs '("Eask*" "**/Eask*"))))
-       checked-files
-       content)
-  ;; Linting
-  (dolist (file files)
-    (eask--save-eask-file-state
-      (eask--setup-env
-        (eask--alias-env
-          (when (ignore-errors (load file 'noerror t))
-            (push file checked-files))))))
-
-  ;; Print result
-  (eask-msg "")
-  (cond ((and (eask-json-p)  ; JSON format
-              (or eask--checker-warnings eask--checker-errors))
-         (setq content
-               (eask--pretty-json (json-encode
-                                   `((warnings . ,eask--checker-warnings)
-                                     (errors   . ,eask--checker-errors)))))
-         (eask-msg content))
-        (eask--checker-log  ; Plain text
-         (setq content
-               (with-temp-buffer
-                 (dolist (msg (reverse eask--checker-log))
-                   (insert msg "\n"))
-                 (buffer-string)))
-         (mapc #'eask-msg (reverse eask--checker-log)))
-        (t
-         (eask-info "(Checked %s file%s)"
-                    (length checked-files)
-                    (eask--sinr checked-files "" "s"))))
-
-  ;; Output file
-  (when (and content (eask-output))
-    (write-region content nil (eask-output))))
+       (patterns (eask-args))
+       (files (if patterns
+                  (eask-expand-file-specs patterns)
+                (eask-expand-file-specs '("Eask*" "**/Eask*")))))
+  (cond
+   ;; Files found, do the action!
+   (files
+    (eask--check-file files))
+   ;; Pattern defined, but no file found!
+   (patterns
+    (eask-info "No files found with wildcard pattern: %s"
+               (mapconcat #'identity patterns " ")))
+   ;; Default, print help!
+   (t
+    (eask-info "(No Eask-files have been checked)")
+    (eask-help "checker/check-eask"))))
 
 ;;; checker/check-eask.el ends here

lisp/core/compile.el

@@ -65,10 +65,21 @@
 
 (eask-start
   (eask-defvc< 27 (eask-pkg-init))  ; XXX: remove this after we drop 26.x
-  (if-let ((files (or (eask-expand-file-specs (eask-args))
-                      (eask-package-el-files))))
-      (eask--compile-files files)
-    (eask-info "(No files have been compiled)")
-    (eask-help "core/compile")))
+  (let* ((patterns (eask-args))
+         (files (if patterns
+                    (eask-expand-file-specs patterns)
+                  (eask-package-el-files))))
+    (cond
+     ;; Files found, do the action!
+     (files
+      (eask--compile-files files))
+     ;; Pattern defined, but no file found!
+     (patterns
+      (eask-info "No files found with wildcard pattern: %s"
+                 (mapconcat #'identity patterns " ")))
+     ;; Default, print help!
+     (t
+      (eask-info "(No files have been compiled)")
+      (eask-help "core/compile")))))
 
 ;;; core/compile.el ends here

lisp/core/concat.el

@@ -14,6 +14,7 @@
 ;;  Action options:
 ;;
 ;;    [destination]     optional output destination
+;;    [output]          optional output filename
 ;;
 
 ;;; Code:
@@ -25,23 +26,36 @@
 
 (eask-start
   (let* ((name (eask-guess-package-name))
-         (files (or (eask-expand-file-specs (eask-args))
-                    (eask-package-el-files)))
+         (patterns (eask-args))
+         (files (if patterns (eask-expand-file-specs patterns)
+                  (eask-package-el-files)))
          (eask-dist-path (or (eask-dest) eask-dist-path))
          (eask-dist-path (expand-file-name eask-dist-path))
          (target-file (concat name ".built.el"))
-         (target-filename (expand-file-name target-file eask-dist-path)))
-    (eask-debug "Destination path in %s" eask-dist-path)
-    (ignore-errors (make-directory eask-dist-path t))
+         (target-filename (or (and (eask-output) (expand-file-name (eask-output)))
+                              (expand-file-name target-file eask-dist-path))))
+    (cond
+     ;; Files found, do the action!
+     (files
+      (eask-debug "Destination path in %s" eask-dist-path)
+      (ignore-errors (make-directory eask-dist-path t))
 
-    (eask-info "Prepare to concatenate files %s..." target-filename)
-    (write-region "" nil target-filename)
+      (eask-info "Prepare to concatenate files %s..." target-filename)
+      (write-region "" nil target-filename)
 
-    (eask-with-verbosity 'log
-      (with-temp-buffer
-        (eask-progress-seq "  - Visiting" files "appended! ✓" #'insert-file-contents)
-        (write-region (buffer-string) nil target-filename)
-        (eask-msg "")
-        (eask-info "Done. (Wrote file in %s)" target-filename)))))
+      (eask-with-verbosity 'log
+        (with-temp-buffer
+          (eask-progress-seq "  - Visiting" files "appended! ✓" #'insert-file-contents)
+          (write-region (buffer-string) nil target-filename)
+          (eask-msg "")
+          (eask-info "Done. (Wrote file in %s)" target-filename))))
+     ;; Pattern defined, but no file found!
+     (patterns
+      (eask-info "No files found with wildcard pattern: %s"
+                 (mapconcat #'identity patterns " ")))
+     ;; Default, print help!
+     (t
+      (eask-info "(No files have been concatenated)")
+      (eask-help "core/concat")))))
 
 ;;; core/concat.el ends here