gitlab-projects-settings 5.2.0__tar.gz → 5.2.1__tar.gz

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/.hooks/configurations.py

@@ -9,7 +9,7 @@ ChangesRegex = str
 # Changes parsers class
 class ChangesParsers(NamedTuple):
     match: str
-    group: int
+    groups: List[int]
     commit_type: str
 
 # Changes evaluator class
@@ -43,6 +43,12 @@ COMMITS_DEFAULT_TYPE: str = 'type'
 # Commits footers constants
 COMMITS_FOOTER_SIGNOFF: str = 'Signed-off-by: '
 
+# Regex constants
+REGEX_EXT: str = r'[^/.]*'
+REGEX_FOLDER: str = r'[^/]+'
+REGEX_STEM: str = r'[^/]+'
+REGEX_STEM_VISIBLE: str = r'[^/_\.]{1}[^/]+'
+
 # Changes evaluators constants
 CHANGES_EVALUATORS: List[ChangesEvaluator] = [
     # Sources
@@ -52,8 +58,9 @@ CHANGES_EVALUATORS: List[ChangesEvaluator] = [
         ],
         parsers=[
             ChangesParsers(
-                match=r'.*/([^_]{1}[^/]*)\.[^/]*$',
-                group=1,
+                match=
+                fr'(({REGEX_FOLDER})/)?(({REGEX_FOLDER})/)?({REGEX_STEM_VISIBLE})\.{REGEX_EXT}$',
+                groups=[5, 4, 2],
                 commit_type='fix',
             ),
         ],
@@ -61,17 +68,17 @@ CHANGES_EVALUATORS: List[ChangesEvaluator] = [
     # Yocto
     ChangesEvaluator(
         changes=[
-            r'conf/(distro|machine)|recipes-[^/*]',
+            fr'conf/(distro|machine)|recipes-{REGEX_STEM}',
         ],
         parsers=[
             ChangesParsers(
-                match=r'conf/(distro|machine)/[^/]*.conf$',
-                group=1,
+                match=fr'conf/(distro|machine)/{REGEX_STEM}.conf$',
+                groups=[1],
                 commit_type='fix',
             ),
             ChangesParsers(
-                match=r'.*/([^/]*)/[^/]*\.(bb[^/.]*|inc)$',
-                group=1,
+                match=fr'({REGEX_STEM})/{REGEX_STEM}\.(bb[^/.]*|inc)$',
+                groups=[1],
                 commit_type='fix',
             ),
         ],
@@ -93,12 +100,12 @@ CHANGES_MATCHERS: List[ChangesMatcher] = [
         ],
     ),
     ChangesMatcher(
-        commit_scope='githooks',
+        commit_scope='hooks',
         types=[
             ChangesType(
                 commit_type='chore',
                 changes=[
-                    r'\.githooks$',
+                    r'^\.hooks',
                 ],
             ),
         ],

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/.hooks/prepare_commit_msg_template.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from re import match, search
 import sys
 from sys import argv, exit as sys_exit, path
-from typing import List, Optional, Tuple
+from typing import List, NamedTuple, Optional, Tuple
 
 # Bind sources
 sys.dont_write_bytecode = True
@@ -74,29 +74,79 @@ def parse_commit_input(filepath: str) -> Tuple[bool, bool, str, List[str]]:
     # Result
     return empty, signoff, linesep.join(context), changes
 
-# Prepare commit title, pylint: disable=too-many-nested-blocks
+# Prepare commit title, pylint: disable=too-many-branches,too-many-locals,too-many-nested-blocks
 def prepare_commit_title(changes: List[str]) -> Tuple[str, str]:
 
+    # Types
+    Result = NamedTuple('Result', [
+        ('priority', int),
+        ('level', int),
+        ('commit_type', str),
+        ('commit_scope', str),
+    ])
+
+    # Variables
+    commit_scope: str = COMMITS_DEFAULT_SCOPE
+    commit_type: str = COMMITS_DEFAULT_TYPE
+    level: int
+    levels: List[int]
+    priority: int = 0
+    results: List[Result] = []
+
     # Evaluate common changes
     for changes_evaluator in CHANGES_EVALUATORS:
+        priority += 1
         for type_change in changes_evaluator.changes:
             for change in changes:
-                if search(type_change, change):
-                    for parser in changes_evaluator.parsers:
-                        matches = match(parser.match, change)
-                        if matches and isinstance(matches.lastindex, int) >= parser.group:
-                            return parser.commit_type, matches.group(parser.group)
+                if not search(type_change, change):
+                    continue
+                for parser in changes_evaluator.parsers:
+                    matches = search(parser.match, change)
+                    if not matches or not isinstance(matches.lastindex, int):
+                        continue
+                    level = 0
+                    for group in parser.groups:
+                        level += 1
+                        if matches.lastindex >= group:
+                            results += [
+                                Result(
+                                    priority=priority,
+                                    level=level,
+                                    commit_type=parser.commit_type,
+                                    commit_scope=matches.group(group),
+                                )
+                            ]
 
     # Match common changes
     for changes_matcher in CHANGES_MATCHERS:
+        priority += 1
         for matcher_type in changes_matcher.types:
             for type_change in matcher_type.changes:
                 for change in changes:
                     if search(type_change, change):
-                        return matcher_type.commit_type, changes_matcher.commit_scope
+                        results += [
+                            Result(
+                                priority=priority,
+                                level=0,
+                                commit_type=matcher_type.commit_type,
+                                commit_scope=changes_matcher.commit_scope,
+                            )
+                        ]
+
+    # Parse results
+    if results:
+        priority = min((result.priority for result in results))
+        results = [result for result in set(results) if result.priority == priority]
+        levels = sorted([result.level for result in results])
+        level = min((level for level in set(levels) if levels.count(level) == 1),
+                    default=levels[-1])
+        for result in [result for result in set(results) if result.level == level]:
+            commit_type = result.commit_type
+            commit_scope = result.commit_scope
+            break
 
     # Result
-    return COMMITS_DEFAULT_TYPE, COMMITS_DEFAULT_SCOPE
+    return commit_type, commit_scope
 
 # Prepare commit message
 def prepare_commit_template(

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+<a name="5.2.1"></a>
+## [5.2.1](https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings/compare/5.2.0...5.2.1) (2024-08-16)
+
+### 🐛 Bug Fixes
+
+- **gitlab:** fix '--protect-tags' unknown protection level error ([f745f7e](https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings/commit/f745f7e82acf831145d205c48b1dc6a42bcebefe))
+- **package:** fix package name for 'importlib' version detection ([b5bf779](https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings/commit/b5bf7799f19425fcad86381e63240cd0292044c3))
+
+### ⚙️ Cleanups
+
+- **hooks:** implement evaluators and matchers priority parser ([c59fa17](https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings/commit/c59fa17b44d3bb1f3f2d08fd31c4adfea834ab6b))
+
+
 <a name="5.2.0"></a>
 ## [5.2.0](https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings/compare/5.1.0...5.2.0) (2024-08-15)
 

{gitlab_projects_settings-5.2.0/gitlab_projects_settings.egg-info → gitlab_projects_settings-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-projects-settings
-Version: 5.2.0
+Version: 5.2.1
 Summary: Configure GitLab groups and projects settings automatically
 Home-page: https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings
 Author: Adrian DC

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1/gitlab_projects_settings.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitlab-projects-settings
-Version: 5.2.0
+Version: 5.2.1
 Summary: Configure GitLab groups and projects settings automatically
 Home-page: https://gitlab.com/RadianDevCore/tools/gitlab-projects-settings
 Author: Adrian DC

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/src/features/gitlab.py

@@ -480,7 +480,7 @@ class GitLabFeature:
         elif protect_level == ProtectionLevels.DEVELOPERS:
             access_level = 30
         else:
-            raise SyntaxError(f'Unknown protection level: {access_level}')
+            raise SyntaxError(f'Unknown protection level: {protect_level}')
 
         # Acquire protected tags
         protectedtags = [

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/src/package/bundle.py

@@ -6,6 +6,9 @@ class Bundle:
     # Names
     NAME: str = 'gitlab-projects-settings'
 
+    # Packages
+    PACKAGE: str = 'gitlab-projects-settings'
+
     # Details
     DESCRIPTION: str = 'Configure GitLab groups and projects settings automatically'
 

{gitlab_projects_settings-5.2.0 → gitlab_projects_settings-5.2.1}/src/package/version.py

@@ -22,7 +22,7 @@ class Version:
         # Acquire version from metadata
         try:
             from importlib import metadata # pylint: disable=import-outside-toplevel
-            return metadata.version(Bundle.NAME)
+            return metadata.version(Bundle.PACKAGE)
         except Exception: # pylint: disable=broad-exception-caught # pragma: no cover
             pass