code: Implements color

Author: jcs090218

lisp/_prepare.el

@@ -458,6 +458,16 @@ Standard is, 0 (error), 1 (warning), 2 (info), 3 (log), 4 or above (debug)."
   :type 'boolean
   :group 'eask)
 
+(defcustom eask-level-color
+  '((debug . ansi-blue)
+    (log   . ansi-white)
+    (info  . ansi-cyan)
+    (warn  . ansi-yellow)
+    (error . ansi-red))
+  "Alist of each log level's color, in (SYMBOL . ANSI-FUNCTION)."
+  :type 'alist
+  :group 'eask)
+
 (defun eask--verb2lvl (symbol)
   "Convert verbosity SYMBOL to level."
   (cl-case symbol
@@ -493,15 +503,12 @@ and the BODY will be executed silently."
 (defun eask-warn  (msg &rest args) (apply #'eask--msg 'warn  "[WARNING]" msg args))
 (defun eask-error (msg &rest args) (apply #'eask--msg 'error "[ERROR]"   msg args))
 
-(defmacro eask-log-2 (msg &rest args)
-  ""
-  (declare (indent 2) (debug t))
-  `(eask--msg 'log "[LOG]" (eask-with-ansi ,msg ,@args)))
-
-(defun eask--msg (level prefix msg &rest args)
+(defun eask--msg (symbol prefix msg &rest args)
   "If LEVEL is at or below `eask-verbosity', log message."
-  (eask-with-verbosity level
-    (message "%s" (apply #'eask--format prefix msg args))))
+  (eask-with-verbosity symbol
+    (let* ((ansi-function (cdr (assq symbol eask-level-color)))
+           (output (funcall ansi-function (apply #'eask--format prefix msg args))))
+      (message "%s" output))))
 
 (defun eask--format (prefix fmt &rest args)
   "Format Eask messages."
@@ -511,15 +518,6 @@ and the BODY will be executed silently."
                  fmt)
          args))
 
-(defmacro eask-with-ansi (fmt &rest args)
-  "Simply wrapper for macro `with-ansi'."
-  `(with-ansi (format ,fmt ,@args)))
-
-(defmacro eask-message (fmt &rest args)
-  "Like function `message' but with color."
-  (declare (indent 2) (debug t))
-  `(message (concat (eask-with-ansi ,fmt ,@args) "\n")))
-
 ;;
 ;;; File
 

lisp/checkdoc.el

@@ -9,7 +9,7 @@
 ;;
 ;;  Initialization options:
 ;;
-;;    [names..]     files you want checkdoc to run on
+;;    [files..]     files you want checkdoc to run on
 ;;
 
 ;;; Code:
@@ -19,6 +19,17 @@
        (file-name-directory (nth 1 (member "-scriptload" command-line-args))))
       nil t)
 
+(defun eask--help-checkdoc ()
+  "Print help if command failed"
+  (message "")
+  (message "You need to specify file(s) you want the checkdoc to run on")
+  (message "")
+  (message "  $ eask %s FILE-1 FILE-2" (eask-command))
+  (message "")
+  (message "Or edit Eask file with [files] specifier")
+  (message "")
+  (message " [+] (files \"FILE-1\" \"FILE-2\")"))
+
 (defun eask--checkdoc-print-error (text start end &optional unfixable)
   "Print error for checkdoc."
   (let ((msg (concat (checkdoc-buffer-label) ":"
@@ -41,17 +52,6 @@
   (if-let ((files (or (eask-args) (eask-package-el-files))))
       (mapcar #'eask--checkdoc-file files)
     (eask-info "(No files have been checked (checkdoc)")
-    (eask--checkdoc-help)))
-
-(defun eask--checkdoc-help ()
-  "Print help if command failed"
-  (message "")
-  (message "You need to specify file(s) you want the checkdoc to run on")
-  (message "")
-  (message "  $ eask %s FILE-1 FILE-2" (eask-command))
-  (message "")
-  (message "Or edit Eask file with [files] specifier")
-  (message "")
-  (message " [+] (files \"FILE-1\" \"FILE-2\")"))
+    (eask--help-checkdoc)))
 
 ;;; checkdoc.el ends here

lisp/compile.el

@@ -19,6 +19,17 @@
        (file-name-directory (nth 1 (member "-scriptload" command-line-args))))
       nil t)
 
+(defun eask--help-compile ()
+  "Print help if command failed"
+  (message "")
+  (message "You need to specify file(s) you want to compile")
+  (message "")
+  (message "  $ eask %s FILE-1 FILE-2" (eask-command))
+  (message "")
+  (message "Or edit Eask file with [files] specifier")
+  (message "")
+  (message " [+] (files \"FILE-1\" \"FILE-2\")"))
+
 ;; Handle options
 (when (eask-strict-p) (setq byte-compile-error-on-warn t))
 (when (= eask-verbosity 4) (setq byte-compile-verbose t))
@@ -41,17 +52,6 @@
             (when (eask--byte-compile-file filename) (push filename compiled))))
         (eask-info "(Total of %s files compiled)" (length compiled)))
     (eask-info "(No files have been compiled)")
-    (eask--compile-help)))
-
-(defun eask--compile-help ()
-  "Print help if command failed"
-  (message "")
-  (message "You need to specify file(s) you want to compile")
-  (message "")
-  (message "  $ eask %s FILE-1 FILE-2" (eask-command))
-  (message "")
-  (message "Or edit Eask file with [files] specifier")
-  (message "")
-  (message " [+] (files \"FILE-1\" \"FILE-2\")"))
+    (eask--help-compile)))
 
 ;;; compile.el ends here

lisp/extern/ansi.el

@@ -130,10 +130,10 @@ This variable affects `with-ansi', `with-ansi-princ'."
                `(,alias (string &rest objects)
                         ,(list 'backquote (list fn ',string ',@objects)))))
            (append
-            (mapcar 'car ansi-colors)
-            (mapcar 'car ansi-on-colors)
-            (mapcar 'car ansi-styles)
-            (mapcar 'car ansi-csis)))
+             (mapcar 'car ansi-colors)
+             (mapcar 'car ansi-on-colors)
+             (mapcar 'car ansi-styles)
+             (mapcar 'car ansi-csis)))
        ,(cons 'ansi--concat body))))
 
 (defmacro with-ansi-princ (&rest body)
@@ -149,7 +149,8 @@ FORMAT-STRING and OBJECTS are processed same as `apply'."
                   effect-or-code
                 (ansi--code effect-or-code)))
         (text (apply 'format format-string objects)))
-    (format "\e[%dm%s\e[%sm" code text ansi-reset)))
+    (if ansi-inhibit-ansi text
+      (format "\e[%dm%s\e[%sm" code text ansi-reset))))
 
 (defun ansi-csi-apply (effect-or-char &optional reps)
   "Apply EFFECT-OR-CHAR REPS (1 default) number of times."

lisp/info.el

@@ -14,14 +14,22 @@
        (file-name-directory (nth 1 (member "-scriptload" command-line-args))))
       nil t)
 
+(defun eask--help-info ()
+  "Print help if command failed"
+  )
+
 (defun eask--print-info (key)
   "Print package information."
   (when-let ((info (eask-package-get key)))
     (message "  %s" info)))
 
 (eask-start
-  (eask--print-info :name)
-  (eask--print-info :version)
-  (eask--print-info :description))
+  (if eask-package
+      (progn
+        (eask--print-info :name)
+        (eask--print-info :version)
+        (eask--print-info :description))
+    (eask-info "(Eask file has no package information)")
+    (eask--help-info)))
 
 ;;; info.el ends here

lisp/install.el

@@ -23,20 +23,25 @@
 
 (eask-load "package")  ; load dist path
 
+(defun eask--help-install ()
+  "Print help if command failed"
+  )
+
 (eask-start
   (eask-pkg-init)
   (if-let ((names (eask-args)))
       ;; If package [name..] are specified, we try to install it
       (eask-progress "Installing" names "... done!" #'eask-package-install)
     ;; Else we try to install package from the working directory
-    (let* ((packaged (eask-packaged-file))
-           (target (or packaged
-                       eask-package-file
-                       (expand-file-name "./"))))
-      (if packaged
-          (eask-info "✓ Loading packaged artefact in %s... done!" target)
-        (eask-info "? Packaged artefact not found, install directly to %s..." target))
-      (add-to-list 'load-path (expand-file-name (eask-packaged-name) package-user-dir))
-      (package-install-file target))))
+    (if-let* ((packaged (eask-packaged-file))
+              (target (or packaged eask-package-file)))
+        (progn
+          (if packaged
+              (eask-info "✓ Loading packaged artefact in %s... done!" target)
+            (eask-info "? Packaged artefact not found, install directly to %s..." target))
+          (add-to-list 'load-path (expand-file-name (eask-packaged-name) package-user-dir))
+          (package-install-file target))
+      (eask-info "(No files have been intalled)")
+      (eask--help-install))))
 
 ;;; install.el ends here