Makefile

@@ -4,8 +4,9 @@ TEMPLATES := $(shell find src/ -type f)
 msg = $(if $(tprint),$(call tprint,{a.bold}==> {a.magenta}$(1){a.end}),@echo '==> $(1)')
 
 ### task.mk development |> -d -ms b_green --align center
+## bootstrap | generate local dev environment |> -ms b_magenta -gs b_cyan
 .PHONY: bootstrap env hooks
-bootstrap: env hooks ## generate local dev environment |> -ms b_magenta -gs b_cyan
+bootstrap: env hooks
 env: 
 	$(call msg,Bootstrapping Environment)
 	@mamba create -p ./env python jinja2 black -y
@@ -15,15 +16,16 @@ hooks:
 docs-env:
 	@mamba run -p ./env pip install mkdocs-material mkdocs-git-revision-date-localized-plugin
 
+## l, lint | lint the python
 .PHONY: l lint
-l lint: ## lint the python
+l lint:
 	$(call msg,Linting)
 	@black generate.py
 	@black src/*.py --fast
 
-
+## assets | generate assets
 .PHONY: assets
-assets: ## generate assets
+assets:
 	@yartsu -o assets/help.svg -t "make help" -- make --no-print-directory help
 
 define release_sh
@@ -34,13 +36,15 @@ git commit -m "release: $(VERSION)" --no-verify
 git tag $(VERSION)
 endef
 
+## release | release new version of task.mk
 .PHONY: release
-release: version-check ## release new version of task.mk
+release: version-check
 	$(call msg,Release Project)
 	$(call tbash,release_sh)
 
+## c, clean | remove the generated files
 .PHONY: clean
-c clean: ## remove the generated files
+c clean:
 	@rm -f task.mk .task.mk
 
 define version_check_sh
@@ -59,8 +63,9 @@ version-check:
 	@$(call tbash,version_check_sh)
 	@$(call tprint,>> {a.green}VERSION LOOKS GOOD!{a.end})
 
+## info | demonstrate usage of tprint
 .PHONY: task
-info: ## demonstrate usage of tprint
+info:
 	$(call msg,Info Message)
 	$(call tprint,{a.black_on_cyan}This is task-print output:{a.end})
 	$(call tprint,$(mlmsg))
@@ -69,7 +74,7 @@ info: ## demonstrate usage of tprint
 task.mk: $(TEMPLATES) generate.py
 	./generate.py $(VERSION) > task.mk
 
--include .task.mk .task.cfg.mk
+-include .task.mk
 .task.mk: $(TEMPLATES) generate.py
 	$(call msg,re-jinjaing the local .task.mk)
 	@./generate.py $(VERSION) > .task.mk || (echo "generator failed!!" && rm .task.mk)

src/builtins.mk

@@ -3,7 +3,8 @@ ifeq (help,$(firstword $(MAKECMDGOALS)))
   HELP_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 	export HELP_ARGS
 endif
-h help: ## show this help
+## h, help | show this help
+h help:
 	$(call py,help_py)
 _help: export SHOW_HIDDEN=true
 _help: help
@@ -13,15 +14,17 @@ $(foreach v,$(PRINT_VARS),$(eval export $(v)))
 vars v:
 	$(call py,vars_py,$(PRINT_VARS))
 endif
-### |> -ws --hidden
-### task.mk builtins: |> -d --hidden
-_print-ansi: ## show all possible ansi color code combinations
+### | args: -ws --hidden
+### task.mk builtins: | args: -d --hidden
+## _print-ansi | show all possible ansi color code combinations
+_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-sh = $(call pysh,print_py,$(1))
 tconfirm = $(call py,confirm_py,$(1))
-_update-task.mk: ## downloads latest development version of task.mk
+## _update-task.mk | downloads latest development version of task.mk
+_update-task.mk:
 	$(call tprint,{a.b_cyan}Updating task.mk{a.end})
 	curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
 .PHONY: h help _help _print-ansi _update-task.mk

src/config.mk

@@ -1,4 +1,5 @@
 # ---- [config] ---- #
+-include .task.cfg.mk
 HEADER_STYLE ?= b_cyan
 ACCENT_STYLE ?= b_yellow
 PARAMS_STYLE ?= $(ACCENT_STYLE)

src/help.py

@@ -10,7 +10,8 @@ import sys
 from textwrap import wrap
 
 ###-
-from utils import Ansi, cfg  # this is just to trick the LSP during development
+# this is just to trick the LSP during development
+from utils import Ansi, cfg
 
 # -###
 ##- '$(utils_py)' -##
@@ -19,23 +20,29 @@ a = ansi = Ansi(target="stdout")
 MaxLens = namedtuple("MaxLens", "goal msg")
 
 ###- double dollar signs to prevent make escaping them -###
-###- bets on how long until I break this regex? -###
+###- re.X requires all important whitespace is escaped -###
 pattern = re.compile(
     r"""
-(?:
-  ^\#\#\#\s+
-  |
-  ^(?:
-    (?:\#\#\s+)?
-    (?P<goal>.*?)(?:\s+\|>|:.*?\#\#)\s+
-  )
-)
-(?P<msg>.*?)?\s?
-(?:\|>\s+
-  (?P<msgargs>.*?)
-)?
-$$
-""",
+    ^\#\#\ 
+    (?P<goal>.*?)\s?\|\s?(?P<msg>.*?)
+    \s?
+    (?:
+      (?:\|\s?args:\s?|\|>)
+      \s?
+      (?P<msgargs>.*?)
+    )?
+    $$
+    |
+    ^\#\#\#\ 
+    (?P<rawmsg>.*?)
+    \s?
+    (?:
+      (?:\|\s?args:|\|\>)
+      \s?
+      (?P<rawargs>.*?)
+    )?
+    $$
+    """,
     re.X,
 )
 goal_pattern = re.compile(r"""^(?!#|\t)(.*):.*\n\t""", re.MULTILINE)
@@ -182,10 +189,7 @@ def print_help():
 
     items = list(parse_help(gen_makefile()))
     maxlens = MaxLens(
-        *(
-            max((*(len(item[x]) for item in items if x in item), 0))
-            for x in ["goal", "msg"]
-        )
+        *(max((len(item[x]) for item in items if x in item)) for x in ["goal", "msg"])
     )
     for item in items:
         if "goal" in item:
@@ -194,8 +198,8 @@ def print_help():
                     item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
                 )
             )
-        else:
-            lines.extend(fmt_rawmsg(item["msg"], item.get("msgargs", ""), maxlens))
+        if "rawmsg" in item:
+            lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
     lines.append(cfg.epilog)
     print("\n".join(lines))
 

task.mk

@@ -1,7 +1,7 @@
 # }> [github.com/daylinmorgan/task.mk] <{ #
 # Copyright (c) 2022 Daylin Morgan
 # MIT License
-# version: v22.9.28-13-gfd96a45dev
+# version: v22.9.28-8-g4fcab2adev
 #
 # 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.
@@ -25,7 +25,8 @@ ifeq (help,$(firstword $(MAKECMDGOALS)))
   HELP_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 	export HELP_ARGS
 endif
-h help: ## show this help
+## h, help | show this help
+h help:
 	$(call py,help_py)
 _help: export SHOW_HIDDEN=true
 _help: help
@@ -35,15 +36,17 @@ $(foreach v,$(PRINT_VARS),$(eval export $(v)))
 vars v:
 	$(call py,vars_py,$(PRINT_VARS))
 endif
-### |> -ws --hidden
-### task.mk builtins: |> -d --hidden
-_print-ansi: ## show all possible ansi color code combinations
+### | args: -ws --hidden
+### task.mk builtins: | args: -d --hidden
+## _print-ansi | show all possible ansi color code combinations
+_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-sh = $(call pysh,print_py,$(1))
 tconfirm = $(call py,confirm_py,$(1))
-_update-task.mk: ## downloads latest development version of task.mk
+## _update-task.mk | downloads latest development version of task.mk
+_update-task.mk:
 	$(call tprint,{a.b_cyan}Updating task.mk{a.end})
 	curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
 .PHONY: h help _help _print-ansi _update-task.mk
@@ -89,20 +92,26 @@ a = ansi = Ansi(target="stdout")
 MaxLens = namedtuple("MaxLens", "goal msg")
 pattern = re.compile(
     r"""
-(?:
-  ^\#\#\#\s+
-  |
-  ^(?:
-    (?:\#\#\s+)?
-    (?P<goal>.*?)(?:\s+\|>|:.*?\#\#)\s+
-  )
-)
-(?P<msg>.*?)?\s?
-(?:\|>\s+
-  (?P<msgargs>.*?)
-)?
-$$
-""",
+    ^\#\#\ 
+    (?P<goal>.*?)\s?\|\s?(?P<msg>.*?)
+    \s?
+    (?:
+      (?:\|\s?args:\s?|\|>)
+      \s?
+      (?P<msgargs>.*?)
+    )?
+    $$
+    |
+    ^\#\#\#\ 
+    (?P<rawmsg>.*?)
+    \s?
+    (?:
+      (?:\|\s?args:|\|\>)
+      \s?
+      (?P<rawargs>.*?)
+    )?
+    $$
+    """,
     re.X,
 )
 goal_pattern = re.compile(r"""^(?!#|\t)(.*):.*\n\t""", re.MULTILINE)
@@ -225,10 +234,7 @@ def print_help():
     lines = [cfg.usage]
     items = list(parse_help(gen_makefile()))
     maxlens = MaxLens(
-        *(
-            max((*(len(item[x]) for item in items if x in item), 0))
-            for x in ["goal", "msg"]
-        )
+        *(max((len(item[x]) for item in items if x in item)) for x in ["goal", "msg"])
     )
     for item in items:
         if "goal" in item:
@@ -237,8 +243,8 @@ def print_help():
                     item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
                 )
             )
-        else:
-            lines.extend(fmt_rawmsg(item["msg"], item.get("msgargs", ""), maxlens))
+        if "rawmsg" in item:
+            lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
     lines.append(cfg.epilog)
     print("\n".join(lines))
 def print_arg_help(help_args):