bump version, merge pull request #21 from iterative/devel

Author: casperdcl

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         python-version: ${{ matrix.python }}
     - run: pip install -U -r requirements-dev.txt
-    - run: python -m tests
+    - run: python -m tests --cov-report=term-missing
     - uses: codecov/codecov-action@v1
   deploy:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

shtab/__init__.py

@@ -153,8 +153,8 @@ def replace_format(string, **fmt):
 
 
 def wordify(string):
-    """Replace hyphens (-) and spaces ( ) with underscores (_)"""
-    return string.replace("-", "_").replace(" ", "_")
+    """Replace non-word chars [-. ] with underscores [_]"""
+    return string.replace("-", "_").replace(".", " ").replace(" ", "_")
 
 
 def get_bash_commands(root_parser, root_prefix, choice_functions=None):

tests/__main__.py

@@ -5,8 +5,9 @@
 REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 check_call(
     (
-        "py.test -v --log-level=debug --cov=shtab --cov-report=xml"
-        " {params} --durations=0".format(params=" ".join(sys.argv[1:]))
+        "py.test -v --log-level=debug --cov=shtab"
+        " --cov-report=xml --cov-report=term-missing --durations=0"
+        + (" ".join([""] + sys.argv[1:]))
     ),
     shell=True,
     env=dict(os.environ, PYTHONPATH=REPO_ROOT),

tests/test_shtab.py

@@ -91,6 +91,31 @@ def test_prog_override(shell, caplog, capsys):
     assert not caplog.record_tuples
 
 
+@fix_shell
+def test_prog_scripts(shell, caplog, capsys):
+    with caplog.at_level(logging.INFO):
+        main(
+            ["-s", shell, "--prog", "script.py", "shtab.main.get_main_parser"]
+        )
+
+    captured = capsys.readouterr()
+    assert not captured.err
+    script_py = [
+        i.strip() for i in captured.out.splitlines() if "script.py" in i
+    ]
+    if shell == "bash":
+        assert script_py == ["complete -o nospace -F _shtab_shtab script.py"]
+    elif shell == "zsh":
+        assert script_py == [
+            "#compdef script.py",
+            "_describe 'script.py commands' _commands",
+        ]
+    else:
+        raise NotImplementedError(shell)
+
+    assert not caplog.record_tuples
+
+
 @fix_shell
 def test_prefix_override(shell, caplog, capsys):
     with caplog.at_level(logging.INFO):