invoke-toolkit 0.0.57__tar.gz → 0.0.58__tar.gz

{invoke_toolkit-0.0.57 → invoke_toolkit-0.0.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invoke-toolkit
-Version: 0.0.57
+Version: 0.0.58
 Summary: A set of extended APIs for PyInvoke for composable scripts, plugins and richer output
 Project-URL: Documentation, https://github.com/D3f0/invoke-toolkit#readme
 Project-URL: Issues, https://github.com/D3f0/invoke-toolkit/issues

{invoke_toolkit-0.0.57 → invoke_toolkit-0.0.58}/src/invoke_toolkit/extensions/tasks/create.py

@@ -65,7 +65,7 @@ def _get_template() -> str:
     script_template = dedent(rf"""
     #!/usr/bin/env -S uv run --script
     # /// script
-    # requires-python = ">=3.10"
+    # requires-python = ">=3.11"
     # dependencies = [
     #     "invoke-toolkit{version_for_template}",
     # ]
@@ -322,9 +322,9 @@ def package(
         template_data = {
             "package_name": actual_name,
             "package_slug": package_slug,
-            "collection_name": package_slug,
+            "collection_name": extension_short_name,
             "extension_short_name": extension_short_name,
-            "python_version": "3.10",
+            "python_version": "3.11",
         }
 
         run_copy(
@@ -342,9 +342,10 @@ def package(
             dedent(
                 f"""
                 [yellow]Next steps:[/yellow]
-                  cd {actual_name}
+                  cd {target_path}
                   uv sync
-                  uv pip install -e .
+                  # Test your package
+                  uv run --directory {target_path} -m invoke-toolkit -l
                 """
             ).strip()
         )

{invoke_toolkit-0.0.57 → invoke_toolkit-0.0.58}/templates/package-template/pyproject.toml.jinja

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "{{ package_name }}"
-dynamic = ["version"]
+version = "0.1.0"
 description = "{{ project_description }}"
 readme = "README.md"
 requires-python = ">={{ python_version }}"
@@ -17,9 +17,10 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
     "invoke-toolkit",  # Requires invoke-toolkit, any version
@@ -28,8 +29,5 @@ dependencies = [
 [project.entry-points."invoke_toolkit.collection"]
 "{{ extension_short_name }}" = "{{ package_slug }}:collection"
 
-[tool.hatch.version]
-path = "src/{{ package_slug }}/__init__.py"
-
 [tool.hatch.build.targets.wheel]
 packages = ["src/{{ package_slug }}"]

{invoke_toolkit-0.0.57 → invoke_toolkit-0.0.58}/tests/extensions/test_create.py

@@ -274,7 +274,7 @@ def _verify_python_requirement(lines):
     """Verify requires-python field exists and has correct value."""
     for line in lines:
         if "requires-python" in line:
-            assert ">=3.10" in line, f"Expected requires-python >=3.10, got: '{line}'"
+            assert ">=3.11" in line, f"Expected requires-python >=3.11, got: '{line}'"
             return
 
     raise AssertionError("requires-python field not found in metadata")
@@ -658,6 +658,144 @@ def test_package_uses_git_config_template(
     assert (pkg_dir / "pyproject.toml").exists(), "pyproject.toml should exist"
 
 
+def _assert_cli_examples_use_name(
+    short_name: str, pkg_dir: Path, package_slug: str
+) -> None:
+    """
+    Helper: asserts that the rendered README.md and __init__.py use ``short_name``
+    (the intk-visible collection name) in all CLI usage examples, and that no
+    raw Jinja placeholders leaked through.
+    """
+    # --- README.md checks ---
+    readme_path = pkg_dir / "README.md"
+    assert readme_path.exists(), "README.md was not generated"
+    readme = readme_path.read_text(encoding="utf-8")
+
+    assert f"collection named `{short_name}`" in readme, (
+        f"README should reference '{short_name}' in the collection listing sentence, "
+        f"but got:\n{readme}"
+    )
+    assert f"`{short_name}.hello`" in readme, (
+        f"README should reference '{short_name}' in the task list entry, "
+        f"but got:\n{readme}"
+    )
+    assert f"intk {short_name}.hello" in readme, (
+        f"README should reference '{short_name}' in the example command, "
+        f"but got:\n{readme}"
+    )
+    assert "{{ collection_name }}" not in readme, (
+        "Jinja variable {{ collection_name }} was not rendered in README.md"
+    )
+    assert "{{ package_name }}" not in readme, (
+        "Jinja variable {{ package_name }} was not rendered in README.md"
+    )
+
+    # --- __init__.py comment checks ---
+    init_path = pkg_dir / "src" / package_slug / "__init__.py"
+    assert init_path.exists(), "__init__.py was not generated"
+    init = init_path.read_text(encoding="utf-8")
+
+    assert f"intk {short_name}.hello" in init, (
+        f"__init__.py example comment should reference '{short_name}' for 'hello', "
+        f"but got:\n{init}"
+    )
+    assert f"intk {short_name}.my_task" in init, (
+        f"__init__.py example comment should reference '{short_name}' for 'my_task', "
+        f"but got:\n{init}"
+    )
+    assert f"intk {short_name}.tasks.hello" in init, (
+        f"__init__.py 'NOT' comment should reference '{short_name}' for nested 'tasks.hello', "
+        f"but got:\n{init}"
+    )
+    assert f"intk {short_name}.utils.my_task" in init, (
+        f"__init__.py 'NOT' comment should reference '{short_name}' for nested 'utils.my_task', "
+        f"but got:\n{init}"
+    )
+    assert "{{ collection_name }}" not in init, (
+        "Jinja variable {{ collection_name }} was not rendered in __init__.py"
+    )
+    assert "{{ package_name }}" not in init, (
+        "Jinja variable {{ package_name }} was not rendered in __init__.py"
+    )
+
+
+def test_template_cli_examples_use_collection_name_unprefixed(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+):
+    """
+    Regression test (non-prefixed package): verifies that the CLI usage examples
+    in README.md and __init__.py use the package slug as the collection name.
+
+    For a package named ``my-readme-pkg`` (no ``invoke-toolkit-`` prefix) the
+    intk-visible name is the full slug ``my_readme_pkg``.
+    """
+    import invoke_toolkit
+
+    invoke_toolkit_path = Path(invoke_toolkit.__file__).parent
+    default_template = (
+        invoke_toolkit_path.parent.parent / "templates" / "package-template"
+    )
+    if not default_template.exists():
+        pytest.skip("Default template not found in development setup")
+
+    monkeypatch.chdir(tmp_path)
+
+    package_name = "my-readme-pkg"
+    package_slug = package_name.replace("-", "_")
+    # Non-prefixed: collection_name == package_slug
+    expected_short_name = package_slug
+
+    x = TestingToolkitProgram()
+    x.run(["", "-x", "create.package", "--name", package_name])
+
+    _assert_cli_examples_use_name(
+        expected_short_name, tmp_path / package_name, package_slug
+    )
+
+
+def test_template_cli_examples_use_collection_name_prefixed(
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+):
+    """
+    Regression test (invoke-toolkit-prefixed package): verifies that the CLI
+    usage examples use only the short name after stripping the ``invoke-toolkit-``
+    prefix, not the full package name.
+
+    For ``--name my-pkg --ext-name myext`` the full package name becomes
+    ``invoke-toolkit-myext``, but intk exposes it as ``myext``.
+    """
+    import invoke_toolkit
+
+    invoke_toolkit_path = Path(invoke_toolkit.__file__).parent
+    default_template = (
+        invoke_toolkit_path.parent.parent / "templates" / "package-template"
+    )
+    if not default_template.exists():
+        pytest.skip("Default template not found in development setup")
+
+    monkeypatch.chdir(tmp_path)
+
+    ext_name = "myext"
+    full_package_name = f"invoke-toolkit-{ext_name}"
+    package_slug = full_package_name.replace("-", "_")
+    # Prefixed: collection_name == ext_name (the part after "invoke-toolkit-")
+    expected_short_name = ext_name
+
+    x = TestingToolkitProgram()
+    x.run(["", "-x", "create.package", "--name", "ignored", "--ext-name", ext_name])
+
+    pkg_dir = tmp_path / full_package_name
+    _assert_cli_examples_use_name(expected_short_name, pkg_dir, package_slug)
+
+    # Extra guard: the full package name must NOT appear as the collection name
+    readme = (pkg_dir / "README.md").read_text(encoding="utf-8")
+    assert f"intk {full_package_name}.hello" not in readme, (
+        "README must not use the full prefixed package name as the collection name"
+    )
+
+
 def test_package_template_priority_explicit_over_git_config(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/collection.py

@@ -0,0 +1,10 @@
+from invoke import Collection, ctask  # pylint: disable=no-name-in-module
+
+
+@ctask
+def go(c):
+    c.run("false")  # Ensures a kaboom if mocking fails
+
+
+ns = Collection(go)
+ns.configure({"run": {"echo": True}})

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/echo.yaml

@@ -0,0 +1,2 @@
+run:
+  echo: true

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/no-dedupe.yaml

@@ -0,0 +1,2 @@
+tasks:
+  dedupe: false

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/no-echo.yaml

@@ -0,0 +1,2 @@
+run:
+  echo: false

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/package/invoke.yml

@@ -0,0 +1,3 @@
+outer:
+  inner:
+    hooray: "package"

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/package/tasks/__init__.py

@@ -0,0 +1,6 @@
+from invoke import task
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "package"

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/runtime.py

@@ -0,0 +1,6 @@
+from invoke import task
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "yaml"

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/underscores/tasks.py

@@ -0,0 +1,6 @@
+from invoke import task
+
+
+@task
+def i_have_underscores(c):
+    pass

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/yaml/explicit.py

@@ -0,0 +1,9 @@
+from invoke import task, Collection
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "yaml"
+
+
+ns = Collection(mytask)

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/yaml/tasks.py

@@ -0,0 +1,6 @@
+from invoke import task
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "yaml"

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/yml/explicit.py

@@ -0,0 +1,9 @@
+from invoke import task, Collection
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "yml"
+
+
+ns = Collection(mytask)

invoke_toolkit-0.0.58/tests/original_invoke/_support/configs/yml/tasks.py

@@ -0,0 +1,6 @@
+from invoke import task
+
+
+@task
+def mytask(c):
+    assert c.outer.inner.hooray == "yml"

{invoke_toolkit-0.0.57 → invoke_toolkit-0.0.58}/tests/utils/test_fzf.py

@@ -633,17 +633,22 @@ def test_show_fzf_warning_only_shows_once(capsys):
     assert occurrences == 1
 
 
-def test_show_fzf_warning_respects_config(capsys):
+def test_show_fzf_warning_respects_config(capsys, caplog):
     """Test that warning can be disabled via config."""
-    ctx = Context()
-    ctx.config._config["fuzzy_finder"] = {"show_warnings": False}
+    import logging
 
-    # Reset the global warning flag
-    import invoke_toolkit.utils.fzf as fzf_module
+    # Suppress invoke's DEBUG log output so it doesn't leak into capsys.err
+    # when a root-level DEBUG handler is left active by earlier tests.
+    with caplog.at_level(logging.CRITICAL, logger="invoke"):
+        ctx = Context()
+        ctx.config._config["fuzzy_finder"] = {"show_warnings": False}
 
-    fzf_module._fzf_warning_shown = False
+        # Reset the global warning flag
+        import invoke_toolkit.utils.fzf as fzf_module
 
-    _show_fzf_warning(ctx, force_fallback=False)
+        fzf_module._fzf_warning_shown = False
+
+        _show_fzf_warning(ctx, force_fallback=False)
 
     # Should not output anything when warnings disabled
     captured = capsys.readouterr()