mask: better format for last rites with bugs

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

Author: arthurzam

src/pkgdev/scripts/pkgdev_mask.py

@@ -189,14 +189,19 @@ def __str__(self):
         return ''.join(self.header) + '\n\n'.join(map(str, self.masks))
 
 
-def get_comment(bugs):
+def get_comment(bugs, rites: int):
     """Spawn editor to get mask comment."""
     tmp = tempfile.NamedTemporaryFile(mode='w')
+    summary = []
+    if rites:
+        summary.append(f'Removal: {datetime.now(timezone.utc) + timedelta(days=rites):%Y-%m-%d}.')
     if bugs:
         # Bug(s) #A, #B, #C
         bug_list = ", ".join(f'#{b}' for b in bugs)
         s = pluralism(bugs)
-        tmp.write(f'\nBug{s} {bug_list}')
+        summary.append(f'Bug{s} {bug_list}.')
+    if summary := '  '.join(summary):
+        tmp.write(f'\n{summary}')
     tmp.write(textwrap.dedent("""
 
         # Please enter the mask message. Lines starting with '#' will be ignored.
@@ -268,14 +273,10 @@ def _mask(options, out, err):
         'author': author,
         'email': email,
         'date': today.strftime('%Y-%m-%d'),
-        'comment': get_comment(options.bugs),
+        'comment': get_comment(options.bugs, options.rites),
         'atoms': options.atoms,
     }
 
-    if options.rites:
-        removal_date = today + timedelta(days=options.rites)
-        mask_args['comment'].append(f'Removal: {removal_date:%Y-%m-%d}')
-
     m = Mask(**mask_args)
     mask_file.add(m)
     mask_file.write()

tests/scripts/test_pkgdev_mask.py

@@ -259,7 +259,7 @@ def test_last_rites(self):
                 assert self.masks_path.read_text() == textwrap.dedent(f"""\
                     # First Last <first.last@email.com> ({today})
                     # mask comment
-                    # Removal: {removal}
+                    # Removal: {removal}.
                     cat/pkg
                 """)
                 self.masks_path.write_text("")  # Reset the contents of package.mask
@@ -290,13 +290,11 @@ def test_last_email_bad_mailer(self, capsys):
             assert err.strip() == "pkgdev mask: error: failed opening email composer"
 
     def test_mask_bugs(self):
-        removal_date = self.today + timedelta(days=30)
         today = self.today.strftime('%Y-%m-%d')
-        removal = removal_date.strftime('%Y-%m-%d')
         for bflag in ('-b', '--bug'):
             for (bug_nums, expected) in [
-                (['42'], 'Bug #42'),
-                (['42', '43'], 'Bugs #42, #43'),
+                (['42'], 'Bug #42.'),
+                (['42', '43'], 'Bugs #42, #43.'),
             ]:
                 args = []
                 for bug_num in bug_nums: