daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-11-14 13:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity

feat: add json output to info

Browse source
This commit is contained in:
Daylin Morgan 2023-06-01 10:12:39 -05:00
parent 1c2e5a85e4
commit 8307895fdb
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/viv/viv.py
View file

@ -50,7 +50,7 @@ from typing import (
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.request import urlopen from urllib.request import urlopen
__version__ = "23.5a4-26-g35bffae-dev" __version__ = "23.5a4-27-g1c2e5a8-dev"
class Config: class Config:
@ -1038,7 +1038,9 @@ class Viv:
if not metadata_file.is_file(): if not metadata_file.is_file():
error(f"Unable to find metadata for vivenv: {args.vivenv}", code=1) error(f"Unable to find metadata for vivenv: {args.vivenv}", code=1)
if args.json:
sys.stdout.write(json.dumps(vivenv.meta.__dict__))
else:
vivenv.tree() vivenv.tree()
def _install_local_src(self, sha256: str, src: Path, cli: Path) -> None: def _install_local_src(self, sha256: str, src: Path, cli: Path) -> None:
@ -1299,9 +1301,18 @@ class Viv:
subparsers = parser.add_subparsers( subparsers = parser.add_subparsers(
metavar="<sub-cmd>", title="subcommands", required=True metavar="<sub-cmd>", title="subcommands", required=True
) )
p_vivenv_arg = ArgumentParser(add_help=False) p_vivenv_arg = ArgumentParser(add_help=False)
p_vivenv_arg.add_argument("vivenv", help="name/hash of vivenv") p_vivenv_arg.add_argument("vivenv", help="name/hash of vivenv")
p_list = self._get_subcmd_parser(subparsers, "list")
(p_json := ArgumentParser(add_help=False)).add_argument(
"--json",
help="name:metadata json for vivenvs ",
action="store_true",
default=False,
)
p_list = self._get_subcmd_parser(subparsers, "list", parents=[p_json])
p_list.add_argument( p_list.add_argument(
"-f", "-f",
@ -1317,12 +1328,6 @@ class Viv:
action="store_true", action="store_true",
default=False, default=False,
) )
p_list.add_argument(
"--json",
help="name:metadata json for vivenvs ",
action="store_true",
default=False,
)
p_exe = self._get_subcmd_parser( p_exe = self._get_subcmd_parser(
subparsers, subparsers,
@ -1391,7 +1396,7 @@ class Viv:
self._get_subcmd_parser( self._get_subcmd_parser(
subparsers, subparsers,
"info", "info",
parents=[p_vivenv_arg], parents=[p_vivenv_arg, p_json],
) )
p_manage_shared = ArgumentParser(add_help=False) p_manage_shared = ArgumentParser(add_help=False)
p_manage_shared.add_argument( p_manage_shared.add_argument(
@ -1446,9 +1451,12 @@ class Viv:
p_manage_sub.add_parser( p_manage_sub.add_parser(
"purge", help="remove traces of viv", aliases="p", parents=[p_manage_shared] "purge", help="remove traces of viv", aliases="p", parents=[p_manage_shared]
).set_defaults(func=self.manage, cmd="purge") ).set_defaults(func=self.manage, cmd="purge")
(p_run_shim_shared := ArgumentParser(add_help=False)).add_argument(
"-b", "--bin", help="console_script/script to invoke", metavar="<bin>"
)
p_shim = self._get_subcmd_parser( p_shim = self._get_subcmd_parser(
subparsers, "shim", parents=[p_freeze_shim_shared] subparsers, "shim", parents=[p_freeze_shim_shared, p_run_shim_shared]
) )
p_shim.add_argument( p_shim.add_argument(
@ -1464,11 +1472,8 @@ class Viv:
type=Path, type=Path,
metavar="<path>", metavar="<path>",
) )
p_shim.add_argument(
"-b", "--bin", help="console_script/script to invoke", metavar="<bin>"
)
p_run = self._get_subcmd_parser(subparsers, "run") p_run = self._get_subcmd_parser(subparsers, "run", parents=[p_run_shim_shared])
p_run.add_argument( p_run.add_argument(
"-r", "-r",
@ -1484,10 +1489,6 @@ class Viv:
) )
p_run.add_argument("reqs", help="requirements specifiers", nargs="*") p_run.add_argument("reqs", help="requirements specifiers", nargs="*")
p_run.add_argument(
"-b", "--bin", help="console_script/script to invoke", metavar="<bin>"
)
if "--" in sys.argv: if "--" in sys.argv:
i = sys.argv.index("--") i = sys.argv.index("--")
args = parser.parse_args(sys.argv[1:i]) args = parser.parse_args(sys.argv[1:i])