Merge pull request #3 from d-chris/develop

changed error message

Author: d-chris

.pre-commit-config.yaml

@@ -52,7 +52,7 @@ repos:
     rev: 7.1.2
     hooks:
       - id: flake8
-        args: ["--max-line-length", "88", "--ignore=E501"]
+        args: ["--max-line-length", "88"]
         language_version: python3.8
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.19.1

README.md

@@ -117,7 +117,7 @@ $ main.py fu.bar.com
 Usage: main.py [OPTIONS] EMAIL
 Try 'main.py --help' for help.
 
-Error: Invalid value for 'EMAIL': Invalid email='fu.bar.com'.
+Error: Invalid value for 'EMAIL': 'fu.bar.com'.
 ```
 
 ## Dependencies

clicktypes/decorator.py

@@ -14,7 +14,7 @@ def __init__(self, **kwargs):
 
     def convert(self, value, param, ctx):
         if self._func(value) is not True:
-            self.fail(f"Invalid {self.name}='{value}'.", param, ctx)
+            self.fail(repr(value), param, ctx)
         return value
 
     return type(

templates/README.md.jinja2

@@ -70,7 +70,7 @@ $ main.py fu.bar.com
 Usage: main.py [OPTIONS] EMAIL
 Try 'main.py --help' for help.
 
-Error: Invalid value for 'EMAIL': Invalid email='fu.bar.com'.
+Error: Invalid value for 'EMAIL': 'fu.bar.com'.
 ```
 
 ## Dependencies

tests/test_envvar.py

@@ -0,0 +1,36 @@
+import click
+import pytest
+from click.testing import CliRunner
+
+import clicktypes
+
+
+@click.command(name="email", help="email validator")
+@click.option(
+    "--email",
+    type=clicktypes.email(),
+    envvar="EMAIL",
+    multiple=True,
+)
+def cli(email):
+    click.echo(f"valid {email=}")
+
+
+@pytest.mark.parametrize(
+    "emails,exit_code",
+    [
+        ("foo@bar.com", 0),
+        ("foo.bar.com", 2),
+        ("foo@bar.com bar@foo.com", 0),
+        ("foo@bar.com bar.foo.com", 2),
+    ],
+)
+def test_envvar(emails, exit_code):
+
+    runner = CliRunner()
+    result = runner.invoke(cli, env={"EMAIL": emails})
+    assert result.exit_code == exit_code
+
+
+if __name__ == "__main__":
+    cli()

tests/test_validator.py

@@ -3,8 +3,7 @@
 from click.testing import CliRunner
 
 import clicktypes
-
-from . import validator_data
+from tests import validator_data
 
 
 def cli(validator: str, **kwargs):

tox.ini

@@ -8,11 +8,35 @@ env_list =
     py310
     py39
     py38
+    cov
 
 [testenv]
+skip_install = true
 deps =
     poetry==1.8.5
+set_env =
+    COVERAGE_FILE = {toxworkdir}/.coverage.{envname}
 commands_pre =
-    poetry install --all-extras
+    poetry install --only main,test --extras eth
 commands =
     poetry run pytest
+
+[testenv:cov]
+deps =
+    coverage
+parallel_show_output = true
+set_env =
+    COVERAGE_FILE = {toxworkdir}/.coverage
+commands_pre =
+    coverage combine {toxworkdir}
+commands =
+    coverage html -d {toxworkdir}/htmlcov
+commands_post =
+    coverage report --show-missing --skip-covered
+depends =
+    py313
+    py312
+    py311
+    py310
+    py39
+    py38