eask analyze should exit with 1 on errors (#359)

Author: joshbax189

lisp/core/analyze.el

@@ -29,14 +29,20 @@
 (defvar eask-analyze--warnings nil)
 (defvar eask-analyze--errors nil)
 
+;; Warning flag
+(defvar eask-analyze--warning-p nil)
+;; Error flag
+(defvar eask-analyze--error-p nil)
+
 (defun eask-analyze--pretty-json (json)
   "Return pretty JSON."
   (with-temp-buffer (insert json) (json-pretty-print-buffer) (buffer-string)))
 
 (defun eask-analyze--load-buffer ()
   "Return the current file loading session."
-  (car (cl-remove-if-not
-        (lambda (elm) (string-prefix-p " *load*-" (buffer-name elm))) (buffer-list))))
+  (car (cl-remove-if-not (lambda (elm)
+                           (string-prefix-p " *load*-" (buffer-name elm)))
+                         (buffer-list))))
 
 (defun eask-analyze--write-json-format (level msg)
   "Prepare log for JSON format.
@@ -87,6 +93,10 @@ information."
 
 Argument LEVEL and MSG are data from the debug log signal."
   (unless (string= " *temp*" (buffer-name))  ; avoid error from `package-file' directive
+    (when (eq 'error level)
+      (setq eask-analyze--error-p t))
+    (when (eq 'warn level)
+      (setq eask-analyze--warning-p t))
     (with-current-buffer (or (eask-analyze--load-buffer) (buffer-name))
       (funcall
        (cond ((eask-json-p) #'eask-analyze--write-json-format)
@@ -100,19 +110,22 @@ Argument LEVEL and MSG are data from the debug log signal."
     (dolist (file files)
       (eask--silent-error
         (eask--save-load-eask-file file
+            (push file checked-files)
+            ;; also count files with errors in the total count
             (push file checked-files))))
 
     ;; Print result
     (eask-msg "")
-    (cond ((and (eask-json-p)  ; JSON format
-                (or eask-analyze--warnings eask-analyze--errors))
-           (setq content
-                 (eask-analyze--pretty-json (json-encode
-                                             `((warnings . ,eask-analyze--warnings)
-                                               (errors   . ,eask-analyze--errors)))))
+    (cond ((eask-json-p)  ; JSON format
+           ;; Fill content with result.
+           (when (or eask-analyze--warnings eask-analyze--errors)
+             (setq content
+                   (eask-analyze--pretty-json (json-encode
+                                               `((warnings . ,eask-analyze--warnings)
+                                                 (errors   . ,eask-analyze--errors))))))
            ;; XXX: When printing the result, no color allow.
            (eask--with-no-color
-             (eask-msg content)))
+             (eask-msg (or content "{}"))))
           (eask-analyze--log  ; Plain text
            (setq content
                  (with-temp-buffer
@@ -121,11 +134,11 @@ Argument LEVEL and MSG are data from the debug log signal."
                    (buffer-string)))
            ;; XXX: When printing the result, no color allow.
            (eask--with-no-color
-             (mapc #'eask-msg (reverse eask-analyze--log))))
-          (t
-           (eask-info "(Checked %s file%s)"
-                      (length checked-files)
-                      (eask--sinr checked-files "" "s"))))
+             (mapc #'eask-msg (reverse eask-analyze--log)))))
+
+    (eask-info "(Checked %s file%s)"
+               (length checked-files)
+               (eask--sinr checked-files "" "s"))
 
     ;; Output file
     (when (and content (eask-output))
@@ -148,7 +161,11 @@ Argument LEVEL and MSG are data from the debug log signal."
   (cond
    ;; Files found, do the action!
    (files
-    (eask-analyze--file files))
+    (eask-analyze--file files)
+    (when (or eask-analyze--error-p
+              ;; strict flag turns warnings into errors
+              (and eask-analyze--warning-p (eask-strict-p)))
+      (eask--exit 'failure)))
    ;; Pattern defined, but no file found!
    (patterns
     (eask-info "(No files match wildcard: %s)"