fix: don't output color when analyze

Author: jcs090218

lisp/_prepare.el

@@ -391,6 +391,14 @@ and INHERIT-INPUT-METHOD see function `read-string' for more information."
         (setq pos (match-end 0)))
       (reverse matches))))
 
+;;
+;;; Color
+
+(defmacro eask--with-no-color (&rest body)
+  "Execute forms BODY in when no color output."
+  (declare (indent 0) (debug t))
+  `(let ((ansi-inhibit-ansi t)) ,@body))
+
 (defun eask-ansi-codes (s)
   "Return a list of ansi codes from S."
   (eask-re-seq ansi-color-control-seq-regexp s))

lisp/core/analyze.el

@@ -61,7 +61,7 @@ information."
                               (col  . ,end-col)
                               (pos  . ,end-pos)))))
             (filename . ,filename)
-            (message . ,msg))
+            (message  . ,msg))
           (cl-case level
             (`error eask-analyze--errors)
             (`warn  eask-analyze--warnings)))))
@@ -110,14 +110,18 @@ Argument LEVEL and MSG are data from the debug log signal."
                  (eask-analyze--pretty-json (json-encode
                                              `((warnings . ,eask-analyze--warnings)
                                                (errors   . ,eask-analyze--errors)))))
-           (eask-msg content))
+           ;; XXX: When printint result, no color allow.
+           (eask--with-no-color
+             (eask-msg content)))
           (eask-analyze--log  ; Plain text
            (setq content
                  (with-temp-buffer
                    (dolist (msg (reverse eask-analyze--log))
                      (insert msg "\n"))
                    (buffer-string)))
-           (mapc #'eask-msg (reverse eask-analyze--log)))
+           ;; XXX: When printint 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)

test/jest/__snapshots__/analyze.test.js.snap

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`analyze in ./dsl matches snapshot 1`] = `
+{
+  "stderr": "
+~/Eask:9:18 Error: ✗ Multiple definition of \`package'
+~/Eask:12:55 Error: ✗ Multiple definition of \`website-url'
+~/Eask:14:16 Error: ✗ Multiple definition of \`keywords'
+~/Eask:17:15 Warning: 💡 Warning regarding duplicate author name, name
+~/Eask:20:17 Warning: 💡 Warning regarding duplicate license name, GPLv3
+~/Eask:23:29 Error: ✗ Multiple definition of \`package-file'
+~/Eask:25:35 Warning: 💡 Pkg-file seems to be missing \`check-pkg.el'
+~/Eask:26:35 Error: ✗ Multiple definition of \`package-descriptor'
+~/Eask:30:61 Error: ✗ Run-script with the same key name is not allowed: \`test\`
+~/Eask:33:13 Error: ✗ Multiple definition of source \`gnu'
+~/Eask:35:24 Error: ✗ Unknown package archive \`magic-archive'
+~/Eask:37:15 Error: ✗ Invalid archive name \`local'
+~/Eask:37:15 Error: ✗ Unknown package archive \`local'
+~/Eask:40:20 Error: ✗ Define dependencies with the same name \`emacs'
+~/Eask:43:19 Error: ✗ Define dependencies with the same name \`dash'
+~/Eask:44:27 Error: ✗ Define dependencies with the same name \`dash' with different version
+~/Eask:50:2 Error: ✗ Define dependencies with the same name \`f'
+~/Eask:50:2 Error: ✗ Define dependencies with the same name \`f' with different version
+",
+  "stdout": "",
+}
+`;

test/jest/analyze.test.js

@@ -9,22 +9,15 @@ describe("analyze", () => {
       await ctx.runEask("analyze Eask");
     });
 
-    // TODO: Re-enable this test.
-    //
-    // `Bad control character in string literal in JSON`
-    it.skip("handles json option", async () => {
+    it("handles json option", async () => {
       const { stderr } = await ctx.runEask("analyze --json");
       await ctx.runEask("analyze Eask --json");
 
       // try to parse output, errors if not valid
       JSON.parse(stderr);
     });
 
-    // TODO: Re-enable this test.
-    //
-    // The match are the same but don't know why it still report errors.
-    // My best guess is due to the ansi codes (color) differences.
-    it.skip("matches snapshot", async () => {
+    it("matches snapshot", async () => {
       const res = await ctx.runEask("analyze");
       const resClean = res.sanitized().raw();
       expect(resClean).toMatchSnapshot();

test/jest/local/Eask

@@ -1,7 +1,7 @@
 ;; -*- mode: eask; lexical-binding: t -*-
 
 (package "mini.pkg.1"
-         "3.3.4"
+         "5.5.6"
          "Minimal test package")
 
 (website-url "https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.1")

test/jest/local/mini.pkg.1.el

@@ -5,7 +5,7 @@
 
 ;; Author: Shen, Jen-Chieh <[email protected]>
 ;; URL: https://github.com/emacs-eask/cli/tree/master/test/fixtures/mini.pkg.1
-;; Version: 3.3.4
+;; Version: 5.5.6
 ;; Package-Requires: ((emacs "24.3") (s "1.12.0") (fringe-helper "1.0.1"))
 ;; Keywords: test local