Add git and bettercli

Author: martindurant

pyproject.toml

@@ -25,7 +25,8 @@ classifiers = [
 dependencies = [
     "fsspec>=2025.5.1",
     "pyyaml",
-    "toml"
+    "toml",
+    "click"
 ]
 
 [project.optional-dependencies]

src/projspec/__main__.py

@@ -1,18 +1,24 @@
 #!/usr/bin/env python
 """Simple example executable for this library"""
 
-import os
-import sys
+import click
 
 import projspec.proj
 
 
-def main():
-    if len(sys.argv) > 1:
-        path = sys.argv[1]
+@click.command()
+@click.option(
+    "--types",
+    default="ALL",
+    help='Type names to scan for (comma-separated list in camel or snake case); defaults to "ALL"',
+)
+@click.argument("path", default=".")
+def main(path, types):
+    if types in {"ALL", ""}:
+        types = None
     else:
-        path = os.getcwd()
-    proj = projspec.Project(path)
+        types = types.split(",")
+    proj = projspec.Project(path, types=types)
     print(proj)
 
 

src/projspec/content/vcs.py

@@ -1,7 +1,9 @@
 from .base import Project, ProjectSpec
 from .conda_package import CondaRecipe, RattlerRecipe
 from .conda_project import CondaProject
+from .git import GitRepo
 from .pixi import Pixi
+from .poetry import PoetryProject
 from .pyscript import PyScriptSpec
 from .python_code import PythonCode, PythonLibrary
 from .uv import UVProject
@@ -11,6 +13,8 @@
     "ProjectSpec",
     "CondaRecipe",
     "CondaProject",
+    "GitRepo",
+    "PoetryProject",
     "RattlerRecipe",
     "Pixi",
     "PyScriptSpec",

src/projspec/proj/__init__.py

@@ -24,36 +24,47 @@ def __init__(
         storage_options: dict | None = None,
         fs: fsspec.AbstractFileSystem | None = None,
         walk: bool | None = None,
+        types: set[str] | None = None,
     ):
         if fs is None:
             fs, path = fsspec.url_to_fs(path, **(storage_options or {}))
         self.fs = fs
         self.url = path
         self.specs = {}
         self.children = {}
-        self.resolve(walk=walk)
+        self.resolve(walk=walk, types=types)
 
     def is_local(self) -> bool:
         """Did we read this from the local filesystem"""
         # see also fsspec.utils.can_be_local for more flexibility with caching.
         return isinstance(self.fs, fsspec.implementations.local.LocalFileSystem)
 
-    def resolve(self, subpath: str = "", walk: bool | None = None) -> None:
+    def resolve(
+        self,
+        subpath: str = "",
+        walk: bool | None = None,
+        types: set[str] | None = None,
+    ) -> None:
         """Fill out project specs in this directory
 
         :param subpath: find specs at the given subpath
         :param walk: if None (default) only try subdirectories if root has
             no specs, and don't descend further. If True, recurse all directories;
             if False don't descend at all.
+        :param types: names of types to allow while parsing. If empty or None, allow all
         """
         fullpath = "/".join([self.url, subpath]) if subpath else self.url
         # sorting to ensure consistency
         for cls in sorted(registry, key=str):
             try:
                 logger.debug("resolving %s as %s", fullpath, cls)
+                name = cls.__name__
+                snake_name = camel_to_snake(cls.__name__)
+                if types and name not in types and snake_name not in types:
+                    continue
                 inst = cls(self)
                 inst.parse()
-                self.specs[camel_to_snake(cls.__name__)] = inst
+                self.specs[snake_name] = inst
             except ValueError:
                 logger.debug("failed")
             except Exception as e:
@@ -71,6 +82,7 @@ def resolve(self, subpath: str = "", walk: bool | None = None) -> None:
                         fileinfo["name"],
                         fs=self.fs,
                         walk=walk or False,
+                        types=types,
                     )
                     if proj2.specs:
                         self.children[sub] = proj2
@@ -163,8 +175,8 @@ class ProjectSpec:
     def __init__(self, root: Project, subpath: str = ""):
         self.root = root
         self.subpath = subpath  # not used yet
-        self._contents = None
-        self._artifacts = None
+        self._contents = AttrDict()
+        self._artifacts = AttrDict()
         if not self.match():
             raise ValueError(f"Not a {type(self).__name__}")
 

src/projspec/proj/base.py

@@ -0,0 +1,30 @@
+from projspec.proj.base import ProjectSpec
+from projspec.utils import AttrDict
+
+
+class GitRepo(ProjectSpec):
+    def match(self) -> bool:
+        basenames = [_.rsplit("/", 1)[-1] for _ in self.root.filelist]
+        return ".git" in basenames
+
+    def parse(self) -> None:
+        cont = AttrDict()
+        cont["remotes"] = [
+            _.rsplit("/", 1)[-1]
+            for _ in self.root.fs.ls(
+                f"{self.root.url}/.git/refs/remotes", detail=False
+            )
+        ]
+        cont["tags"] = [
+            _.rsplit("/", 1)[-1]
+            for _ in self.root.fs.ls(
+                f"{self.root.url}/.git/refs/tags", detail=False
+            )
+        ]
+        cont["branches"] = [
+            _.rsplit("/", 1)[-1]
+            for _ in self.root.fs.ls(
+                f"{self.root.url}/.git/refs/heads", detail=False
+            )
+        ]
+        self._contents = cont

src/projspec/proj/git.py

@@ -5,4 +5,13 @@ class PoetryProject(ProjectSpec):
     spec_doc = "https://python-poetry.org/docs/pyproject/"
 
     def match(self) -> bool:
-        return "poetry" in self.root.metadata.get("tool")
+        back = (
+            self.root.pyproject.get("build_system", {})
+            .get("build-backend", "")
+            .startswith("poetry.")
+        )
+        return "poetry" in self.root.pyproject.get("tool") or back
+
+    def parse(self) -> None:
+        # essentially the same as PythonLibrary?
+        pass

src/projspec/proj/poetry.py

@@ -8,6 +8,9 @@ class PyScriptSpec(ProjectSpec):
     spec_doc = "https://docs.pyscript.net/2023.11.2/user-guide/configuration/"
 
     def match(self) -> bool:
+        # actually, config can be specified by a local path in the repo, but this is rare;
+        # also you can just declare things to install as you go, which we won't be able to
+        # guess.
         basenames = [_.rsplit("/", 1)[-1] for _ in self.root.filelist]
         return "pyscript.toml" in basenames or "pyscript.json" in basenames