commit: name the identifier a new GLEP 81 package allocates

A new acct-user or acct-group package got the generic "new package, add 0"
summary, where the interesting part is which UID or GID it takes. Scrape it
out of the ebuild and use it instead:

    acct-user/foo: add user 123
    acct-group/foo: add group 456

Resolves: #14
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

src/pkgdev/scripts/pkgdev_commit.py

@@ -326,6 +326,10 @@ def _populate(self, pkgs):
             tar.extractall(path=self.location, **extra_kwargs)
 
 
+# GLEP 81 categories, mapped to what their packages allocate
+_ACCT_CATEGORIES = {"acct-user": "user", "acct-group": "group"}
+
+
 def change(*statuses):
     """Decorator to register change status summary methods."""
 
@@ -461,10 +465,26 @@ def existing(self):
         """Existing packages in the tree related to the package."""
         return tuple(self.repo.match(next(iter(self.changes)).unversioned_atom))
 
+    @jit_attr
+    def account(self):
+        """Identifier a new GLEP 81 user or group package allocates, if any."""
+        atom = next(iter(self.changes))
+        if (kind := _ACCT_CATEGORIES.get(atom.category)) is None or len(self.changes) != 1:
+            return None
+        # a negative id asks the eclass to allocate dynamically, nothing to name
+        id_re = re.compile(rf"""ACCT_{kind.upper()}_ID=(?P<quot>['"]?)(?P<id>\d+)(?P=quot)""")
+        for pkg in self.repo.match(atom):
+            for line in pkg.ebuild.text_fileobj():
+                if mo := id_re.match(line):
+                    return f"{kind} {mo.group('id')}"
+        return None
+
     @change("A")
     def add(self):
         """Generate summaries for add actions."""
         if len(self.existing) == len(self.changes):
+            if self.account is not None:
+                return f"add {self.account}"
             msg = f"new package, add {', '.join(self.versions)}"
             if len(self.versions) == 1 or len(msg) <= 50:
                 return msg

tests/scripts/test_pkgdev_commit.py

@@ -489,24 +489,25 @@ def commit():
             f.write("# comment\n")
         assert commit() == "msg"
 
+    def _auto_commit(self, capsys, git_repo):
+        with (
+            os_environ(GIT_EDITOR="sed -i '1s/$/summary/'"),
+            patch("sys.argv", self.args + ["-a"]),
+            pytest.raises(SystemExit) as excinfo,
+            chdir(git_repo.path),
+        ):
+            self.script()
+        assert excinfo.value.code == 0
+        out, err = capsys.readouterr()
+        assert err == out == ""
+        message = git_repo.log(["-1", "--pretty=tformat:%B", "HEAD"])
+        return message[0]
+
     def test_generated_commit_summaries(self, capsys, repo, make_git_repo):
         git_repo = make_git_repo(repo.location)
         repo.create_ebuild("cat/pkg-0")
         git_repo.add_all("cat/pkg-0")
-
-        def commit():
-            with (
-                os_environ(GIT_EDITOR="sed -i '1s/$/summary/'"),
-                patch("sys.argv", self.args + ["-a"]),
-                pytest.raises(SystemExit) as excinfo,
-                chdir(git_repo.path),
-            ):
-                self.script()
-            assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
-            assert err == out == ""
-            message = git_repo.log(["-1", "--pretty=tformat:%B", "HEAD"])
-            return message[0]
+        commit = partial(self._auto_commit, capsys, git_repo)
 
         # initial package import
         repo.create_ebuild("cat/newpkg-0")
@@ -630,9 +631,31 @@ def commit():
         shutil.rmtree(pjoin(git_repo.path, "newcat/pkg"))
         assert commit() == "newcat/pkg: treeclean"
 
+    def test_generated_commit_summaries_acounts(self, capsys, repo, make_git_repo):
+        git_repo = make_git_repo(repo.location)
+        repo.create_ebuild("cat/pkg-0")
+        git_repo.add_all("cat/pkg-0")
+        commit = partial(self._auto_commit, capsys, git_repo)
+
+        # GLEP 81 accounts name the identifier they allocate
+        repo.create_ebuild("acct-user/newuser-0", acct_user_id=123)
+        assert commit() == "acct-user/newuser: add user 123"
+
+        repo.create_ebuild("acct-group/newgroup-0", acct_group_id=456)
+        assert commit() == "acct-group/newgroup: add group 456"
+
+        # a dynamically allocated id has nothing to name
+        repo.create_ebuild("acct-user/dynamic-0", acct_user_id=-1)
+        assert commit() == "acct-user/dynamic: new package, add 0"
+
+        # only for a new package, not a version added to an existing one
+        repo.create_ebuild("acct-user/newuser-1", acct_user_id=123)
+        assert commit() == "acct-user/newuser: add 1"
+
     def test_generated_commit_summaries_keywords(self, capsys, make_repo, make_git_repo):
         repo = make_repo(arches=["amd64", "arm64", "ia64", "x86"])
         git_repo = make_git_repo(repo.location)
+        commit = partial(self._auto_commit, capsys, git_repo)
         pkgdir = os.path.dirname(repo.create_ebuild("cat/pkg-0"))
         with open(pjoin(pkgdir, "metadata.xml"), "w") as f:
             f.write(
@@ -648,20 +671,6 @@ def test_generated_commit_summaries_keywords(self, capsys, make_repo, make_git_r
             )
         git_repo.add_all("cat/pkg-0")
 
-        def commit():
-            with (
-                os_environ(GIT_EDITOR="sed -i '1s/$/summary/'"),
-                patch("sys.argv", self.args + ["-a"]),
-                pytest.raises(SystemExit) as excinfo,
-                chdir(git_repo.path),
-            ):
-                self.script()
-            assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
-            assert err == out == ""
-            message = git_repo.log(["-1", "--pretty=tformat:%B", "HEAD"])
-            return message[0]
-
         # keyword version
         repo.create_ebuild("cat/pkg-0", keywords=["~amd64"])
         assert commit() == "cat/pkg: keyword 0 for ~amd64"
@@ -711,6 +720,7 @@ def commit():
     def test_metadata_summaries(self, capsys, repo, make_git_repo):
         git_repo = make_git_repo(repo.location)
         pkgdir = os.path.dirname(repo.create_ebuild("cat/pkg-0"))
+        commit = partial(self._auto_commit, capsys, git_repo)
         # stub metadata
         with open(pjoin(pkgdir, "metadata.xml"), "w") as f:
             f.write(
@@ -729,20 +739,6 @@ def test_metadata_summaries(self, capsys, repo, make_git_repo):
             )
         git_repo.add_all("cat/pkg-0")
 
-        def commit():
-            with (
-                os_environ(GIT_EDITOR="sed -i '1s/$/summary/'"),
-                patch("sys.argv", self.args + ["-a"]),
-                pytest.raises(SystemExit) as excinfo,
-                chdir(git_repo.path),
-            ):
-                self.script()
-            assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
-            assert err == out == ""
-            message = git_repo.log(["-1", "--pretty=tformat:%B", "HEAD"])
-            return message[0]
-
         # add yourself
         with open(pjoin(pkgdir, "metadata.xml"), "w") as f:
             f.write(