From 76e57a8944dfdda566d6a33a039c41ce947e3566 Mon Sep 17 00:00:00 2001 From: Dennis Conrad Date: Mon, 23 Nov 2020 16:12:42 +0100 Subject: [PATCH] Run Check for multiple Directories and support new Submodules --- README.md | 2 +- prevent_submodule_regression/__init__.py | 2 +- prevent_submodule_regression/parser.py | 5 +++-- pyproject.toml | 2 +- setup.cfg | 2 +- tests/test_prevent_submodule_regression.py | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1960276..7153d3e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ A sample configuration: repos: # […] - repo: https://github.com/erikogan/prevent-submodule-regression - rev: v0.1.2 + rev: v0.1.3 hooks: - id: prevent-submodule-regression # By default hooks only operate on plain files, which do not include diff --git a/prevent_submodule_regression/__init__.py b/prevent_submodule_regression/__init__.py index b3f4756..ae73625 100644 --- a/prevent_submodule_regression/__init__.py +++ b/prevent_submodule_regression/__init__.py @@ -1 +1 @@ -__version__ = "0.1.2" +__version__ = "0.1.3" diff --git a/prevent_submodule_regression/parser.py b/prevent_submodule_regression/parser.py index 78a7e4a..feb67dd 100644 --- a/prevent_submodule_regression/parser.py +++ b/prevent_submodule_regression/parser.py @@ -20,6 +20,8 @@ def run(self, args): for path in args: self.process(path) + exit(0) + def process(self, path): if not self.is_staged(path): return @@ -41,7 +43,6 @@ def process(self, path): f" {Fore.CYAN}{path}{Style.RESET_ALL} SHA {Fore.YELLOW}{current_sha}{Style.RESET_ALL}" " was already committed. This appears to be a regression." ) - exit(0) def submodule_sha(self, path): result = subprocess.run( @@ -80,7 +81,7 @@ def extract_sha(commit, path): return res return res[1] - return [extract_sha(c, path) for c in commits] + return [extract_sha(c, path) for c in commits if commits != [""]] def list_of_submodules(self): # Rely on the fact that the .gitmodules file is in git config format diff --git a/pyproject.toml b/pyproject.toml index 472ea2f..8e41709 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "prevent-submodule-regression" -version = "0.1.2" +version = "0.1.3" description = "Pre-commit hook to prevent accidental submodule regressions" authors = ["Erik Ogan "] maintainers = ["Erik Ogan "] diff --git a/setup.cfg b/setup.cfg index 21ab018..5bc4995 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.2 +current_version = 0.1.3 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(?:\.(?P\d+))? diff --git a/tests/test_prevent_submodule_regression.py b/tests/test_prevent_submodule_regression.py index 5dc3ee3..e5c6426 100644 --- a/tests/test_prevent_submodule_regression.py +++ b/tests/test_prevent_submodule_regression.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == "0.1.2" + assert __version__ == "0.1.3"