Compare commits

..

7 commits

13 changed files with 146 additions and 239 deletions

View file

@ -105,7 +105,7 @@ task.mk: $(TEMPLATES) generate.py
./generate.py $(VERSION) > task.mk ./generate.py $(VERSION) > task.mk
define USAGE define USAGE
{a.$(HEADER_COLOR)}usage:{a.end} {a.$(HEADER_STYLE)}usage:{a.end}
make <recipe> make <recipe>
Turn your {a.style('`Makefile`','b_magenta')} into Turn your {a.style('`Makefile`','b_magenta')} into

View file

@ -101,19 +101,19 @@ You can quickly customize some of the default behavior of `task.mk` by overridin
```make ```make
# ---- CONFIG ---- # # ---- CONFIG ---- #
HEADER_COLOR ?= b_cyan HEADER_STYLE ?= b_cyan
PARAMS_COLOR ?= b_magenta PARAMS_STYLE ?= b_magenta
ACCENT_COLOR ?= b_yellow ACCENT_STYLE ?= b_yellow
GOAL_COLOR ?= $(ACCENT_COLOR) GOAL_STYLE ?= $(ACCENT_STYLE)
MSG_COLOR ?= faint MSG_STYLE ?= faint
DIVIDER_COLOR ?= default DIVIDER_STYLE ?= default
DIVIDER ?= ─ DIVIDER ?= ─
HELP_SEP ?= │ HELP_SEP ?= │
# python f-string literals # python f-string literals
EPILOG ?= EPILOG ?=
define USAGE ?= define USAGE ?=
{ansi.$(HEADER_COLOR)}usage{ansi.end}: {ansi.$(HEADER_STYLE)}usage{ansi.end}:
make <recipe> make <recipe>
endef endef
@ -122,7 +122,7 @@ endef
To use a custom color for one of the predefined configuration variables specify only the custom method. To use a custom color for one of the predefined configuration variables specify only the custom method.
```make ```make
HEADER_COLOR = custom(fg=171,bg=227) HEADER_STYLE = custom(fg=171,bg=227)
``` ```
**NOTE**: `HELP_SEP` does not change the argument definitions syntax only the format of `make help`. **NOTE**: `HELP_SEP` does not change the argument definitions syntax only the format of `make help`.

View file

@ -5,7 +5,7 @@ from pathlib import Path
import jinja2 import jinja2
py_script_names = ["help", "ansi", "info", "print-ansi", "vars","confirm"] py_script_names = ["help", "ansi", "info", "print-ansi", "vars", "confirm"]
def get_jinja_env(): def get_jinja_env():
@ -16,6 +16,8 @@ def get_jinja_env():
block_end_string="%#", block_end_string="%#",
variable_start_string="##-", variable_start_string="##-",
variable_end_string="-##", variable_end_string="-##",
comment_start_string="###-",
comment_end_string="-###",
) )
@ -24,6 +26,10 @@ def render(env, template, **kwargs):
return template.render(**kwargs) return template.render(**kwargs)
def dropnewlines(text):
return "\n".join([line for line in text.splitlines() if line])
def main(): def main():
if len(sys.argv) == 2: if len(sys.argv) == 2:
version = sys.argv[1] version = sys.argv[1]
@ -31,9 +37,7 @@ def main():
version = "dev" version = "dev"
env = get_jinja_env() env = get_jinja_env()
py_scripts = [dropnewlines(render(env, f"{name}.py")) for name in py_script_names]
py_scripts = [render(env, f"{name}.py") for name in py_script_names]
print(render(env, "task.mk", py_scripts=py_scripts, version=version)) print(render(env, "task.mk", py_scripts=py_scripts, version=version))

View file

@ -19,28 +19,25 @@ state2byte = dict(
bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9 bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9
) )
addfg = lambda byte: byte + 30
def fg(byte): addbg = lambda byte: byte + 40
return 30 + byte
def bg(byte):
return 40 + byte
class Ansi: class Ansi:
"""ANSI color codes""" """ANSI escape codes"""
def __init__(self): def __init__(self):
self.setcode("end", "\033[0m") self.setcode("end", "\033[0m")
self.setcode("default", "\033[38m") self.setcode("default", "\033[38m")
self.setcode("bg_default", "\033[48m") self.setcode("bg_default", "\033[48m")
for name, byte in color2byte.items(): for name, byte in color2byte.items():
self.setcode(name, f"\033[{fg(byte)}m") self.setcode(name, f"\033[{addfg(byte)}m")
self.setcode(f"b_{name}", f"\033[1;{fg(byte)}m") self.setcode(f"b_{name}", f"\033[1;{addfg(byte)}m")
self.setcode(f"d_{name}", f"\033[2;{fg(byte)}m") self.setcode(f"d_{name}", f"\033[2;{addfg(byte)}m")
for bgname, bgbyte in color2byte.items(): for bgname, bgbyte in color2byte.items():
self.setcode(f"{name}_on_{bgname}", f"\033[{bg(bgbyte)};{fg(byte)}m") self.setcode(
f"{name}_on_{bgname}", f"\033[{addbg(bgbyte)};{addfg(byte)}m"
)
for name, byte in state2byte.items(): for name, byte in state2byte.items():
self.setcode(name, f"\033[{byte}m") self.setcode(name, f"\033[{byte}m")
@ -82,7 +79,7 @@ class Ansi:
def style(self, text, style): def style(self, text, style):
if style not in self.__dict__: if style not in self.__dict__:
print(f"unknown style {style}") print(f"unknown style: {style}")
sys.exit(1) sys.exit(1)
else: else:
return f"{self.__dict__[style]}{text}{self.__dict__['end']}" return f"{self.__dict__[style]}{text}{self.__dict__['end']}"

View file

@ -1,40 +1,29 @@
# ---- [buitlin recipes] ---- # # ---- [buitlin recipes] ---- #
## h, help | show this help ## h, help | show this help
.PHONY: help h .PHONY: help h
help h: help h:
$(call py,help_py) $(call py,help_py)
.PHONY: _help .PHONY: _help
_help: export SHOW_HIDDEN=true _help: export SHOW_HIDDEN=true
_help: help _help: help
ifdef PRINT_VARS ifdef PRINT_VARS
$(foreach v,$(PRINT_VARS),$(eval export $(v))) $(foreach v,$(PRINT_VARS),$(eval export $(v)))
.PHONY: vars v .PHONY: vars v
vars v: vars v:
$(call py,vars_py,$(PRINT_VARS)) $(call py,vars_py,$(PRINT_VARS))
endif endif
### | args: -ws --hidden ### | args: -ws --hidden
### task.mk builtins: | args: -d --hidden ### task.mk builtins: | args: -d --hidden
## _print-ansi | show all possible ansi color code combinations ## _print-ansi | show all possible ansi color code combinations
.PHONY: .PHONY:
_print-ansi: _print-ansi:
$(call py,print_ansi_py) $(call py,print_ansi_py)
# functions to take f-string literals and pass to python print # functions to take f-string literals and pass to python print
tprint = $(call py,info_py,$(1)) tprint = $(call py,info_py,$(1))
tprint-sh = $(call pysh,info_py,$(1)) tprint-sh = $(call pysh,info_py,$(1))
tconfirm = $(call py,confirm_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: _update-task.mk:
$(call tprint,{a.b_cyan}Updating task.mk{a.end}) $(call tprint,{a.b_cyan}Updating task.mk{a.end})
curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
export MAKEFILE_LIST export MAKEFILE_LIST

View file

@ -1,17 +1,12 @@
# ---- CONFIG ---- # # ---- [config] ---- #
HEADER_COLOR ?= b_cyan HEADER_STYLE ?= b_cyan
PARAMS_COLOR ?= b_magenta ACCENT_STYLE ?= b_yellow
ACCENT_COLOR ?= b_yellow PARAMS_STYLE ?= $(ACCENT_STYLE)
GOAL_COLOR ?= $(ACCENT_COLOR) GOAL_STYLE ?= $(ACCENT_STYLE)
MSG_COLOR ?= faint MSG_STYLE ?= faint
DIVIDER_COLOR ?= default DIVIDER_STYLE ?= default
DIVIDER ?= DIVIDER ?=
HELP_SEP ?= HELP_SEP ?=
# python f-string literals # python f-string literals
EPILOG ?= EPILOG ?=
define USAGE ?= USAGE ?={ansi.$(HEADER_STYLE)}usage{ansi.end}:\n make <recipe>
{ansi.$(HEADER_COLOR)}usage{ansi.end}:
make <recipe>
endef

View file

@ -3,8 +3,10 @@
#% block script %# #% block script %#
import sys import sys
##- '$(ansi_py)' -## ##- '$(ansi_py)' -##
def confirm(): def confirm():
""" """
Ask user to enter Y or N (case-insensitive). Ask user to enter Y or N (case-insensitive).
@ -16,6 +18,7 @@ def confirm():
answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower() answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower()
return answer == "y" return answer == "y"
if confirm(): if confirm():
sys.exit(0) sys.exit(0)
else: else:

View file

@ -5,27 +5,25 @@ import argparse
from collections import namedtuple from collections import namedtuple
import os import os
import re import re
from typing import Any
##- '$(ansi_py)' -## ##- '$(ansi_py)' -##
ansi: Any
MaxLens = namedtuple("MaxLens", "goal msg") MaxLens = namedtuple("MaxLens", "goal msg")
# double dollar signs to prevent make escaping them ###- double dollar signs to prevent make escaping them -###
pattern = re.compile( pattern = re.compile(
r"^## (?P<goal>.*) \| (?P<msg>.*)|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<args>.*?))?$$" r"^## (?P<goal>.*?) \| (?P<msg>.*?)(?:\s?\| args: (?P<msgargs>.*?))?$$|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<rawargs>.*?))?$$"
) )
def rawargs(argstring): def parseargs(argstring):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--align") parser.add_argument("--align")
parser.add_argument("-d", "--divider", action="store_true") parser.add_argument("-d", "--divider", action="store_true")
parser.add_argument("-ws", "--whitespace", action="store_true") parser.add_argument("-ws", "--whitespace", action="store_true")
parser.add_argument("-ms", "--msg-style", type=str) parser.add_argument("-ms", "--msg-style", type=str)
parser.add_argument("--hidden",action="store_true") parser.add_argument("-gs", "--goal-style", type=str)
parser.add_argument("--hidden", action="store_true")
return parser.parse_args(argstring.split()) return parser.parse_args(argstring.split())
@ -49,54 +47,63 @@ def parse_make(file):
yield {k: v for k, v in match.groupdict().items() if v is not None} yield {k: v for k, v in match.groupdict().items() if v is not None}
def print_goal(goal, msg, max_goal_len): def fmt_goal(goal, msg, max_goal_len, argstr):
print( args = parseargs(argstr)
ansi.style(f" {goal:>{max_goal_len}}", "$(GOAL_COLOR)") goal_style = args.goal_style.strip() if args.goal_style else "$(GOAL_STYLE)"
msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
return (
ansi.style(f" {goal:>{max_goal_len}}", goal_style)
+ " $(HELP_SEP) " + " $(HELP_SEP) "
+ ansi.style(msg, "$(MSG_COLOR)") + ansi.style(msg, msg_style)
) )
def print_rawmsg(msg, argstr, maxlens): def fmt_rawmsg(msg, argstr, maxlens):
args = rawargs(argstr) args = parseargs(argstr)
msg_style = args.msg_style if args.msg_style else "$(MSG_COLOR)" lines = []
msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
if not os.getenv("SHOW_HIDDEN") and args.hidden: if not os.getenv("SHOW_HIDDEN") and args.hidden:
return return []
if msg: if msg:
if args.align == "sep": if args.align == "sep":
print( lines.append(
f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}" f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}"
) )
elif args.align == "center": elif args.align == "center":
print(f" {ansi.style(msg.center(sum(maxlens)),msg_style)}") lines.append(f" {ansi.style(msg.center(sum(maxlens)),msg_style)}")
else: else:
print(f" {ansi.style(msg,msg_style)}") lines.append(f" {ansi.style(msg,msg_style)}")
if args.divider: if args.divider:
print( lines.append(
ansi.style( ansi.style(
f" {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}", f" {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}",
"$(DIVIDER_COLOR)", "$(DIVIDER_STYLE)",
) )
) )
if args.whitespace: if args.whitespace:
print() lines.append("\n")
return lines
def print_help(): def print_help():
print(f"""$(USAGE)""") lines = [f"""$(USAGE)"""]
items = list(parse_make(gen_makefile())) items = list(parse_make(gen_makefile()))
maxlens = MaxLens( maxlens = MaxLens(
*(max((len(item[x]) for item in items if x in item)) 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: for item in items:
if "goal" in item: if "goal" in item:
print_goal(item["goal"], item["msg"], maxlens.goal) lines.append(
fmt_goal(
item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
)
)
if "rawmsg" in item: if "rawmsg" in item:
print_rawmsg(item["rawmsg"], item.get("args", ""), maxlens) lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
lines.append(f"""$(EPILOG)""")
print(f"""$(EPILOG)""") print("\n".join(lines))
print_help() print_help()

View file

@ -5,6 +5,10 @@
codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__} codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__}
for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)): for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)):
print("{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(codes_names[code], code + "******" + ansi.end,repr(code))) print(
"{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(
codes_names[code], code + "******" + ansi.end, repr(code)
)
)
#% endblock %# #% endblock %#

View file

@ -1,21 +1,18 @@
# ---- [python/bash script runner] ---- # # ---- [python/bash script runner] ---- #
###-- modified from https://unix.stackexchange.com/a/223093 -###
# modified from https://unix.stackexchange.com/a/223093
define \n define \n
endef endef
escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1)))) escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1))))
escape_printf = $(subst \,\\,$(subst %,%%,$1)) escape_printf = $(subst \,\\,$(subst %,%%,$1))
create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1))) create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1)))
printline = printf -- "<----------------------------------->\n"
ifdef DEBUG ifdef DEBUG
define _debug_runner define _debug_runner
@printf "$(1) Script:\n" @printf "$(1) Script:\n";$(printline);
@printf -- "<----------------------------------->\n" @printf "$(call create_string,$(3))\n" | cat -n
@printf "$(call create_string,$(3))\n" @$(printline)
@printf -- "<----------------------------------->\n"
@printf "$(call create_string,$(3))" | $(2) @printf "$(call create_string,$(3))" | $(2)
endef endef
py = $(call _debug_runner,Python,python3,$($(1))) py = $(call _debug_runner,Python,python3,$($(1)))
@ -24,5 +21,4 @@ else
py = @python3 <(printf "$(call create_string,$($(1)))") py = @python3 <(printf "$(call create_string,$($(1)))")
tbash = @bash <(printf "$(call create_string,$($(1)))") tbash = @bash <(printf "$(call create_string,$($(1)))")
endif endif
pysh = python3 <(printf "$(call create_string,$($(1)))") pysh = python3 <(printf "$(call create_string,$($(1)))")

View file

@ -1,13 +1,8 @@
#% include 'header.mk' %# #% include 'header.mk' %#
#% include 'config.mk' %# #% include 'config.mk' %#
#% include 'builtins.mk' %# #% include 'builtins.mk' %#
#% include 'runners.mk' %# #% include 'runners.mk' %#
# ---- [python scripts] ---- # # ---- [python scripts] ---- #
#%- for script in py_scripts %#
#% for script in py_scripts %#
##- script -## ##- script -##
#% endfor %# #%- endfor %#

View file

@ -8,7 +8,7 @@ import os
vars = "$2".split() vars = "$2".split()
length = max((len(v) for v in vars)) length = max((len(v) for v in vars))
print(f"{ansi.$(HEADER_COLOR)}vars:{ansi.end}\n") print(f"{ansi.$(HEADER_STYLE)}vars:{ansi.end}\n")
for v in vars: for v in vars:
print(f" {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}") print(f" {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}")

205
task.mk
View file

@ -1,89 +1,66 @@
# }> [github.com/daylinmorgan/task.mk] <{ # # }> [github.com/daylinmorgan/task.mk] <{ #
# Copyright (c) 2022 Daylin Morgan # Copyright (c) 2022 Daylin Morgan
# MIT License # MIT License
# version: v22.9.14-4-gde1bc7e-dev # version: v22.9.14-13-gd2a239d-dev
# #
# task.mk should be included at the bottom of your Makefile with `-include .task.mk` # 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. # See below for the standard configuration options that should be set prior to including this file.
# You can update your .task.mk with `make _update-task.mk` # You can update your .task.mk with `make _update-task.mk`
# ---- [config] ---- #
# ---- CONFIG ---- # HEADER_STYLE ?= b_cyan
HEADER_COLOR ?= b_cyan ACCENT_STYLE ?= b_yellow
PARAMS_COLOR ?= b_magenta PARAMS_STYLE ?= $(ACCENT_STYLE)
ACCENT_COLOR ?= b_yellow GOAL_STYLE ?= $(ACCENT_STYLE)
GOAL_COLOR ?= $(ACCENT_COLOR) MSG_STYLE ?= faint
MSG_COLOR ?= faint DIVIDER_STYLE ?= default
DIVIDER_COLOR ?= default
DIVIDER ?= DIVIDER ?=
HELP_SEP ?= HELP_SEP ?=
# python f-string literals # python f-string literals
EPILOG ?= EPILOG ?=
define USAGE ?= USAGE ?={ansi.$(HEADER_STYLE)}usage{ansi.end}:\n make <recipe>
{ansi.$(HEADER_COLOR)}usage{ansi.end}:
make <recipe>
endef
# ---- [buitlin recipes] ---- # # ---- [buitlin recipes] ---- #
## h, help | show this help ## h, help | show this help
.PHONY: help h .PHONY: help h
help h: help h:
$(call py,help_py) $(call py,help_py)
.PHONY: _help .PHONY: _help
_help: export SHOW_HIDDEN=true _help: export SHOW_HIDDEN=true
_help: help _help: help
ifdef PRINT_VARS ifdef PRINT_VARS
$(foreach v,$(PRINT_VARS),$(eval export $(v))) $(foreach v,$(PRINT_VARS),$(eval export $(v)))
.PHONY: vars v .PHONY: vars v
vars v: vars v:
$(call py,vars_py,$(PRINT_VARS)) $(call py,vars_py,$(PRINT_VARS))
endif endif
### | args: -ws --hidden ### | args: -ws --hidden
### task.mk builtins: | args: -d --hidden ### task.mk builtins: | args: -d --hidden
## _print-ansi | show all possible ansi color code combinations ## _print-ansi | show all possible ansi color code combinations
.PHONY: .PHONY:
_print-ansi: _print-ansi:
$(call py,print_ansi_py) $(call py,print_ansi_py)
# functions to take f-string literals and pass to python print # functions to take f-string literals and pass to python print
tprint = $(call py,info_py,$(1)) tprint = $(call py,info_py,$(1))
tprint-sh = $(call pysh,info_py,$(1)) tprint-sh = $(call pysh,info_py,$(1))
tconfirm = $(call py,confirm_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: _update-task.mk:
$(call tprint,{a.b_cyan}Updating task.mk{a.end}) $(call tprint,{a.b_cyan}Updating task.mk{a.end})
curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
export MAKEFILE_LIST export MAKEFILE_LIST
# ---- [python/bash script runner] ---- # # ---- [python/bash script runner] ---- #
# modified from https://unix.stackexchange.com/a/223093
define \n define \n
endef endef
escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1)))) escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1))))
escape_printf = $(subst \,\\,$(subst %,%%,$1)) escape_printf = $(subst \,\\,$(subst %,%%,$1))
create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1))) create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1)))
printline = printf -- "<----------------------------------->\n"
ifdef DEBUG ifdef DEBUG
define _debug_runner define _debug_runner
@printf "$(1) Script:\n" @printf "$(1) Script:\n";$(printline);
@printf -- "<----------------------------------->\n" @printf "$(call create_string,$(3))\n" | cat -n
@printf "$(call create_string,$(3))\n" @$(printline)
@printf -- "<----------------------------------->\n"
@printf "$(call create_string,$(3))" | $(2) @printf "$(call create_string,$(3))" | $(2)
endef endef
py = $(call _debug_runner,Python,python3,$($(1))) py = $(call _debug_runner,Python,python3,$($(1)))
@ -92,50 +69,33 @@ else
py = @python3 <(printf "$(call create_string,$($(1)))") py = @python3 <(printf "$(call create_string,$($(1)))")
tbash = @bash <(printf "$(call create_string,$($(1)))") tbash = @bash <(printf "$(call create_string,$($(1)))")
endif endif
pysh = python3 <(printf "$(call create_string,$($(1)))") pysh = python3 <(printf "$(call create_string,$($(1)))")
# ---- [python scripts] ---- # # ---- [python scripts] ---- #
define help_py define help_py
import argparse import argparse
from collections import namedtuple from collections import namedtuple
import os import os
import re import re
from typing import Any
$(ansi_py) $(ansi_py)
ansi: Any
MaxLens = namedtuple("MaxLens", "goal msg") MaxLens = namedtuple("MaxLens", "goal msg")
# double dollar signs to prevent make escaping them
pattern = re.compile( pattern = re.compile(
r"^## (?P<goal>.*) \| (?P<msg>.*)|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<args>.*?))?$$" r"^## (?P<goal>.*?) \| (?P<msg>.*?)(?:\s?\| args: (?P<msgargs>.*?))?$$|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<rawargs>.*?))?$$"
) )
def parseargs(argstring):
def rawargs(argstring):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--align") parser.add_argument("--align")
parser.add_argument("-d", "--divider", action="store_true") parser.add_argument("-d", "--divider", action="store_true")
parser.add_argument("-ws", "--whitespace", action="store_true") parser.add_argument("-ws", "--whitespace", action="store_true")
parser.add_argument("-ms", "--msg-style", type=str) parser.add_argument("-ms", "--msg-style", type=str)
parser.add_argument("--hidden",action="store_true") parser.add_argument("-gs", "--goal-style", type=str)
parser.add_argument("--hidden", action="store_true")
return parser.parse_args(argstring.split()) return parser.parse_args(argstring.split())
def gen_makefile(): def gen_makefile():
makefile = "" makefile = ""
for file in os.getenv("MAKEFILE_LIST").split(): for file in os.getenv("MAKEFILE_LIST").split():
with open(file, "r") as f: with open(file, "r") as f:
makefile += f.read() + "\n\n" makefile += f.read() + "\n\n"
return makefile return makefile
def parse_make(file): def parse_make(file):
for line in file.splitlines(): for line in file.splitlines():
match = pattern.search(line) match = pattern.search(line)
@ -146,67 +106,62 @@ def parse_make(file):
pass pass
else: else:
yield {k: v for k, v in match.groupdict().items() if v is not None} yield {k: v for k, v in match.groupdict().items() if v is not None}
def fmt_goal(goal, msg, max_goal_len, argstr):
args = parseargs(argstr)
def print_goal(goal, msg, max_goal_len): goal_style = args.goal_style.strip() if args.goal_style else "$(GOAL_STYLE)"
print( msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
ansi.style(f" {goal:>{max_goal_len}}", "$(GOAL_COLOR)") return (
ansi.style(f" {goal:>{max_goal_len}}", goal_style)
+ " $(HELP_SEP) " + " $(HELP_SEP) "
+ ansi.style(msg, "$(MSG_COLOR)") + ansi.style(msg, msg_style)
) )
def fmt_rawmsg(msg, argstr, maxlens):
args = parseargs(argstr)
def print_rawmsg(msg, argstr, maxlens): lines = []
args = rawargs(argstr) msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
msg_style = args.msg_style if args.msg_style else "$(MSG_COLOR)"
if not os.getenv("SHOW_HIDDEN") and args.hidden: if not os.getenv("SHOW_HIDDEN") and args.hidden:
return return []
if msg: if msg:
if args.align == "sep": if args.align == "sep":
print( lines.append(
f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}" f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}"
) )
elif args.align == "center": elif args.align == "center":
print(f" {ansi.style(msg.center(sum(maxlens)),msg_style)}") lines.append(f" {ansi.style(msg.center(sum(maxlens)),msg_style)}")
else: else:
print(f" {ansi.style(msg,msg_style)}") lines.append(f" {ansi.style(msg,msg_style)}")
if args.divider: if args.divider:
print( lines.append(
ansi.style( ansi.style(
f" {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}", f" {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}",
"$(DIVIDER_COLOR)", "$(DIVIDER_STYLE)",
) )
) )
if args.whitespace: if args.whitespace:
print() lines.append("\n")
return lines
def print_help(): def print_help():
print(f"""$(USAGE)""") lines = [f"""$(USAGE)"""]
items = list(parse_make(gen_makefile())) items = list(parse_make(gen_makefile()))
maxlens = MaxLens( maxlens = MaxLens(
*(max((len(item[x]) for item in items if x in item)) 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: for item in items:
if "goal" in item: if "goal" in item:
print_goal(item["goal"], item["msg"], maxlens.goal) lines.append(
fmt_goal(
item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
)
)
if "rawmsg" in item: if "rawmsg" in item:
print_rawmsg(item["rawmsg"], item.get("args", ""), maxlens) lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
lines.append(f"""$(EPILOG)""")
print(f"""$(EPILOG)""") print("\n".join(lines))
print_help() print_help()
endef endef
define ansi_py define ansi_py
import os import os
import sys import sys
color2byte = dict( color2byte = dict(
black=0, black=0,
red=1, red=1,
@ -217,47 +172,35 @@ color2byte = dict(
cyan=6, cyan=6,
white=7, white=7,
) )
state2byte = dict( state2byte = dict(
bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9 bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9
) )
addfg = lambda byte: byte + 30
addbg = lambda byte: byte + 40
def fg(byte):
return 30 + byte
def bg(byte):
return 40 + byte
class Ansi: class Ansi:
"""ANSI color codes""" """ANSI escape codes"""
def __init__(self): def __init__(self):
self.setcode("end", "\033[0m") self.setcode("end", "\033[0m")
self.setcode("default", "\033[38m") self.setcode("default", "\033[38m")
self.setcode("bg_default", "\033[48m") self.setcode("bg_default", "\033[48m")
for name, byte in color2byte.items(): for name, byte in color2byte.items():
self.setcode(name, f"\033[{fg(byte)}m") self.setcode(name, f"\033[{addfg(byte)}m")
self.setcode(f"b_{name}", f"\033[1;{fg(byte)}m") self.setcode(f"b_{name}", f"\033[1;{addfg(byte)}m")
self.setcode(f"d_{name}", f"\033[2;{fg(byte)}m") self.setcode(f"d_{name}", f"\033[2;{addfg(byte)}m")
for bgname, bgbyte in color2byte.items(): for bgname, bgbyte in color2byte.items():
self.setcode(f"{name}_on_{bgname}", f"\033[{bg(bgbyte)};{fg(byte)}m") self.setcode(
f"{name}_on_{bgname}", f"\033[{addbg(bgbyte)};{addfg(byte)}m"
)
for name, byte in state2byte.items(): for name, byte in state2byte.items():
self.setcode(name, f"\033[{byte}m") self.setcode(name, f"\033[{byte}m")
def setcode(self, name, escape_code): def setcode(self, name, escape_code):
"""create attr for style and escape code""" """create attr for style and escape code"""
if not sys.stdout.isatty() or os.getenv("NO_COLOR", False): if not sys.stdout.isatty() or os.getenv("NO_COLOR", False):
setattr(self, name, "") setattr(self, name, "")
else: else:
setattr(self, name, escape_code) setattr(self, name, escape_code)
def custom(self, fg=None, bg=None): def custom(self, fg=None, bg=None):
"""use custom color""" """use custom color"""
code, end = "\033[", "m" code, end = "\033[", "m"
if fg: if fg:
if isinstance(fg, int): if isinstance(fg, int):
@ -269,7 +212,6 @@ class Ansi:
else: else:
print("Expected one or three values for fg as a list") print("Expected one or three values for fg as a list")
sys.exit(1) 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}"
@ -280,64 +222,42 @@ class Ansi:
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 style(self, text, style): def style(self, text, style):
if style not in self.__dict__: if style not in self.__dict__:
print(f"unknown style {style}") print(f"unknown style: {style}")
sys.exit(1) sys.exit(1)
else: else:
return f"{self.__dict__[style]}{text}{self.__dict__['end']}" return f"{self.__dict__[style]}{text}{self.__dict__['end']}"
a = ansi = Ansi() a = ansi = Ansi()
endef endef
define info_py define info_py
$(ansi_py) $(ansi_py)
print(f"""$(2)""") print(f"""$(2)""")
endef endef
define print_ansi_py define print_ansi_py
$(ansi_py) $(ansi_py)
codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__} codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__}
for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)): for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)):
print("{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(codes_names[code], code + "******" + ansi.end,repr(code))) print(
"{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(
codes_names[code], code + "******" + ansi.end, repr(code)
)
)
endef endef
define vars_py define vars_py
import os import os
$(ansi_py) $(ansi_py)
vars = "$2".split() vars = "$2".split()
length = max((len(v) for v in vars)) length = max((len(v) for v in vars))
print(f"{ansi.$(HEADER_STYLE)}vars:{ansi.end}\n")
print(f"{ansi.$(HEADER_COLOR)}vars:{ansi.end}\n")
for v in vars: for v in vars:
print(f" {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}") print(f" {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}")
print() print()
endef endef
define confirm_py define confirm_py
import sys import sys
$(ansi_py) $(ansi_py)
def confirm(): def confirm():
""" """
Ask user to enter Y or N (case-insensitive). Ask user to enter Y or N (case-insensitive).
@ -348,11 +268,8 @@ def confirm():
while answer not in ["y", "n"]: while answer not in ["y", "n"]:
answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower() answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower()
return answer == "y" return answer == "y"
if confirm(): if confirm():
sys.exit(0) sys.exit(0)
else: else:
sys.exit(1) sys.exit(1)
endef endef