scim2-cli 0.6.0__tar.gz → 0.7.1__tar.gz

{scim2_cli-0.6.0 → scim2_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scim2-cli
-Version: 0.6.0
+Version: 0.7.1
 Summary: SCIM application development CLI
 Keywords: scim,scim2,provisioning,rfc7643,rfc7644
 Author: Yaal Coop
@@ -207,19 +207,20 @@ License:                                  Apache License
             See the License for the specific language governing permissions and
             limitations under the License.
 Classifier: Intended Audience :: Developers
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
 Classifier: Operating System :: OS Independent
 Requires-Dist: click>=8.5.0
-Requires-Dist: scim2-client[httpx2]>=0.13.2
-Requires-Dist: scim2-tester>=0.5.1
+Requires-Dist: scim2-client[httpx2]>=0.14.0
+Requires-Dist: scim2-tester>=0.6.4
 Requires-Dist: sphinx-click-rst-to-ansi-formatter>=0.2.0
 Requires-Dist: pydanclick>=0.5.0
 Requires-Dist: pygments>=2.18.0
@@ -230,6 +231,8 @@ Project-URL: changelog, https://scim2-cli.readthedocs.io/en/latest/changelog.htm
 Project-URL: funding, https://github.com/sponsors/python-scim
 Description-Content-Type: text/markdown
 
+<img alt="python-scim logo" src="https://raw.githubusercontent.com/python-scim/.github/refs/heads/main/python-scim.svg" height="72" align="right">
+
 # scim2-cli
 
 An utility command line to help you perform requests against a SCIM server, while validating input and response payloads. It also uses [scim2-tester](https://scim2-tester.readthedocs.io) to perform a [SCIM server compliance test](https://scim2-cli.readthedocs.io/en/latest/reference.html#scim-url-test).

{scim2_cli-0.6.0 → scim2_cli-0.7.1}/README.md

@@ -1,3 +1,5 @@
+<img alt="python-scim logo" src="https://raw.githubusercontent.com/python-scim/.github/refs/heads/main/python-scim.svg" height="72" align="right">
+
 # scim2-cli
 
 An utility command line to help you perform requests against a SCIM server, while validating input and response payloads. It also uses [scim2-tester](https://scim2-tester.readthedocs.io) to perform a [SCIM server compliance test](https://scim2-cli.readthedocs.io/en/latest/reference.html#scim-url-test).

{scim2_cli-0.6.0 → scim2_cli-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "scim2-cli"
-version = "0.6.0"
+version = "0.7.1"
 description = "SCIM application development CLI"
 readme = "README.md"
 keywords = [
@@ -16,11 +16,12 @@ keywords = [
 ]
 classifiers = [
     "Intended Audience :: Developers",
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
     "License :: OSI Approved :: Apache Software License",
     "Environment :: Web Environment",
@@ -30,8 +31,8 @@ classifiers = [
 requires-python = ">= 3.11"
 dependencies = [
     "click>=8.5.0",
-    "scim2-client[httpx2]>=0.13.2",
-    "scim2-tester>=0.5.1",
+    "scim2-client[httpx2]>=0.14.0",
+    "scim2-tester>=0.6.4",
     "sphinx-click-rst-to-ansi-formatter>=0.2.0",
     "pydanclick>=0.5.0",
     "pygments>=2.18.0",
@@ -161,6 +162,7 @@ env_list = [
     "py312",
     "py313",
     "py314",
+    "py315",
     "minversions",
     "doc",
     "bundle",

{scim2_cli-0.6.0 → scim2_cli-0.7.1}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "scim2-cli"
-version = "0.6.0"
+version = "0.7.1"
 description = "SCIM application development CLI"
 authors = [{name="Yaal Coop", email="contact@yaal.coop"}]
 license = {file = "LICENSE.md"}
@@ -12,11 +12,12 @@ readme = "README.md"
 keywords = ["scim", "scim2", "provisioning", "rfc7643", "rfc7644"]
 classifiers = [
     "Intended Audience :: Developers",
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
     "License :: OSI Approved :: Apache Software License",
     "Environment :: Web Environment",
@@ -27,8 +28,8 @@ classifiers = [
 requires-python = ">= 3.11"
 dependencies = [
     "click>=8.5.0",
-    "scim2-client[httpx2]>=0.13.2",
-    "scim2-tester>=0.5.1",
+    "scim2-client[httpx2]>=0.14.0",
+    "scim2-tester>=0.6.4",
     "sphinx-click-rst-to-ansi-formatter>=0.2.0",
     "pydanclick>=0.5.0",
     "pygments>=2.18.0",
@@ -148,6 +149,7 @@ env_list = [
     "py312",
     "py313",
     "py314",
+    "py315",
     "minversions",
     "doc",
     "bundle",

scim2_cli-0.7.1/scim2_cli/test.py

@@ -0,0 +1,124 @@
+import secrets
+import sys
+from collections import Counter
+
+import click
+from scim2_tester import Outcome
+from scim2_tester import Status
+from scim2_tester import iter_check_server
+from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
+
+from .utils import DOC_URL
+from .utils import Color
+from .utils import escape_control_characters
+
+OUTCOME_COLORS = {
+    Outcome.PASSED: Color.green,
+    Outcome.WARNING: Color.yellow,
+    Outcome.FAILED: Color.red,
+    Outcome.SKIPPED: Color.bright_black,
+}
+OUTCOME_LABELS = {
+    Outcome.PASSED: ("passed", "passed"),
+    Outcome.WARNING: ("warning", "warnings"),
+    Outcome.FAILED: ("failed", "failed"),
+    Outcome.SKIPPED: ("skipped", "skipped"),
+}
+STATUS_WIDTH = max(len(status.name) for status in Status)
+
+
+def summary(outcomes: Counter[Outcome], seed: int) -> str:
+    """Count the results of each outcome, in the order of the outcomes."""
+    counts = []
+    for outcome in Outcome:
+        count = outcomes[outcome]
+        if not count:
+            continue
+        singular, plural = OUTCOME_LABELS[outcome]
+        counts.append(f"{count} {plural if count > 1 else singular}")
+    return f"{', '.join(counts) or 'no checks ran'} (seed {seed})"
+
+
+@click.command(cls=make_rst_to_ansi_formatter(DOC_URL), name="test")
+@click.pass_context
+@click.option(
+    "-v",
+    "--verbose",
+    count=True,
+    help="Show every result with its reason. Pass it twice to also show the data.",
+)
+@click.option(
+    "--check-status-code/--dont-check-status-code",
+    is_flag=True,
+    default=True,
+    help="Fail on unexpected return codes.",
+)
+@click.option(
+    "--check-content-type/--dont-check-content-type",
+    is_flag=True,
+    default=True,
+    help="Fail on unexpected content types.",
+)
+@click.option(
+    "--strict",
+    is_flag=True,
+    help="Fail on deviations from the recommendations of the RFCs.",
+)
+@click.option(
+    "--seed",
+    type=int,
+    help="Send the same generated values as the run that printed this seed.",
+)
+def test_cli(
+    ctx: click.Context,
+    verbose: int,
+    check_status_code: bool,
+    check_content_type: bool,
+    strict: bool,
+    seed: int | None,
+) -> None:
+    """Perform a server SCIM compliance check using :doc:`scim2-tester <scim2_tester:index>`.
+
+    .. code-block:: bash
+
+         test
+    """
+    client = ctx.obj.client
+    client.check_response_status_codes = check_status_code
+    client.check_response_content_type = check_content_type
+    if seed is None:
+        seed = secrets.randbelow(2**32)
+    click.echo(f"Performing a SCIM compliance check on {client.client.base_url} ...")
+    results = iter_check_server(client, seed=seed)
+    failed = False
+    outcomes: Counter[Outcome] = Counter()
+    for result in results:
+        outcome = result.status.outcome
+        outcomes[outcome] += 1
+        if outcome is Outcome.FAILED or (strict and outcome is Outcome.WARNING):
+            failed = True
+        if not verbose and outcome in (Outcome.PASSED, Outcome.SKIPPED):
+            continue
+        status = click.style(
+            result.status.name.ljust(STATUS_WIDTH), fg=OUTCOME_COLORS[outcome]
+        )
+        label = " ".join(
+            escape_control_characters(part)
+            for part in (result.title, result.resource_type, result.attribute)
+            if part
+        )
+        click.echo(f"{status} {label}")
+
+        if result.reason:
+            click.echo(f"  {escape_control_characters(result.reason)}")
+        if verbose > 1 and result.data:
+            click.echo(f"  {escape_control_characters(result.data)}")
+
+    if failed:
+        color = Color.red
+    elif outcomes[Outcome.WARNING] or not outcomes:
+        color = Color.yellow
+    else:
+        color = Color.green
+    click.secho(summary(outcomes, seed), fg=color)
+    sys.exit(1 if failed else 0)

scim2_cli-0.6.0/scim2_cli/test.py

@@ -1,56 +0,0 @@
-import sys
-
-import click
-from scim2_tester import Status
-from scim2_tester import check_server
-from sphinx_click.rst_to_ansi_formatter import make_rst_to_ansi_formatter
-
-from .utils import DOC_URL
-from .utils import Color
-from .utils import escape_control_characters
-
-
-@click.command(cls=make_rst_to_ansi_formatter(DOC_URL), name="test")
-@click.pass_context
-@click.option("-v", "--verbose", is_flag=True, help="Enables verbose mode")
-@click.option(
-    "--check-status-code/--dont-check-status-code",
-    is_flag=True,
-    default=True,
-    help="Fail on unexpected return codes.",
-)
-@click.option(
-    "--check-content-type/--dont-check-content-type",
-    is_flag=True,
-    default=True,
-    help="Fail on unexpected content types.",
-)
-def test_cli(
-    ctx: click.Context, verbose: bool, check_status_code: bool, check_content_type: bool
-) -> None:
-    """Perform a server SCIM compliance check using :doc:`scim2-tester <scim2_tester:index>`.
-
-    .. code-block:: bash
-
-         test
-    """
-    client = ctx.obj.client
-    client.check_response_status_codes = check_status_code
-    client.check_response_content_type = check_content_type
-    results = check_server(client)
-    click.echo(f"Performing a SCIM compliance check on {client.client.base_url} ...")
-    success = True
-    for result in results:
-        if result.status == Status.SUCCESS:
-            status = click.style(result.status.name, fg=Color.green)
-        else:
-            status = click.style(result.status.name, fg=Color.red)
-            success = False
-        click.echo(f"{status} {escape_control_characters(result.title)}")
-
-        if result.reason:
-            click.echo(f"  {escape_control_characters(result.reason)}")
-            if verbose and result.data:
-                click.echo(f"  {escape_control_characters(result.data)}")
-
-    sys.exit(0 if success else 1)