revert: eask analyze prints to stdout to filter messages

JSON now printed without pretty-printing to ease testing

Author: joshbax189

lisp/core/analyze.el

@@ -98,34 +98,28 @@ Argument LEVEL and MSG are data from the debug log signal."
              (t             #'eask-analyze--write-plain-text))
        level msg))))
 
-(defun eask-stdout (msg &rest args)
-  "Like `eask-msg' but prints to stdout.
-
-For arguments MSG and ARGS, please see function `eask-msg' for the "
-  (eask-princ (apply #'eask--format-paint-kwds msg args) nil)
-  (eask-princ "\n" nil))
-
 (defun eask-analyze--file (files)
   "Lint list of Eask FILES."
   (let (checked-files content)
     ;; Linting
     (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 ((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))))))
+             (setq content (json-encode
+                            `((warnings . ,eask-analyze--warnings)
+                              (errors   . ,eask-analyze--errors)))))
            ;; XXX: When printing the result, no color allow.
            (eask--with-no-color
-             (eask-stdout (or content "{}"))))
+             (eask-msg (or content "{}"))))
           (eask-analyze--log  ; Plain text
            (setq content
                  (with-temp-buffer
@@ -134,7 +128,7 @@ For arguments MSG and ARGS, please see function `eask-msg' for the "
                    (buffer-string)))
            ;; XXX: When printing the result, no color allow.
            (eask--with-no-color
-             (mapc #'eask-stdout (reverse eask-analyze--log)))))
+             (mapc #'eask-msg (reverse eask-analyze--log)))))
 
     (eask-info "(Checked %s file%s)"
                (length checked-files)

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

@@ -1,310 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`analyze in ./analyze/dsl handles json option 1`] = `
-"{
-  "warnings": [
-    {
-      "range": {
-        "start": {
-          "line": 25,
-          "col": 0,
-          "pos": 853
-        },
-        "end": {
-          "line": 25,
-          "col": 35,
-          "pos": 888
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "💡 Pkg-file seems to be missing \`check-pkg.el'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 20,
-          "col": 0,
-          "pos": 709
-        },
-        "end": {
-          "line": 20,
-          "col": 17,
-          "pos": 726
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "💡 Warning regarding duplicate license name, GPLv3"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 17,
-          "col": 0,
-          "pos": 613
-        },
-        "end": {
-          "line": 17,
-          "col": 15,
-          "pos": 628
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "💡 Warning regarding duplicate author name, name"
-    }
-  ],
-  "errors": [
-    {
-      "range": {
-        "start": {
-          "line": 46,
-          "col": 0,
-          "pos": 1696
-        },
-        "end": {
-          "line": 50,
-          "col": 2,
-          "pos": 1908
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Define dependencies with the same name \`f' with different version"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 46,
-          "col": 0,
-          "pos": 1696
-        },
-        "end": {
-          "line": 50,
-          "col": 2,
-          "pos": 1908
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Define dependencies with the same name \`f'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 44,
-          "col": 0,
-          "pos": 1596
-        },
-        "end": {
-          "line": 44,
-          "col": 27,
-          "pos": 1623
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Define dependencies with the same name \`dash' with different version"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 43,
-          "col": 0,
-          "pos": 1576
-        },
-        "end": {
-          "line": 43,
-          "col": 19,
-          "pos": 1595
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Define dependencies with the same name \`dash'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 40,
-          "col": 0,
-          "pos": 1474
-        },
-        "end": {
-          "line": 40,
-          "col": 20,
-          "pos": 1494
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Define dependencies with the same name \`emacs'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 37,
-          "col": 0,
-          "pos": 1304
-        },
-        "end": {
-          "line": 37,
-          "col": 15,
-          "pos": 1319
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Unknown package archive \`local'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 37,
-          "col": 0,
-          "pos": 1304
-        },
-        "end": {
-          "line": 37,
-          "col": 15,
-          "pos": 1319
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Invalid archive name \`local'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 35,
-          "col": 0,
-          "pos": 1229
-        },
-        "end": {
-          "line": 35,
-          "col": 24,
-          "pos": 1253
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Unknown package archive \`magic-archive'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 33,
-          "col": 0,
-          "pos": 1214
-        },
-        "end": {
-          "line": 33,
-          "col": 13,
-          "pos": 1227
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of source \`gnu'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 30,
-          "col": 0,
-          "pos": 1073
-        },
-        "end": {
-          "line": 30,
-          "col": 61,
-          "pos": 1134
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Run-script with the same key name is not allowed: \`test\`"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 26,
-          "col": 0,
-          "pos": 953
-        },
-        "end": {
-          "line": 26,
-          "col": 35,
-          "pos": 988
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of \`package-descriptor'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 23,
-          "col": 0,
-          "pos": 822
-        },
-        "end": {
-          "line": 23,
-          "col": 29,
-          "pos": 851
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of \`package-file'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 14,
-          "col": 0,
-          "pos": 517
-        },
-        "end": {
-          "line": 14,
-          "col": 16,
-          "pos": 533
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of \`keywords'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 12,
-          "col": 0,
-          "pos": 383
-        },
-        "end": {
-          "line": 12,
-          "col": 55,
-          "pos": 438
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of \`website-url'"
-    },
-    {
-      "range": {
-        "start": {
-          "line": 9,
-          "col": 0,
-          "pos": 290
-        },
-        "end": {
-          "line": 9,
-          "col": 18,
-          "pos": 308
-        }
-      },
-      "filename": "/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask",
-      "message": "✗ Multiple definition of \`package'"
-    }
-  ]
-}
+"
+{"warnings":[{"range":{"start":{"line":25,"col":0,"pos":853},"end":{"line":25,"col":35,"pos":888}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"💡 Pkg-file seems to be missing \`check-pkg.el'"},{"range":{"start":{"line":20,"col":0,"pos":709},"end":{"line":20,"col":17,"pos":726}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"💡 Warning regarding duplicate license name, GPLv3"},{"range":{"start":{"line":17,"col":0,"pos":613},"end":{"line":17,"col":15,"pos":628}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"💡 Warning regarding duplicate author name, name"}],"errors":[{"range":{"start":{"line":46,"col":0,"pos":1696},"end":{"line":50,"col":2,"pos":1908}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Define dependencies with the same name \`f' with different version"},{"range":{"start":{"line":46,"col":0,"pos":1696},"end":{"line":50,"col":2,"pos":1908}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Define dependencies with the same name \`f'"},{"range":{"start":{"line":44,"col":0,"pos":1596},"end":{"line":44,"col":27,"pos":1623}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Define dependencies with the same name \`dash' with different version"},{"range":{"start":{"line":43,"col":0,"pos":1576},"end":{"line":43,"col":19,"pos":1595}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Define dependencies with the same name \`dash'"},{"range":{"start":{"line":40,"col":0,"pos":1474},"end":{"line":40,"col":20,"pos":1494}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Define dependencies with the same name \`emacs'"},{"range":{"start":{"line":37,"col":0,"pos":1304},"end":{"line":37,"col":15,"pos":1319}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Unknown package archive \`local'"},{"range":{"start":{"line":37,"col":0,"pos":1304},"end":{"line":37,"col":15,"pos":1319}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Invalid archive name \`local'"},{"range":{"start":{"line":35,"col":0,"pos":1229},"end":{"line":35,"col":24,"pos":1253}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Unknown package archive \`magic-archive'"},{"range":{"start":{"line":33,"col":0,"pos":1214},"end":{"line":33,"col":13,"pos":1227}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of source \`gnu'"},{"range":{"start":{"line":30,"col":0,"pos":1073},"end":{"line":30,"col":61,"pos":1134}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Run-script with the same key name is not allowed: \`test\`"},{"range":{"start":{"line":26,"col":0,"pos":953},"end":{"line":26,"col":35,"pos":988}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of \`package-descriptor'"},{"range":{"start":{"line":23,"col":0,"pos":822},"end":{"line":23,"col":29,"pos":851}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of \`package-file'"},{"range":{"start":{"line":14,"col":0,"pos":517},"end":{"line":14,"col":16,"pos":533}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of \`keywords'"},{"range":{"start":{"line":12,"col":0,"pos":383},"end":{"line":12,"col":55,"pos":438}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of \`website-url'"},{"range":{"start":{"line":9,"col":0,"pos":290},"end":{"line":9,"col":18,"pos":308}},"filename":"/home/naver/git/eask-cli/test/jest/analyze/dsl/Eask","message":"✗ Multiple definition of \`package'"}]}
+(Checked 1 file)
 "
 `;
 
 exports[`analyze in ./analyze/dsl matches snapshot 1`] = `
 {
   "stderr": "
-
-(Checked 1 file)
-",
-  "stdout": "~/Eask:9:18 Error: ✗ Multiple definition of \`package'
+~/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
@@ -322,6 +28,8 @@ exports[`analyze in ./analyze/dsl matches snapshot 1`] = `
 ~/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
+(Checked 1 file)
 ",
+  "stdout": "",
 }
 `;