src/viv/__init__.py

@@ -1 +1 @@
-from .viv import use, __version__  # noqa
+from .viv import use  # noqa

src/viv/viv.py

@@ -41,7 +41,6 @@ from types import TracebackType
 from typing import (
     Any,
     Dict,
-    Generator,
     List,
     NoReturn,
     Optional,
@@ -49,9 +48,10 @@ from typing import (
     TextIO,
     Tuple,
     Type,
+    Generator,
 )
 
-__version__ = "22.12a3-64-gf27cdf8-dev"
+__version__ = "22.12a3-48-g30cb4b5-dev"
 
 
 @dataclass
@@ -64,11 +64,6 @@ class Config:
     srccache: Path = (
         Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) / "viv" / "src"
     )
-    srcdefault: Path = (
-        Path(os.getenv("XDG_DATA_HOME", Path.home() / ".local" / "share"))
-        / "viv"
-        / "viv.py"
-    )
 
     def __post_init__(self) -> None:
         self.venvcache.mkdir(parents=True, exist_ok=True)
@@ -76,7 +71,6 @@ class Config:
             parents=True,
             exist_ok=True,
         )
-        self.srcdefault.parent.mkdir(parents=True, exist_ok=True)
 
 
 c = Config()
@@ -250,9 +244,6 @@ class Ansi:
         else:
             return (row,)
 
-    def viv_preamble(self, style: str = "magenta", sep: str = "::") -> str:
-        return f"{self.cyan}Viv{self.end}{self.__dict__[style]}{sep}{self.end}"
-
     def table(
         self, rows: Tuple[Tuple[str, Sequence[str]], ...], header_style: str = "cyan"
     ) -> None:
@@ -317,25 +308,20 @@ def echo(
     msg: str, style: str = "magenta", newline: bool = True, fd: TextIO = sys.stderr
 ) -> None:
     """output general message to stdout"""
-    output = f"{a.viv_preamble(style)} {msg}"
+    output = f"{a.cyan}Viv{a.end}{a.__dict__[style]}::{a.end} {msg}"
     if newline:
         output += "\n"
     fd.write(output)
 
 
-def confirm(question: str, context: str = "") -> bool:
+def confirm(question: str) -> bool:
-    sys.stderr.write(context)
-    sys.stderr.write(
-        a.viv_preamble(sep="?? ") + question + a.style(" (Y)es/(n)o: ", "yellow")
-    )
     while True:
-        ans = input().strip().lower()
+        ans = input(question + a.style(" (Y)es/(n)o: ", "yellow")).strip().lower()
         if ans in ("y", "yes"):
             return True
         elif ans in ("n", "no"):
             return False
-        sys.stdout.write("Please select (Y)es or (n)o. ")
+        sys.stdout.write("\nPlease select (Y)es or (n)o.")
-    sys.stdout.write("\n")
 
 
 def run(
@@ -573,20 +559,13 @@ _viv_use({spec})
 SHOW_TEMPLATE = f"""
   {a.style('Version', 'bold')}: {{version}}
   {a.style('CLI', 'bold')}: {{cli}}
-  {a.style('Running Source', 'bold')}: {{running_src}}
+  {a.style('Current Source', 'bold')}: {{src}}
-  {a.style('Local Source', 'bold')}: {{local_src}}
 """
 
 INSTALL_TEMPLATE = f"""
-  Install viv.py to {a.green}{{src_location}}{a.end}
-  Symlink {a.bold}{{src_location}}{a.end} to {a.bold}{{cli_location}}{a.end}
 
-"""
+  Install viv.py to {a.bold}{{src_location}}{a.end}
-
-UPDATE_TEMPLATE = f"""
-  Update source at {a.green}{{src_location}}{a.end}
   Symlink {a.bold}{{src_location}}{a.end} to {a.bold}{{cli_location}}{a.end}
-  Version {a.bold}{{local_version}}{a.end} -> {a.bold}{{next_version}}{a.end}
 
 """
 
@@ -828,9 +807,12 @@ class ArgumentParser(StdArgParser):
 description = f"""
 
 {a.tagline()}
-to create/activate a vivenv:
+
-- from command line: `{a.style("viv -h","bold")}`
+{a.style('create/activate a vivenv','underline')}
-- within python script: {a.style('__import__("viv").use("typer", "rich-click")','bold')}
+from command line:
+  `{a.style("viv -h","bold")}`
+within python script:
+  {a.style('__import__("viv").use("typer", "rich-click")','bold')}
 """
 
 
@@ -863,40 +845,13 @@ def fetch_source(reference: str) -> str:
     return sha256
 
 
-def make_executable(path: Path) -> None:
-    """apply an executable bit for all users with read access"""
-    mode = os.stat(path).st_mode
-    mode |= (mode & 0o444) >> 2  # copy R bits to X
-    os.chmod(path, mode)
-
-
 class Viv:
     def __init__(self) -> None:
         self.vivenvs = get_venvs()
-        self._get_sources()
+        self.current_source = Path(__file__).resolve()
+        self.local = not str(self.current_source).startswith("/proc/")
         self.name = (
-            "viv" if self.local else "python3 <(curl -fsSL gh.dayl.in/viv/viv.py)"
+            "python3 <(curl -fsSL gh.dayl.in/viv/viv.py)" if self.local else "viv"
-        )
-
-    def _get_sources(self) -> None:
-        self.local_source: Path | str
-        self.running_source = Path(__file__).resolve()
-        self.local = not str(self.running_source).startswith("/proc/")
-        if self.local:
-            self.local_source = self.running_source
-            self.local_version = __version__
-        else:
-            try:
-                _local_viv = __import__("viv")
-                self.local_source = (
-                    _local_viv.__file__ if _local_viv.__file__ else "Not Found"
-                )
-                self.local_version = _local_viv.__version__
-            except ImportError:
-                self.local_source = self.local_version = "Not Found"
-
-        self.git = self.local_source != "Not Found" and str(self.local_source).endswith(
-            "src/viv/__init__.py"
         )
 
     def _match_vivenv(self, name_id: str) -> ViVenv:  # type: ignore[return]
@@ -1005,26 +960,8 @@ class Viv:
 
         vivenv.dump_info()
 
-    def _install_local_src(self, sha256: str, src: Path, cli: Path) -> None:
-        echo("updating local source copy of viv")
-        shutil.copy(c.srccache / f"{sha256}.py", src)
-        make_executable(src)
-        echo("symlinking cli")
-
-        if not cli.is_file():
-            cli.symlink_to(src)
-        else:
-            cli.unlink()
-            cli.symlink_to(src)
-
-        echo("Remember to include the following line in your shell rc file:")
-        sys.stderr.write(
-            '  export PYTHONPATH="$PYTHONPATH:$HOME/'
-            f'{src.relative_to(Path.home())}"\n'
-        )
-
     def manage(self, args: Namespace) -> None:
-        """manage viv itself"""
+        """manage viv installation"""
 
         if args.cmd == "show":
             echo("Current:")
@@ -1032,55 +969,53 @@ class Viv:
                 SHOW_TEMPLATE.format(
                     version=__version__,
                     cli=shutil.which("viv"),
-                    running_src=self.running_source,
+                    src=Path(__file__).resolve(),
-                    local_src=self.local_source,
                 )
             )
 
         elif args.cmd == "update":
-            if self.local_source == "Not Found":
+            if not self.local:
                 error(
                     a.style("viv manage update", "bold")
-                    + " should be used with an exisiting installation",
+                    + " should only be used with a locally installed viv",
-                    1,
-                )
-
-            if self.git:
-                error(
-                    a.style("viv manage update", "bold")
-                    + " shouldn't be used with a git-based installation",
                     1,
                 )
+            #
+            # viv_src = fetch_source(args.reference)
+            #
+            # (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())
+            #
             sha256 = fetch_source(args.reference)
             sys.path.append(str(c.srccache))
             next_version = __import__(sha256).__version__
 
-            if self.local_version == next_version:
+            q = (
-                echo(f"no change between {args.reference} and local version")
+                "Update source at: "
-                sys.exit(0)
+                + a.style(self.current_source, "bold")
+                + f" \n from version {__version__} to {next_version}?"
+            )
 
-            if confirm(
+            if confirm(q):
-                "Would you like to perform the above installation steps?",
+                print("Holding off on the additions of this piece")
-                UPDATE_TEMPLATE.format(
-                    src_location=self.local_source,
-                    local_version=self.local_version,
-                    cli_location=args.cli,
-                    next_version=next_version,
-                ),
-            ):
-                self._install_local_src(
-                    sha256,
-                    Path(
-                        args.src
-                        if self.local_source == "Not Found"
-                        else self.local_source,
-                    ),
-                    args.cli,
-                )
 
         elif args.cmd == "install":
-            if not self.local_source == "Not Found":
+            if self.local:
-                error(f"found existing viv installation at {self.local_source}")
+                error(
+                    a.style("viv manage install", "bold")
+                    + " should only be used with a remote viv",
+                )
                 echo(
                     "use "
                     + a.style("viv manage update", "bold")
@@ -1093,18 +1028,12 @@ class Viv:
             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?")
 
-            # TODO: see if file is actually where
+            if confirm(q):
-            # we are about to install and give more instructions
+                print("AWAY MAN")
-
-            if confirm(
-                "Would you like to perform the above installation steps?",
-                INSTALL_TEMPLATE.format(
-                    src_location=args.src,
-                    cli_location=args.cli,
-                ),
-            ):
-                self._install_local_src(sha256, args.src, args.cli)
 
     def _get_subcmd_parser(
         self,
@@ -1219,43 +1148,37 @@ class Viv:
             "info",
             parents=[p_vivenv_arg],
         )
-        p_manage_shared = ArgumentParser(add_help=False)
+
-        p_manage_shared.add_argument(
+        p_manage_sub = self._get_subcmd_parser(
+            subparsers, name="manage"
+        ).add_subparsers(title="subcommand", metavar="<sub-cmd>", required=True)
+
+        # TODO: shared parser?
+        (
+            p_manage_install := p_manage_sub.add_parser(
+                "install", help="install viv", aliases="i"
+            )
+        ).set_defaults(func=self.manage, cmd="install")
+        p_manage_install.add_argument(
             "-r",
             "--reference",
             help="git reference (branch/tag/commit)",
             default="main",
         )
 
-        p_manage_shared.add_argument(
+        (
-            "-s",
+            p_manage_update := p_manage_sub.add_parser(
-            "--src",
+                "update", help="update viv version", aliases="u"
-            help="path/to/source_file",
+            )
-            default=c.srcdefault,
-        )
-        p_manage_shared.add_argument(
-            "-c",
-            "--cli",
-            help="path/to/cli (symlink to src)",
-            default=Path.home() / "bin" / "viv",
-        )
-
-        p_manage_sub = self._get_subcmd_parser(
-            subparsers,
-            name="manage",
-        ).add_subparsers(title="subcommand", metavar="<sub-cmd>", required=True)
-
-        p_manage_sub.add_parser(
-            "install", help="install viv", aliases="i", parents=[p_manage_shared]
-        ).set_defaults(func=self.manage, cmd="install")
-
-        p_manage_sub.add_parser(
-            "update",
-            help="update viv version",
-            aliases="u",
-            parents=[p_manage_shared],
         ).set_defaults(func=self.manage, cmd="update")
 
+        p_manage_update.add_argument(
+            "-r",
+            "--reference",
+            help="git reference (branch/tag/commit)",
+            default="main",
+        )
+
         p_manage_sub.add_parser(
             "show", help="show current installation info", aliases="s"
         ).set_defaults(func=self.manage, cmd="show")