mirror of
https://github.com/daylinmorgan/viv.git
synced 2024-09-20 12:07:18 -05:00
Compare commits
7 commits
6e940fc594
...
ed109d65a4
Author | SHA1 | Date | |
---|---|---|---|
ed109d65a4 | |||
f87aab9ddd | |||
417c8dd4d0 | |||
b97b4f7894 | |||
9e622879d0 | |||
3b9c2e64ca | |||
f1b2b14316 |
1 changed files with 62 additions and 119 deletions
181
src/viv/viv.py
181
src/viv/viv.py
|
@ -51,7 +51,7 @@ from typing import (
|
||||||
Generator,
|
Generator,
|
||||||
)
|
)
|
||||||
|
|
||||||
__version__ = "22.12a3-48-g30cb4b5-dev"
|
__version__ = "22.12a3-48-gf87aab9-dev"
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
|
@ -61,16 +61,9 @@ class Config:
|
||||||
venvcache: Path = (
|
venvcache: Path = (
|
||||||
Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) / "viv" / "venvs"
|
Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) / "viv" / "venvs"
|
||||||
)
|
)
|
||||||
srccache: Path = (
|
|
||||||
Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) / "viv" / "src"
|
|
||||||
)
|
|
||||||
|
|
||||||
def __post_init__(self) -> None:
|
def __post_init__(self) -> None:
|
||||||
self.venvcache.mkdir(parents=True, exist_ok=True)
|
self.venvcache.mkdir(parents=True, exist_ok=True)
|
||||||
self.srccache.mkdir(
|
|
||||||
parents=True,
|
|
||||||
exist_ok=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
c = Config()
|
c = Config()
|
||||||
|
@ -535,7 +528,8 @@ STANDALONE_TEMPLATE = r"""
|
||||||
# >>>>> code golfed with <3
|
# >>>>> code golfed with <3
|
||||||
""" # noqa
|
""" # noqa
|
||||||
|
|
||||||
STANDALONE_TEMPLATE_USE = r"""def _viv_use(*pkgs: str, track_exe: bool = False, name: str = "") -> None:
|
STANDALONE_TEMPLATE_USE = r"""
|
||||||
|
def _viv_use(*pkgs: str, track_exe: bool = False, name: str = "") -> None:
|
||||||
i,s,m,e,spec=__import__,str,map,lambda x: True if x else False,[*pkgs]
|
i,s,m,e,spec=__import__,str,map,lambda x: True if x else False,[*pkgs]
|
||||||
if not {{*m(type,pkgs)}}=={{s}}: raise ValueError(f"spec: {{pkgs}} is invalid")
|
if not {{*m(type,pkgs)}}=={{s}}: raise ValueError(f"spec: {{pkgs}} is invalid")
|
||||||
ge,sys,P,ew=i("os").getenv,i("sys"),i("pathlib").Path,i("sys").stderr.write
|
ge,sys,P,ew=i("os").getenv,i("sys"),i("pathlib").Path,i("sys").stderr.write
|
||||||
|
@ -554,19 +548,14 @@ STANDALONE_TEMPLATE_USE = r"""def _viv_use(*pkgs: str, track_exe: bool = False,
|
||||||
i("json").dump({{"created":s(i("datetime").datetime.today()),"id":_id,"spec":spec,"exe":exe}},f)
|
i("json").dump({{"created":s(i("datetime").datetime.today()),"id":_id,"spec":spec,"exe":exe}},f)
|
||||||
sys.path = [p for p in (*sys.path,s(*(env/"lib").glob("py*/si*"))) if p!=i("site").USER_SITE]
|
sys.path = [p for p in (*sys.path,s(*(env/"lib").glob("py*/si*"))) if p!=i("site").USER_SITE]
|
||||||
_viv_use({spec})
|
_viv_use({spec})
|
||||||
""" # noqa
|
"""[ # noqa
|
||||||
|
1:
|
||||||
|
]
|
||||||
|
|
||||||
SHOW_TEMPLATE = f"""
|
SHOW_TEMPLATE = f"""\
|
||||||
{a.style('Version', 'bold')}: {{version}}
|
{a.style('Version', 'bold')}: {{version}}
|
||||||
{a.style('CLI', 'bold')}: {{cli}}
|
{a.style('CLI', 'bold')}: {{cli}}
|
||||||
{a.style('Current Source', 'bold')}: {{src}}
|
{a.style('Source File', 'bold')}: {{src}}
|
||||||
"""
|
|
||||||
|
|
||||||
INSTALL_TEMPLATE = f"""
|
|
||||||
|
|
||||||
Install viv.py to {a.bold}{{src_location}}{a.end}
|
|
||||||
Symlink {a.bold}{{src_location}}{a.end} to {a.bold}{{cli_location}}{a.end}
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
@ -721,7 +710,7 @@ class CustomHelpFormatter(RawDescriptionHelpFormatter, HelpFormatter):
|
||||||
# determine the required width and the entry label
|
# determine the required width and the entry label
|
||||||
help_position = min(self._action_max_length + 2, self._max_help_position)
|
help_position = min(self._action_max_length + 2, self._max_help_position)
|
||||||
help_width = max(self._width - help_position, 11)
|
help_width = max(self._width - help_position, 11)
|
||||||
action_width = help_position - self._current_indent
|
action_width = help_position - self._current_indent - 2
|
||||||
action_header = self._format_action_invocation(action)
|
action_header = self._format_action_invocation(action)
|
||||||
action_header_len = len(a.escape(action_header))
|
action_header_len = len(a.escape(action_header))
|
||||||
|
|
||||||
|
@ -793,8 +782,7 @@ class ArgumentParser(StdArgParser):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
self.formatter_class = lambda prog: CustomHelpFormatter(
|
self.formatter_class = lambda prog: CustomHelpFormatter(
|
||||||
prog,
|
prog, max_help_position=35
|
||||||
max_help_position=35,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def error(self, message: str) -> NoReturn:
|
def error(self, message: str) -> NoReturn:
|
||||||
|
@ -816,43 +804,9 @@ within python script:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
def fetch_source(reference: str) -> str:
|
|
||||||
try:
|
|
||||||
r = urlopen(
|
|
||||||
"https://raw.githubusercontent.com/daylinmorgan/viv/"
|
|
||||||
+ reference
|
|
||||||
+ "/src/viv/viv.py"
|
|
||||||
)
|
|
||||||
except HTTPError as e:
|
|
||||||
error(
|
|
||||||
"Issue updating viv see below:"
|
|
||||||
+ a.style("-> ", "red").join(["\n"] + repr(e).splitlines())
|
|
||||||
)
|
|
||||||
if "404" in repr(e):
|
|
||||||
echo("Please check your reference is valid.", style="red")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
src = r.read()
|
|
||||||
(hash := hashlib.sha256()).update(src)
|
|
||||||
sha256 = hash.hexdigest()
|
|
||||||
|
|
||||||
cached_src_file = c.srccache / f"{sha256}.py"
|
|
||||||
|
|
||||||
if not cached_src_file.is_file():
|
|
||||||
with cached_src_file.open("w") as f:
|
|
||||||
f.write(src.decode())
|
|
||||||
|
|
||||||
return sha256
|
|
||||||
|
|
||||||
|
|
||||||
class Viv:
|
class Viv:
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
self.vivenvs = get_venvs()
|
self.vivenvs = get_venvs()
|
||||||
self.current_source = Path(__file__).resolve()
|
|
||||||
self.local = not str(self.current_source).startswith("/proc/")
|
|
||||||
self.name = (
|
|
||||||
"python3 <(curl -fsSL gh.dayl.in/viv/viv.py)" if self.local else "viv"
|
|
||||||
)
|
|
||||||
|
|
||||||
def _match_vivenv(self, name_id: str) -> ViVenv: # type: ignore[return]
|
def _match_vivenv(self, name_id: str) -> ViVenv: # type: ignore[return]
|
||||||
# TODO: improve matching algorithm to favor names over id's
|
# TODO: improve matching algorithm to favor names over id's
|
||||||
|
@ -964,7 +918,8 @@ class Viv:
|
||||||
"""manage viv installation"""
|
"""manage viv installation"""
|
||||||
|
|
||||||
if args.cmd == "show":
|
if args.cmd == "show":
|
||||||
echo("Current:")
|
# NOTE: could reuse the table output for this?
|
||||||
|
echo("Installation Info:")
|
||||||
sys.stdout.write(
|
sys.stdout.write(
|
||||||
SHOW_TEMPLATE.format(
|
SHOW_TEMPLATE.format(
|
||||||
version=__version__,
|
version=__version__,
|
||||||
|
@ -974,66 +929,58 @@ class Viv:
|
||||||
)
|
)
|
||||||
|
|
||||||
elif args.cmd == "update":
|
elif args.cmd == "update":
|
||||||
if not self.local:
|
echo(__file__)
|
||||||
|
echo(Path(__file__))
|
||||||
|
if str(Path(__file__).resolve()).startswith("/proc/"):
|
||||||
error(
|
error(
|
||||||
a.style("viv manage update", "bold")
|
a.style("viv manage update", "bold")
|
||||||
+ " should only be used with a locally installed viv",
|
+ "should be used with a locally installed viv",
|
||||||
1,
|
1,
|
||||||
)
|
)
|
||||||
#
|
try:
|
||||||
# viv_src = fetch_source(args.reference)
|
r = urlopen(
|
||||||
#
|
"https://raw.githubusercontent.com/daylinmorgan/viv/"
|
||||||
# (hash := hashlib.sha256()).update(viv_src)
|
+ args.reference
|
||||||
# sha256 = hash.hexdigest()
|
+ "/src/viv/viv.py"
|
||||||
#
|
)
|
||||||
# (
|
except HTTPError as e:
|
||||||
# src_cache := Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache"))
|
error(
|
||||||
# / "viv"
|
"Issue updating viv see below:"
|
||||||
# / "src"
|
+ a.style("-> ", "red").join(["\n"] + repr(e).splitlines())
|
||||||
# ).mkdir(exist_ok=True, parents=True)
|
)
|
||||||
# cached_version = src_cache / f"{sha256}.py"
|
if "404" in repr(e):
|
||||||
#
|
echo("Please check your reference is valid.", style="red")
|
||||||
# if not cached_version.is_file():
|
sys.exit(1)
|
||||||
# with cached_version.open("w") as f:
|
|
||||||
# f.write(viv_src.decode())
|
|
||||||
#
|
|
||||||
sha256 = fetch_source(args.reference)
|
|
||||||
sys.path.append(str(c.srccache))
|
|
||||||
next_version = __import__(sha256).__version__
|
|
||||||
|
|
||||||
|
viv_src = r.read()
|
||||||
|
|
||||||
|
(hash := hashlib.sha256()).update(viv_src)
|
||||||
|
sha256 = hash.hexdigest()
|
||||||
|
|
||||||
|
(
|
||||||
|
src_cache := Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache"))
|
||||||
|
/ "viv"
|
||||||
|
/ "src"
|
||||||
|
).mkdir(exist_ok=True, parents=True)
|
||||||
|
cached_version = src_cache / f"{sha256}.py"
|
||||||
|
|
||||||
|
if not cached_version.is_file():
|
||||||
|
with cached_version.open("w") as f:
|
||||||
|
f.write(viv_src.decode())
|
||||||
|
|
||||||
|
sys.path.append(str(src_cache))
|
||||||
|
next_version = __import__(sha256).__version__
|
||||||
q = (
|
q = (
|
||||||
"Update source at: "
|
"Update source at: "
|
||||||
+ a.style(self.current_source, "bold")
|
+ a.style(Path(__file__).resolve(), "bold")
|
||||||
+ f" \n from version {__version__} to {next_version}?"
|
+ f" \n from version {__version__} to {next_version}?"
|
||||||
)
|
)
|
||||||
|
|
||||||
if confirm(q):
|
if confirm(q):
|
||||||
print("Holding off on the additions of this piece")
|
print("AWAY THEN")
|
||||||
|
|
||||||
elif args.cmd == "install":
|
elif args.cmd == "install":
|
||||||
if self.local:
|
echo("not yet implemented. sorry")
|
||||||
error(
|
|
||||||
a.style("viv manage install", "bold")
|
|
||||||
+ " should only be used with a remote viv",
|
|
||||||
)
|
|
||||||
echo(
|
|
||||||
"use "
|
|
||||||
+ a.style("viv manage update", "bold")
|
|
||||||
+ " to modify current installation.",
|
|
||||||
style="red",
|
|
||||||
)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
sha256 = fetch_source(args.reference)
|
|
||||||
sys.path.append(str(c.srccache))
|
|
||||||
downloaded_version = __import__(sha256).__version__
|
|
||||||
echo(f"Downloaded version: {downloaded_version}")
|
|
||||||
q = INSTALL_TEMPLATE.format(
|
|
||||||
src_location="~/.local/share/viv/viv.py", cli_location="~/bin/viv"
|
|
||||||
) + ("Would you like to perform the above " "installation steps?")
|
|
||||||
|
|
||||||
if confirm(q):
|
|
||||||
print("AWAY MAN")
|
|
||||||
|
|
||||||
def _get_subcmd_parser(
|
def _get_subcmd_parser(
|
||||||
self,
|
self,
|
||||||
|
@ -1058,7 +1005,7 @@ class Viv:
|
||||||
def cli(self) -> None:
|
def cli(self) -> None:
|
||||||
"""cli entrypoint"""
|
"""cli entrypoint"""
|
||||||
|
|
||||||
parser = ArgumentParser(prog=self.name, description=description)
|
parser = ArgumentParser(description=description)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"-V",
|
"-V",
|
||||||
"--version",
|
"--version",
|
||||||
|
@ -1071,7 +1018,10 @@ class Viv:
|
||||||
)
|
)
|
||||||
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_list = self._get_subcmd_parser(
|
||||||
|
subparsers,
|
||||||
|
"list",
|
||||||
|
)
|
||||||
|
|
||||||
p_list.add_argument(
|
p_list.add_argument(
|
||||||
"-q",
|
"-q",
|
||||||
|
@ -1153,22 +1103,15 @@ class Viv:
|
||||||
subparsers, name="manage"
|
subparsers, name="manage"
|
||||||
).add_subparsers(title="subcommand", metavar="<sub-cmd>", required=True)
|
).add_subparsers(title="subcommand", metavar="<sub-cmd>", required=True)
|
||||||
|
|
||||||
# TODO: shared parser?
|
p_manage_sub.add_parser(
|
||||||
(
|
"install",
|
||||||
p_manage_install := p_manage_sub.add_parser(
|
help="install viv",
|
||||||
"install", help="install viv", aliases="i"
|
|
||||||
)
|
|
||||||
).set_defaults(func=self.manage, cmd="install")
|
).set_defaults(func=self.manage, cmd="install")
|
||||||
p_manage_install.add_argument(
|
|
||||||
"-r",
|
|
||||||
"--reference",
|
|
||||||
help="git reference (branch/tag/commit)",
|
|
||||||
default="main",
|
|
||||||
)
|
|
||||||
|
|
||||||
(
|
(
|
||||||
p_manage_update := p_manage_sub.add_parser(
|
p_manage_update := p_manage_sub.add_parser(
|
||||||
"update", help="update viv version", aliases="u"
|
"update",
|
||||||
|
help="update viv version",
|
||||||
)
|
)
|
||||||
).set_defaults(func=self.manage, cmd="update")
|
).set_defaults(func=self.manage, cmd="update")
|
||||||
|
|
||||||
|
@ -1180,7 +1123,7 @@ class Viv:
|
||||||
)
|
)
|
||||||
|
|
||||||
p_manage_sub.add_parser(
|
p_manage_sub.add_parser(
|
||||||
"show", help="show current installation info", aliases="s"
|
"show", help="show current installation info"
|
||||||
).set_defaults(func=self.manage, cmd="show")
|
).set_defaults(func=self.manage, cmd="show")
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
Loading…
Reference in a new issue