From 138809ebeb5023596be774cbdd1cc18210bce2b3 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Tue, 30 May 2023 16:15:36 -0500 Subject: [PATCH] refactor: modify standalone output --- examples/black | 63 +++++++++++++++++++++----------------------------- src/viv/viv.py | 28 +++++++++++----------- 2 files changed, 39 insertions(+), 52 deletions(-) diff --git a/examples/black b/examples/black index b4ceb9d..670d18c 100755 --- a/examples/black +++ b/examples/black @@ -1,43 +1,32 @@ #!/usr/bin/env python3 - - -# <<<<< auto-generated by viv (v23.5a2-2-gebb657c-dev) -# see `python3 <(curl -fsSL gh.dayl.in/viv/viv.py) --help` -# fmt: off -def _viv_use(*pkgs, track_exe=False, name=""): # noqa - T,F=True,False;i,s,m,e,spec=__import__,str,map,lambda x: T if x else F,[*pkgs] # noqa - if not {*m(type,pkgs)}=={s}: raise ValueError(f"spec: {pkgs} is invalid") # noqa - ge,sys,P,ew=i("os").getenv,i("sys"),i("pathlib").Path,i("sys").stderr.write # noqa - (cache:=(P(ge("XDG_CACHE_HOME",P.home()/".cache"))/"viv"/"venvs")).mkdir(parents=T,exist_ok=T) # noqa - ((sha256:=i("hashlib").sha256()).update((s(spec)+ # noqa - (((exe:=("N/A",s(P(i("sys").executable).resolve()))[e(track_exe)])))).encode())) # noqa - if ((env:=cache/(name if name else (_id:=sha256.hexdigest()))) # noqa - not in cache.glob("*/")) or ge("VIV_FORCE"): # noqa - v=e(ge("VIV_VERBOSE"));ew(f"generating new vivenv -> {env.name}\n") # noqa - i("venv").EnvBuilder(with_pip=T,clear=T).create(env) # noqa - with (env/"pip.conf").open("w") as f:f.write("[global]\ndisable-pip-version-check=true") # noqa - if (p:=i("subprocess").run([env/"bin"/"pip","install","--force-reinstall",*spec],text=True, # noqa - stdout=(-1,None)[v],stderr=(-2,None)[v])).returncode!=0: # noqa - if env.is_dir():i("shutil").rmtree(env) # noqa - ew(f"pip had non zero exit ({p.returncode})\n{p.stdout}\n");sys.exit(p.returncode) # noqa - with (env/"viv-info.json").open("w") as f: # noqa - i("json").dump({"created":s(i("datetime").datetime.today()), # noqa - "id":_id,"spec":spec,"exe":exe},f) # noqa - sys.path = [p for p in (*sys.path,s(*(env/"lib").glob("py*/si*"))) if p!=i("site").USER_SITE] # noqa - return env # noqa -# fmt: on -# >>>>> code golfed with <3 - +def _viv_use(*pkgs, track_exe=False, name=""): + T,F,N=True,False,None;i,s,m,spec=__import__,str,map,[*pkgs] + e,w=lambda x: T if x else F,lambda p,t: p.write_text(t) + 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 + (cache:=(P(ge("XDG_CACHE_HOME",P.home()/".cache"))/"viv"/"venvs")).mkdir(parents=T,exist_ok=T) + ((sha256:=i("hashlib").sha256()).update((s(spec)+ + (((exe:=("N/A",s(P(i("sys").executable).resolve()))[e(track_exe)])))).encode())) + if {env:=cache/(((_id:=sha256.hexdigest()),name)[e(name)])}-{*cache.glob("*/")} or ge("VIV_FORCE"): + v=e(ge("VIV_VERBOSE"));ew(f"generating new vivenv -> {env.name} +") + i("venv").EnvBuilder(with_pip=T,clear=T).create(env) + w(env/"pip.conf","[global] +disable-pip-version-check=true") + if (rc:=(p:=i("subprocess").run([env/"bin"/"pip","install","--force-reinstall",*spec],text=T, + stdout=(-1,N)[v],stderr=(-2,N)[v])).returncode)!=0: + if env.is_dir():i("shutil").rmtree(env) + ew(f"pip had non zero exit ({rc}) +{p.stdout} +");sys.exit(rc) + w(env/"viv-info.json",i("json").dumps( + {"created":s(i("datetime").datetime.today()),"id":_id,"spec":spec,"exe":exe})) + sys.path=[p for p in (*sys.path,s(*(env/"lib").glob("py*/si*")))if p!=i("site").USER_SITE] + return env import subprocess import sys if __name__ == "__main__": - vivenv = _viv_use( - "black==23.3.0", - "click==8.1.3", - "mypy-extensions==1.0.0", - "packaging==23.1", - "pathspec==0.11.1", - "platformdirs==3.5.1", - ) + vivenv = _viv_use("black==23.3.0", "click==8.1.3", "mypy-extensions==1.0.0", "packaging==23.1", + "pathspec==0.11.1", "platformdirs==3.5.1") sys.exit(subprocess.run([vivenv / "bin" / "black", *sys.argv[1:]]).returncode) diff --git a/src/viv/viv.py b/src/viv/viv.py index 889943d..4b8b8df 100755 --- a/src/viv/viv.py +++ b/src/viv/viv.py @@ -339,28 +339,26 @@ to create/activate a vivenv: - from command line: `{a.style("viv -h","bold")}` - within python script: {a.style('__import__("viv").use("typer", "rich-click")','bold')} """ - - _standalone_func = r"""def _viv_use(*pkgs, track_exe=False, name=""): - T,F=True,False;i,s,m,e,spec=__import__,str,map,lambda x: T if x else F,[*pkgs] + _standalone_func = """def _viv_use(*pkgs, track_exe=False, name=""): + T,F,N=True,False,None;i,s,m,spec=__import__,str,map,[*pkgs] + e,w=lambda x: T if x else F,lambda p,t: p.write_text(t) 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 (cache:=(P(ge("XDG_CACHE_HOME",P.home()/".cache"))/"viv"/"venvs")).mkdir(parents=T,exist_ok=T) ((sha256:=i("hashlib").sha256()).update((s(spec)+ (((exe:=("N/A",s(P(i("sys").executable).resolve()))[e(track_exe)])))).encode())) - if ((env:=cache/(name if name else (_id:=sha256.hexdigest()))) - not in cache.glob("*/")) or ge("VIV_FORCE"): + if {env:=cache/(((_id:=sha256.hexdigest()),name)[e(name)])}-{*cache.glob("*/")} or ge("VIV_FORCE"): v=e(ge("VIV_VERBOSE"));ew(f"generating new vivenv -> {env.name}\n") i("venv").EnvBuilder(with_pip=T,clear=T).create(env) - with (env/"pip.conf").open("w") as f:f.write("[global]\ndisable-pip-version-check=true") - if (p:=i("subprocess").run([env/"bin"/"pip","install","--force-reinstall",*spec],text=True, - stdout=(-1,None)[v],stderr=(-2,None)[v])).returncode!=0: + w(env/"pip.conf","[global]\ndisable-pip-version-check=true") + if (rc:=(p:=i("subprocess").run([env/"bin"/"pip","install","--force-reinstall",*spec],text=T, + stdout=(-1,N)[v],stderr=(-2,N)[v])).returncode)!=0: if env.is_dir():i("shutil").rmtree(env) - ew(f"pip had non zero exit ({p.returncode})\n{p.stdout}\n");sys.exit(p.returncode) - with (env/"viv-info.json").open("w") as 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] - return env""" # noqa + ew(f"pip had non zero exit ({rc})\n{p.stdout}\n");sys.exit(rc) + w(env/"viv-info.json",i("json").dumps( + {"created":s(i("datetime").datetime.today()),"id":_id,"spec":spec,"exe":exe})) + sys.path=[p for p in (*sys.path,s(*(env/"lib").glob("py*/si*")))if p!=i("site").USER_SITE] + return env""" # noqa def noqa(self, txt: str) -> str: max_length = max(map(len, txt.splitlines())) @@ -371,7 +369,7 @@ to create/activate a vivenv: if standalone: return f"""_viv_use({fill(spec_str,width=90,subsequent_indent=" ",)})""" else: - return f"""__import("viv").use({spec_str})""" + return f"""__import__("viv").use({spec_str})""" def standalone(self, spec: List[str]) -> str: func_use = self.noqa(