clan-cli: move arg parsing to extra method

This commit is contained in:
Jörg Thalheim
2023-08-24 17:09:04 +02:00
parent c5b16124ef
commit 3b099ccb89
2 changed files with 17 additions and 25 deletions

View File

@@ -16,8 +16,7 @@ except ImportError:
pass
# this will be the entrypoint under /bin/clan (see pyproject.toml config)
def main() -> None:
def parse_args(args: list[str]) -> argparse.Namespace:
parser = argparse.ArgumentParser(description="cLAN tool")
subparsers = parser.add_subparsers()
@@ -48,13 +47,18 @@ def main() -> None:
if len(sys.argv) == 1:
parser.print_help()
args = parser.parse_args()
if hasattr(args, "func"):
try:
args.func(args)
except ClanError as e:
print(f"{sys.argv[0]}: {e}")
sys.exit(1)
return parser.parse_args(args)
# this will be the entrypoint under /bin/clan (see pyproject.toml config)
def main() -> None:
args = parse_args(sys.argv[1:])
assert hasattr(args, "func")
try:
args.func(args)
except ClanError as e:
print(f"{sys.argv[0]}: {e}")
sys.exit(1)
if __name__ == "__main__":

View File

@@ -1,22 +1,10 @@
import sys
import pytest
import clan_cli
from cli import Cli
def test_no_args(
capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.setattr(sys, "argv", [""])
clan_cli.main()
captured = capsys.readouterr()
assert captured.out.startswith("usage:")
def test_help(capsys: pytest.CaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["", "--help"])
def test_help(capsys: pytest.CaptureFixture) -> None:
cli = Cli()
with pytest.raises(SystemExit):
clan_cli.main()
cli.run(["--help"])
captured = capsys.readouterr()
assert captured.out.startswith("usage:")