Skip to content

🐛 FIX: cli.parse: return 0 for non-error #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 15, 2021
Merged

🐛 FIX: cli.parse: return 0 for non-error #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6e739d
🐛 FIX: cli.parse: return 0 for non-error #53
westurner Oct 1, 2020
b0bc12e
🧪 TEST: fix and add a CLI returncode test
westurner Oct 1, 2020
3900ae1
TEST: tests/test_cli.py: check SysyemExit exc_info return code
westurner Oct 24, 2020
797347c
Fix test_parse_fail
hukkinj1 Feb 15, 2021
3ecbddc
Fix exit code when running "python markdown_it/cli/parse.py"
hukkinj1 Feb 15, 2021
03df51c
Merge branch 'master' into exit-code
chrisjsewell Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions markdown_it/cli/parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
version_str = "markdown-it-py [version {}]".format(__version__)


def main(args: Optional[Sequence[str]] = None) -> bool:
def main(args: Optional[Sequence[str]] = None) -> int:
namespace = parse_args(args)
if namespace.filenames:
convert(namespace.filenames)
else:
interactive()
return True
return 0


def convert(filenames: Iterable[str]) -> None:
Expand All @@ -38,7 +38,8 @@ def convert_file(filename: str) -> None:
rendered = MarkdownIt().render(fin.read())
print(rendered, end="")
except OSError:
sys.exit('Cannot open file "{}".'.format(filename))
sys.stderr.write(f'Cannot open file "{filename}".\n')
sys.exit(1)


def interactive() -> None:
Expand Down Expand Up @@ -103,4 +104,5 @@ def print_heading() -> None:


if __name__ == "__main__":
main(sys.argv[1:])
exit_code = main(sys.argv[1:])
sys.exit(exit_code)
10 changes: 9 additions & 1 deletion tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@
import tempfile
from unittest.mock import patch

import pytest

from markdown_it.cli import parse


def test_parse():
with tempfile.TemporaryDirectory() as tempdir:
path = pathlib.Path(tempdir).joinpath("test.md")
path.write_text("a b c")
assert parse.main([str(path)])
assert parse.main([str(path)]) == 0


def test_parse_fail():
with pytest.raises(SystemExit) as exc_info:
parse.main(["/tmp/nonexistant_path/for_cli_test.md"])
assert exc_info.value.code == 1


def test_print_heading():
Expand Down