sbo-create 2.3.0__tar.gz → 2.3.2__tar.gz

{sbo_create-2.3.0 → sbo_create-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbo-create
-Version: 2.3.0
+Version: 2.3.2
 Summary: SBo tool for creating SlackBuilds.
 Keywords: sbo,templates,slackbuild
 Author-email: Dimitris Zlatanidis <dslackw@gmail.com>

{sbo_create-2.3.0 → sbo_create-2.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "sbo-create"
-version = "2.3.0"
+version = "2.3.2"
 authors = [
     { name = "Dimitris Zlatanidis", email = "dslackw@gmail.com" },
 ]
@@ -35,6 +35,10 @@ dependencies = [
     "urllib3>=1.26"
 ]
 
+[tool.isort]
+profile = "black"
+known_first_party = ["sbo_create"]
+
 [tool.mypy]
 strict = true
 warn_return_any = true

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/__metadata__.py

@@ -4,8 +4,7 @@
 __prog__: str = 'sbo-create'
 __author__: str = 'dslackw'
 __copyright__: str = '2015-2026'
-__version_info__: tuple[int, int, int] = (2, 3, 0)
-__version__: str = f'{__version_info__[0]}.{__version_info__[1]}.{__version_info__[2]}'
+__version__: str = '2.3.2'
 __license__: str = 'GNU General Public License v3 (GPLv3)'
 __email__: str = 'dslackw@gmail.com'
 __website__: str = 'https://gitlab.com/dslackw/sbo-create'

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/bump.py

@@ -81,8 +81,7 @@ class BumpHandler:  # pylint: disable=too-few-public-methods
         """
         if len(values) == 1:
             return f'{label}="{values[0]}"'
-        indent: str = ' ' * (len(label) + 2)
-        body: str = f' \\\n{indent}'.join(values)
+        body: str = ' \\\n  '.join(values)
         return f'{label}="{body}"'
 
     def _bump_md5sums(self, content: str) -> tuple[str, bool]:

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/download.py

@@ -167,7 +167,7 @@ class DownloadHandler:
     def download(self, link: str) -> bool:
         """Download a single source file using wget into the current folder.
 
-        Runs wget with --continue so partial downloads are resumed. stdout and
+        Runs wget with -N so partial downloads are replace. stdout and
         stderr are suppressed to keep terminal output clean.
 
         Args:
@@ -177,6 +177,6 @@ class DownloadHandler:
             True if wget exited with return code 0, False otherwise.
         """
         rc: int = subprocess.run(
-            ['wget', '--continue', link], check=False,
+            ['wget', '-N', link], check=False,
             stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL).returncode
         return rc == 0

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/files.py

@@ -9,8 +9,15 @@ import sys
 from collections.abc import Callable
 from pathlib import Path
 
-from sbo_create.models import (PROG, AppContext, colorize, confirm,
-                               select_option, set_arm_labels, set_x86_labels)
+from sbo_create.models import (
+    PROG,
+    AppContext,
+    colorize,
+    confirm,
+    select_option,
+    set_arm_labels,
+    set_x86_labels,
+)
 from sbo_create.template_loader import TemplateLoader
 
 

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/fix.py

@@ -8,8 +8,13 @@ import re
 from pathlib import Path
 
 from sbo_create.handlers.files import FileHandler
-from sbo_create.models import (SOURCE_EXTENSIONS, UNSUPPORTED, AppContext,
-                               colorize, confirm)
+from sbo_create.models import (
+    SOURCE_EXTENSIONS,
+    UNSUPPORTED,
+    AppContext,
+    colorize,
+    confirm,
+)
 
 
 class FixHandler:  # pylint: disable=too-few-public-methods
@@ -27,11 +32,13 @@ class FixHandler:  # pylint: disable=too-few-public-methods
         """Auto-fix trailing whitespace in a file, optionally fixing the final newline.
 
         Strips trailing whitespace from each line while preserving backslash
-        continuations. Optionally ensures the file ends with a blank line (for README).
+        continuations. Optionally ensures the file ends with exactly one newline,
+        stripping any extra trailing blank lines (for README).
 
         Args:
             filepath: Path to the file to fix.
-            fix_newline: If True, ensure the file ends with '\\n\\n' (blank line).
+            fix_newline: If True, ensure the file ends with exactly '\\n' (strips
+                extra trailing blank lines).
 
         Returns:
             A tuple of (ws_fixed, newline_fixed) — True for each fix that was applied.
@@ -57,9 +64,10 @@ class FixHandler:  # pylint: disable=too-few-public-methods
 
         newline_fixed: bool = False
         if fix_newline:
-            newline_fixed = not content.endswith('\n\n')
+            correct: str = content.rstrip('\n') + '\n'
+            newline_fixed = content != correct
             if newline_fixed:
-                content = content.rstrip('\n') + '\n\n'
+                content = correct
 
         if ws_fixed or newline_fixed:
             filepath.write_text(content, encoding='utf-8')
@@ -418,10 +426,10 @@ class FixHandler:  # pylint: disable=too-few-public-methods
         )
         if not tarballs:
             return False
-        print("Source tarballs to remove:\n")
+        print(f"Source tarballs to remove ({len(tarballs)}):\n")
         for f in tarballs:
             print(f"  {f.name}")
-        if not confirm("Remove?", before_newline=True, after_newline=False):
+        if not confirm(f"Remove {colorize(str(len(tarballs)), 'red')} file(s)?", before_newline=True, after_newline=True):
             return False
         for f in tarballs:
             f.unlink()
@@ -443,10 +451,10 @@ class FixHandler:  # pylint: disable=too-few-public-methods
         name: str = self.ctx.prg_name
         folder: Path = self.ctx.current_folder
         candidates: list[tuple[str, bool]] = [
-            (f'{name}.info', False),
+            (f'{name}.info', True),
             ('README', True),
-            (f'{name}.SlackBuild', False),
-            ('slack-desc', False),
+            (f'{name}.SlackBuild', True),
+            ('slack-desc', True),
         ]
         width: int = max(
             (len(filename)

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/git.py

@@ -234,8 +234,15 @@ class GitHandler:
 
         entries: list[tuple[str, str]] = []
         for subject in subjects:
-            m = re.match(r'^(\S+/\S+):\s+.*?(\d[\w.\-]*)\.?\s*$', subject)
-            entries.append((m.group(1), m.group(2)) if m else (subject, ''))
+            m = re.match(r'^(\S+/\S+):\s+.*?[Vv]ersion\s+(\S+?)\.?\s*$', subject)
+            if m:
+                entries.append((m.group(1), m.group(2)))
+            else:
+                pkg_m = re.match(r'^(\S+/\S+):\s*(.*)', subject)
+                if pkg_m:
+                    entries.append((pkg_m.group(1), pkg_m.group(2).rstrip('.')))
+                else:
+                    entries.append((subject, ''))
 
         print(f"Commits on {colorize(branch, 'cyan')} (since {main}):\n")
         for pkg, ver in entries:

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/misc.py

@@ -17,8 +17,14 @@ from urllib3.exceptions import HTTPError  # pylint: disable=import-error
 from sbo_create.handlers.fallback import SboResolver
 from sbo_create.handlers.files import FileHandler
 from sbo_create.handlers.validate import ValidateHandler
-from sbo_create.models import (EMAIL_RE, PROG, SOURCE_EXTENSIONS, AppContext,
-                               colorize, confirm)
+from sbo_create.models import (
+    EMAIL_RE,
+    PROG,
+    SOURCE_EXTENSIONS,
+    AppContext,
+    colorize,
+    confirm,
+)
 
 
 def _print_tree_branch(  # pylint: disable=too-many-arguments,too-many-positional-arguments
@@ -433,7 +439,7 @@ class MiscHandler:
             raise SystemExit(1) from exc
         raise SystemExit(0)
 
-    def _diff_files(self, sbo_pkg_path: Path, local_path: Path, context: int) -> bool:  # pylint: disable=too-many-locals
+    def _diff_files(self, sbo_pkg_path: Path, local_path: Path, context: int) -> bool:  # pylint: disable=[too-many-locals, too-many-branches]
         """Compute and print a unified diff between SBo repo files and local files.
 
         Args:
@@ -444,9 +450,21 @@ class MiscHandler:
         Returns:
             True if at least one file had differences, False otherwise.
         """
+        try:
+            repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
+            local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+        except FileNotFoundError as err:
+            if not sbo_pkg_path.is_dir():
+                print(colorize(f"Error: SBo repository path not found: '{sbo_pkg_path}'", "red"))
+            elif not local_path.is_dir():
+                print(colorize(f"Error: Local package path not found: '{local_path}'", "red"))
+            else:
+                print(colorize(f"Error: Path not found: '{err.filename}'", "red"))
+            return False
+
         any_diff: bool = False
         skipped: list[str] = []
-        for filename in sorted(f.name for f in sbo_pkg_path.iterdir() if f.is_file()):
+        for filename in sorted(repo_files):
             if filename.endswith(SOURCE_EXTENSIONS):
                 if (local_path / filename).is_file():
                     skipped.append(filename)
@@ -476,8 +494,9 @@ class MiscHandler:
             for src in skipped:
                 print(src)
 
-        repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
-        local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+        # repo_files: set[str] = {f.name for f in sbo_pkg_path.iterdir() if f.is_file()}
+        # local_files: set[str] = {f.name for f in local_path.iterdir() if f.is_file()}
+
         new_files: list[str] = sorted(local_files - repo_files)
         if new_files:
             print("\nNew in local (not in SBo repo):")
@@ -516,8 +535,12 @@ class MiscHandler:
             if not sbo_pkg_path.is_dir():
                 print(colorize(f"{PROG}: '{category}/{name}' not found in repo.", 'red'))
                 continue
-            local_path: Path = (self.ctx.current_folder if from_cwd
-                                else self.ctx.current_folder / orig_name)
+
+            if from_cwd or self.ctx.current_folder.name == name:
+                local_path: Path = self.ctx.current_folder
+            else:
+                local_path = self.ctx.current_folder / orig_name
+
             if sbo_pkg_path.resolve() == local_path.resolve():
                 print(colorize(
                     f"{PROG}: '{name}' local path and repo path are the same directory.\n"

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/handlers/validate.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+# pylint: disable=too-many-lines
 
 from __future__ import annotations
 
@@ -12,8 +13,14 @@ import urllib3  # pylint: disable=import-error
 from sbo_create.handlers.fallback import SboResolver
 from sbo_create.handlers.files import FileHandler
 from sbo_create.handlers.fix import FixHandler
-from sbo_create.models import (EMAIL_RE, PROG, SOURCE_EXTENSIONS, UNSUPPORTED,
-                               AppContext, colorize)
+from sbo_create.models import (
+    EMAIL_RE,
+    PROG,
+    SOURCE_EXTENSIONS,
+    UNSUPPORTED,
+    AppContext,
+    colorize,
+)
 
 
 class ValidateHandler:
@@ -251,20 +258,46 @@ class ValidateHandler:
                 errors.append(f"{colorize(filename, 'red')}: required file missing")
         return errors
 
-    def _check_readme(self) -> list[str]:
-        """Check that README exists, is not empty and ends with a blank line.
+    def _check_readme(self) -> tuple[list[str], list[str]]:
+        """Check that README exists and is not empty.
 
         Returns:
-            List of error message strings (empty if all checks pass).
+            A tuple of (errors, warnings).
         """
         errors: list[str] = []
+        warnings: list[str] = []
         readme: Path = Path(self.ctx.current_folder, 'README')
         if readme.is_file():
             content: str = readme.read_text(encoding='utf-8')
             if not content.strip():
                 errors.append(f"{colorize('README', 'red')}: is empty")
-            elif not content.endswith('\n\n'):
-                errors.append(f"{colorize('README', 'red')}: must end with an empty line")
+        return errors, warnings
+
+    def _check_trailing_newlines(self) -> list[str]:
+        """Check that no submission file ends with trailing blank lines or missing newline.
+
+        Checks .info, .SlackBuild, slack-desc and README.
+
+        Returns:
+            List of error message strings (empty if all checks pass).
+        """
+        errors: list[str] = []
+        name: str = self.ctx.prg_name
+        for filename in [f'{name}.info', f'{name}.SlackBuild', 'slack-desc', 'README']:
+            path: Path = Path(self.ctx.current_folder, filename)
+            if not path.is_file():
+                continue
+            content: str = path.read_text(encoding='utf-8')
+            if not content.strip():
+                continue
+            if not content.endswith('\n'):
+                errors.append(
+                    f"{colorize(filename, 'red')}: must end with a newline"
+                    " (run --fix to add)")
+            elif content.endswith('\n\n'):
+                errors.append(
+                    f"{colorize(filename, 'red')}: ends with trailing blank line(s)"
+                    " (run --fix to remove)")
         return errors
 
     def _check_no_sources(self) -> list[str]:
@@ -754,14 +787,16 @@ class ValidateHandler:
             info_lines: list[str] = info_file.read_text(encoding='utf-8').splitlines()
             info_var_errors = self._validate_info_variables(info_lines)
 
+        readme_errors, readme_warnings = self._check_readme()
         md5_errors, warnings = self._check_md5sums(show_warnings)
+        warnings = readme_warnings + warnings
         copyright_warn: str = self._check_copyright_year()
         if copyright_warn:
             warnings.append(copyright_warn)
 
         groups: list[tuple[str, list[str]]] = [
             ('Required files', required_errors),
-            ('README', self._check_readme()),
+            ('README', readme_errors),
             ('.info variables', info_var_errors),
             ('.info consistency', self._check_info_consistency()),
             ('.info quotes', self._check_info_quotes()),
@@ -769,6 +804,7 @@ class ValidateHandler:
             ('slack-desc', self._check_slack_desc()),
             ('REQUIRES', self._check_requires_existence()),
             ('Trailing whitespace', self._check_trailing_whitespace()),
+            ('Trailing newlines', self._check_trailing_newlines()),
             ('ASCII encoding', self._check_ascii()),
             ('MD5SUM', md5_errors),
         ]

{sbo_create-2.3.0 → sbo_create-2.3.2}/sbo_create/models.py

@@ -21,6 +21,7 @@ SOURCE_EXTENSIONS: tuple[str, ...] = (
     ".tbz2",
     ".zip",
     ".7z",
+    ".crate",
 )
 UNSUPPORTED: tuple[str, str] = ("UNSUPPORTED", "UNTESTED")
 EMAIL_RE = re.compile(