generate.py

@@ -6,7 +6,7 @@ import jinja2
 
 py_script_names = [
     "help",
-    "print",
+    "info",
     "print-ansi",
     "vars",
     "confirm",

src/builtins.mk

@@ -20,8 +20,8 @@ endif
 _print-ansi:
 	$(call py,print_ansi_py)
 # functions to take f-string literals and pass to python print
-tprint = $(call py,print_py,$(1))
+tprint = $(call py,info_py,$(1))
-tprint-sh = $(call pysh,print_py,$(1))
+tprint-sh = $(call pysh,info_py,$(1))
 tconfirm = $(call py,confirm_py,$(1))
 ## _update-task.mk | downloads latest development version of task.mk
 _update-task.mk:

src/help.py

@@ -13,7 +13,6 @@ from textwrap import wrap
 ###-
 # this is just to trick the LSP during development
 from utils import ansi, cfg
-
 # -###
 
 

src/info.py

@@ -0,0 +1,7 @@
+#% extends "py-script.mk" %#
+#% block name %#info#% endblock %#
+#% block script %#
+##- '$(utils_py)' -##
+
+print(f"""$(2)""")
+#% endblock %#

src/print.py

@@ -1,7 +0,0 @@
-#% extends "py-script.mk" %#
-#% block name %#print#% endblock %#
-#% block script %#
-##- '$(utils_py)' -##
-###- sys is imported with utils_py -###
-sys.stderr.write(f"""$(2)\n""")
-#% endblock %#

src/utils.py

@@ -65,32 +65,29 @@ class Ansi:
         """use custom color"""
 
         code, end = "\033[", "m"
-        if not sys.stdout.isatty() or os.getenv("NO_COLOR", False):
+        if fg:
-            return ""
+            if isinstance(fg, int):
-        else:
+                code += f"38;5;{fg}"
-            if fg:
+            elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 1:
-                if isinstance(fg, int):
+                code += f"38;5;{fg[0]}"
-                    code += f"38;5;{fg}"
+            elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 3:
-                elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 1:
+                code += f"38;2;{';'.join((str(i) for i in fg))}"
-                    code += f"38;5;{fg[0]}"
+            else:
-                elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 3:
+                print("Expected one or three values for fg as a list")
-                    code += f"38;2;{';'.join((str(i) for i in fg))}"
+                sys.exit(1)
-                else:
-                    print("Expected one or three values for fg as a list")
-                    sys.exit(1)
 
-            if bg:
+        if bg:
-                if isinstance(bg, int):
+            if isinstance(bg, int):
-                    code += f"{';' if fg else ''}48;5;{bg}"
+                code += f"{';' if fg else ''}48;5;{bg}"
-                elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 1:
+            elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 1:
-                    code += f"{';' if fg else ''}48;5;{bg[0]}"
+                code += f"{';' if fg else ''}48;5;{bg[0]}"
-                elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 3:
+            elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 3:
-                    code += f"{';' if fg else ''}48;2;{';'.join((str(i) for i in bg))}"
+                code += f"{';' if fg else ''}48;2;{';'.join((str(i) for i in bg))}"
-                else:
+            else:
-                    print("Expected one or three values for bg as a list")
+                print("Expected one or three values for bg as a list")
-                    sys.exit(1)
+                sys.exit(1)
 
-            return code + end
+        return code + end
 
     def add_cfg(self):
         cfg_styles = {
@@ -115,6 +112,5 @@ class Ansi:
 a = ansi = Ansi()
 
 cfg = Config(
-    "$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""", int("$(WRAP)")
+    "$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""",int('$(WRAP)'))
-)
 #% endblock %#

task.mk

@@ -1,7 +1,7 @@
 # }> [github.com/daylinmorgan/task.mk] <{ #
 # Copyright (c) 2022 Daylin Morgan
 # MIT License
-# version: v22.9.28-dev
+# version: 22.9.28
 #
 # task.mk should be included at the bottom of your Makefile with `-include .task.mk`
 # See below for the standard configuration options that should be set prior to including this file.
@@ -42,8 +42,8 @@ endif
 _print-ansi:
 	$(call py,print_ansi_py)
 # functions to take f-string literals and pass to python print
-tprint = $(call py,print_py,$(1))
+tprint = $(call py,info_py,$(1))
-tprint-sh = $(call pysh,print_py,$(1))
+tprint-sh = $(call pysh,info_py,$(1))
 tconfirm = $(call py,confirm_py,$(1))
 ## _update-task.mk | downloads latest development version of task.mk
 _update-task.mk:
@@ -240,9 +240,9 @@ def main():
 if __name__ == "__main__":
     main()
 endef
-define  print_py
+define  info_py
 $(utils_py)
-sys.stderr.write(f"""$(2)\n""")
+print(f"""$(2)""")
 endef
 define  print_ansi_py
 $(utils_py)
@@ -331,30 +331,27 @@ class Ansi:
     def custom(self, fg=None, bg=None):
         """use custom color"""
         code, end = "\033[", "m"
-        if not sys.stdout.isatty() or os.getenv("NO_COLOR", False):
+        if fg:
-            return ""
+            if isinstance(fg, int):
-        else:
+                code += f"38;5;{fg}"
-            if fg:
+            elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 1:
-                if isinstance(fg, int):
+                code += f"38;5;{fg[0]}"
-                    code += f"38;5;{fg}"
+            elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 3:
-                elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 1:
+                code += f"38;2;{';'.join((str(i) for i in fg))}"
-                    code += f"38;5;{fg[0]}"
+            else:
-                elif (isinstance(fg, list) or isinstance(fg, tuple)) and len(fg) == 3:
+                print("Expected one or three values for fg as a list")
-                    code += f"38;2;{';'.join((str(i) for i in fg))}"
+                sys.exit(1)
-                else:
+        if bg:
-                    print("Expected one or three values for fg as a list")
+            if isinstance(bg, int):
-                    sys.exit(1)
+                code += f"{';' if fg else ''}48;5;{bg}"
-            if bg:
+            elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 1:
-                if isinstance(bg, int):
+                code += f"{';' if fg else ''}48;5;{bg[0]}"
-                    code += f"{';' if fg else ''}48;5;{bg}"
+            elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 3:
-                elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 1:
+                code += f"{';' if fg else ''}48;2;{';'.join((str(i) for i in bg))}"
-                    code += f"{';' if fg else ''}48;5;{bg[0]}"
+            else:
-                elif (isinstance(bg, list) or isinstance(bg, tuple)) and len(bg) == 3:
+                print("Expected one or three values for bg as a list")
-                    code += f"{';' if fg else ''}48;2;{';'.join((str(i) for i in bg))}"
+                sys.exit(1)
-                else:
+        return code + end
-                    print("Expected one or three values for bg as a list")
-                    sys.exit(1)
-            return code + end
     def add_cfg(self):
         cfg_styles = {
             "header": "$(HEADER_STYLE)",
@@ -374,6 +371,5 @@ class Ansi:
             return f"{self.__dict__[style]}{text}{self.__dict__['end']}"
 a = ansi = Ansi()
 cfg = Config(
-    "$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""", int("$(WRAP)")
+    "$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""",int('$(WRAP)'))
-)
 endef