daylin/task.mk
1
0
Fork 0
mirror of https://github.com/daylinmorgan/task.mk.git synced 2024-12-22 01:50:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

feat: use stderr of print function

Browse source
This commit is contained in:
Daylin Morgan 2022-10-03 16:02:30 -05:00
parent 4e57dfe0e3
commit 14b6dccbc9
6 changed files with 42 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generate.py
View file

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

4
src/builtins.mk
View file

@ -20,8 +20,8 @@ endif
_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,print_py,$(1))
tprint-sh = $(call pysh,info_py,$(1)) tprint-sh = $(call pysh,print_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:

1
src/help.py
View file

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

7
src/info.py
View file

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

7
src/print.py Normal file
View file

@ -0,0 +1,7 @@
#% 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 %#

16
task.mk
View file

@ -1,7 +1,7 @@
# }> [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: 22.9.28 # version: v22.9.28-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.
@ -42,8 +42,8 @@ endif
_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,print_py,$(1))
tprint-sh = $(call pysh,info_py,$(1)) tprint-sh = $(call pysh,print_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:
@ -240,9 +240,9 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
main() main()
endef endef
define info_py define print_py
$(utils_py) $(utils_py)
print(f"""$(2)""") sys.stderr.write(f"""$(2)\n""")
endef endef
define print_ansi_py define print_ansi_py
$(utils_py) $(utils_py)
@ -331,6 +331,9 @@ class Ansi:
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 not sys.stdout.isatty() or os.getenv("NO_COLOR", False):
return ""
else:
if fg: if fg:
if isinstance(fg, int): if isinstance(fg, int):
code += f"38;5;{fg}" code += f"38;5;{fg}"
@ -371,5 +374,6 @@ class Ansi:
return f"{self.__dict__[style]}{text}{self.__dict__['end']}" return f"{self.__dict__[style]}{text}{self.__dict__['end']}"
a = ansi = Ansi() a = ansi = Ansi()
cfg = Config( cfg = Config(
"$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""",int('$(WRAP)')) "$(DIVIDER)", "$(HELP_SEP)", f"""$(EPILOG)""", f"""$(USAGE)""", int("$(WRAP)")
)
endef endef