mirror of
https://github.com/github/spec-kit.git
synced 2026-08-03 06:26:30 +08:00
* feat(scripts): port create-new-feature, setup-plan and setup-tasks to Python Ports the three core workflow scripts to Python as part of #3280, following the check-prerequisites PoC pattern from #3302. Adds resolve_template() to the shared common.py module and parity tests that run bash and Python side by side. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(tests): treat only None env as unset in parity run helper Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): fall back to directory scan on any registry error, skip hidden preset dirs Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(templates): add py: lines for setup_plan and setup_tasks Ships with the scripts they reference; the remaining templates got their py: lines in #3403. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: support py variant in skills placeholder resolver resolve_skill_placeholders only accepted sh/ps, so a py init option fell into the fallback path and {SCRIPT} rendered without an interpreter prefix. Accept py and prefix the resolved interpreter, matching process_template. Also guard ps_cmd against a missing PowerShell with a clear assert. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test: pin clean-error behavior for invalid --number Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs(scripts): reword unused-arg comment to match implementation The loop accepts and silently ignores extra positional args (it doesn't build a collected list); match the wording to what the code and setup-plan.sh actually do. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: fall back when configured script variant is missing from frontmatter Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): reject signed/whitespace --number values to match bash 10# parity The bash twin uses $((10#$BRANCH_NUMBER)), which rejects signed and whitespace-padded values. Python's int() accepted them (e.g. -1), producing a malformed -01-... prefix that sequential scans ignore. Restrict --number to unsigned decimal digits before conversion, and pin the parity with a bash-comparison test. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): complete Python port installation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(integrations): fall back for missing script variants Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * test: make Python script checks platform-aware Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix Windows Python command invocation parity Use PowerShell's call operator for spaced Python interpreter paths and align setup-tasks missing-template errors across script variants. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): preserve cross-platform Python parity Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: reject signed PowerShell feature numbers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): align feature number range Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): reject exhausted feature numbers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): complete create feature parity Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): align create feature outputs Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): harden cross-platform parity Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): keep truncation JSON clean Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): align setup failure parity Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): close parity edge cases Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): propagate PowerShell setup errors Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): harden fallback resolution Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): stabilize PowerShell fallbacks Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): complete setup-plan parity Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(cli): require runnable script fallbacks Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(cli): preserve shell fallback without preference Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): restore help and symlink parity - setup-tasks.ps1: check -Help before unknown-argument validation so '-Help --bogus' exits 0 like the Bash/Python variants - common.py: strip the repo root prefix lexically in persist_feature_json instead of resolve(), so a symlinked specs/ still persists the relative 'specs/NNN-name' path the Bash/PowerShell helpers store Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): align persist-hint quoting with shlex.quote - create-new-feature.sh: replace printf %q with a shell_quote helper that emits shlex.quote-identical output, so the persistence hints stay byte-identical between the Bash and Python variants (printf %q output also varies between bash versions) - promote the negative --number test to an all-variants parity test now that Bash and PowerShell reject signed values consistently - add a spaced-repo-path parity test for the persistence hints Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
134 lines
4.1 KiB
Python
134 lines
4.1 KiB
Python
"""Shared helpers for the core-script Python parity tests."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
|
BASH_DIR = PROJECT_ROOT / "scripts" / "bash"
|
|
PS_DIR = PROJECT_ROOT / "scripts" / "powershell"
|
|
PY_DIR = PROJECT_ROOT / "scripts" / "python"
|
|
|
|
HAS_PWSH = shutil.which("pwsh") is not None
|
|
WINDOWS_POWERSHELL = (
|
|
(shutil.which("powershell.exe") or shutil.which("powershell"))
|
|
if os.name == "nt"
|
|
else None
|
|
)
|
|
POWERSHELL_EXE = "pwsh" if HAS_PWSH else WINDOWS_POWERSHELL
|
|
HAS_POWERSHELL = POWERSHELL_EXE is not None
|
|
|
|
|
|
def make_repo(tmp_path: Path, name: str = "proj") -> Path:
|
|
repo = tmp_path / name
|
|
(repo / ".specify").mkdir(parents=True)
|
|
return repo
|
|
|
|
|
|
def install_scripts(repo: Path, script: str) -> None:
|
|
"""Install the bash/powershell/python twins of a kebab-case script name."""
|
|
py_name = script.replace("-", "_")
|
|
|
|
bash_dir = repo / ".specify" / "scripts" / "bash"
|
|
bash_dir.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy(BASH_DIR / "common.sh", bash_dir / "common.sh")
|
|
shutil.copy(BASH_DIR / f"{script}.sh", bash_dir / f"{script}.sh")
|
|
|
|
ps_dir = repo / ".specify" / "scripts" / "powershell"
|
|
ps_dir.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy(PS_DIR / "common.ps1", ps_dir / "common.ps1")
|
|
shutil.copy(PS_DIR / f"{script}.ps1", ps_dir / f"{script}.ps1")
|
|
|
|
py_dir = repo / ".specify" / "scripts" / "python"
|
|
py_dir.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy(PY_DIR / "common.py", py_dir / "common.py")
|
|
shutil.copy(PY_DIR / f"{py_name}.py", py_dir / f"{py_name}.py")
|
|
|
|
|
|
def bash_cmd(repo: Path, script: str, *args: str) -> list[str]:
|
|
return ["bash", str(repo / ".specify" / "scripts" / "bash" / f"{script}.sh"), *args]
|
|
|
|
|
|
def py_cmd(repo: Path, script: str, *args: str) -> list[str]:
|
|
py_name = script.replace("-", "_")
|
|
return [
|
|
sys.executable,
|
|
str(repo / ".specify" / "scripts" / "python" / f"{py_name}.py"),
|
|
*args,
|
|
]
|
|
|
|
|
|
def ps_cmd(repo: Path, script: str, *args: str) -> list[str]:
|
|
assert POWERSHELL_EXE, "no PowerShell available; guard the test with HAS_POWERSHELL"
|
|
return [
|
|
POWERSHELL_EXE,
|
|
"-NoProfile",
|
|
"-File",
|
|
str(repo / ".specify" / "scripts" / "powershell" / f"{script}.ps1"),
|
|
*args,
|
|
]
|
|
|
|
|
|
def clean_env() -> dict[str, str]:
|
|
env = os.environ.copy()
|
|
for key in list(env):
|
|
if key.startswith("SPECIFY_"):
|
|
env.pop(key)
|
|
return env
|
|
|
|
|
|
def run(
|
|
cmd: list[str], repo: Path, env: dict[str, str] | None = None
|
|
) -> subprocess.CompletedProcess[str]:
|
|
return subprocess.run(
|
|
cmd,
|
|
cwd=repo,
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
env=env if env is not None else clean_env(),
|
|
)
|
|
|
|
|
|
def json_stdout(result: subprocess.CompletedProcess[str]) -> object:
|
|
return json.loads(result.stdout)
|
|
|
|
|
|
def write_feature_json(
|
|
repo: Path, feature_directory: str = "specs/001-my-feature"
|
|
) -> None:
|
|
(repo / ".specify" / "feature.json").write_text(
|
|
json.dumps({"feature_directory": feature_directory}, separators=(",", ":"))
|
|
+ "\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
|
|
def normalize_repo_paths(text: str, repo: Path) -> str:
|
|
"""Replace the repo path with a placeholder so two-repo runs compare equal."""
|
|
repo_paths = sorted({str(repo), str(repo.resolve())}, key=len, reverse=True)
|
|
for repo_path in repo_paths:
|
|
text = text.replace(repo_path, "<REPO>")
|
|
return text.replace("\r\n", "\n")
|
|
|
|
|
|
def normalize_script_names(text: str, repo: Path, script: str) -> str:
|
|
"""Replace per-runtime script paths (argv[0] in usage/help output)."""
|
|
py_name = script.replace("-", "_")
|
|
bash_script = str(repo / ".specify" / "scripts" / "bash" / f"{script}.sh")
|
|
py_script = str(repo / ".specify" / "scripts" / "python" / f"{py_name}.py")
|
|
return text.replace(bash_script, "<SCRIPT>").replace(py_script, "<SCRIPT>")
|
|
|
|
|
|
def normalize_status_text(text: str) -> str:
|
|
return (
|
|
text.replace(" ✓ ", " [OK] ")
|
|
.replace(" ✗ ", " [FAIL] ")
|
|
.replace("\r\n", "\n")
|
|
)
|