mirror of
https://github.com/github/spec-kit.git
synced 2026-07-03 12:28:06 +08:00
3227b9660e
* fix: paths-only skips branch validation, setup-plan preserves existing plan (#2653) - check-prerequisites.sh/ps1: move branch validation after --paths-only early exit so --paths-only returns paths without requiring a spec branch - setup-plan.sh/ps1: skip template copy when plan.md already exists to prevent overwriting user-authored plans on reruns - setup-plan.sh: send status messages to stderr in --json mode so stdout remains parseable JSON - Add tests for both fixes (bash + PowerShell) * fix: remove trailing whitespace in PowerShell scripts * fix: route PS skip message to stderr in -Json mode, add PS JSON assertions Address review: setup-plan.ps1 Write-Output polluted stdout in -Json mode when plan.md already existed. Use [Console]::Error.WriteLine() when -Json is set. Add json.loads + stderr assertions to the PS rerun test to catch regressions. * fix: use Test-Path -PathType Leaf for plan existence check Bare Test-Path matches directories too, which would silently skip plan creation if a directory existed at the plan.md path.
92 lines
2.8 KiB
Bash
92 lines
2.8 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
set -e
|
|
|
|
# Parse command line arguments
|
|
JSON_MODE=false
|
|
ARGS=()
|
|
|
|
for arg in "$@"; do
|
|
case "$arg" in
|
|
--json)
|
|
JSON_MODE=true
|
|
;;
|
|
--help|-h)
|
|
echo "Usage: $0 [--json]"
|
|
echo " --json Output results in JSON format"
|
|
echo " --help Show this help message"
|
|
exit 0
|
|
;;
|
|
*)
|
|
ARGS+=("$arg")
|
|
;;
|
|
esac
|
|
done
|
|
|
|
# Get script directory and load common functions
|
|
SCRIPT_DIR="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
source "$SCRIPT_DIR/common.sh"
|
|
|
|
# Get all paths and variables from common functions
|
|
_paths_output=$(get_feature_paths) || { echo "ERROR: Failed to resolve feature paths" >&2; exit 1; }
|
|
eval "$_paths_output"
|
|
unset _paths_output
|
|
|
|
# If feature.json pins an existing feature directory, branch naming is not required.
|
|
if ! feature_json_matches_feature_dir "$REPO_ROOT" "$FEATURE_DIR"; then
|
|
check_feature_branch "$CURRENT_BRANCH" "$HAS_GIT" || exit 1
|
|
fi
|
|
|
|
# Ensure the feature directory exists
|
|
mkdir -p "$FEATURE_DIR"
|
|
|
|
# Copy plan template if plan doesn't already exist
|
|
if [[ -f "$IMPL_PLAN" ]]; then
|
|
if $JSON_MODE; then
|
|
echo "Plan already exists at $IMPL_PLAN, skipping template copy" >&2
|
|
else
|
|
echo "Plan already exists at $IMPL_PLAN, skipping template copy"
|
|
fi
|
|
else
|
|
TEMPLATE=$(resolve_template "plan-template" "$REPO_ROOT") || true
|
|
if [[ -n "$TEMPLATE" ]] && [[ -f "$TEMPLATE" ]]; then
|
|
cp "$TEMPLATE" "$IMPL_PLAN"
|
|
if $JSON_MODE; then
|
|
echo "Copied plan template to $IMPL_PLAN" >&2
|
|
else
|
|
echo "Copied plan template to $IMPL_PLAN"
|
|
fi
|
|
else
|
|
if $JSON_MODE; then
|
|
echo "Warning: Plan template not found" >&2
|
|
else
|
|
echo "Warning: Plan template not found"
|
|
fi
|
|
# Create a basic plan file if template doesn't exist
|
|
touch "$IMPL_PLAN"
|
|
fi
|
|
fi
|
|
|
|
# Output results
|
|
if $JSON_MODE; then
|
|
if has_jq; then
|
|
jq -cn \
|
|
--arg feature_spec "$FEATURE_SPEC" \
|
|
--arg impl_plan "$IMPL_PLAN" \
|
|
--arg specs_dir "$FEATURE_DIR" \
|
|
--arg branch "$CURRENT_BRANCH" \
|
|
--arg has_git "$HAS_GIT" \
|
|
'{FEATURE_SPEC:$feature_spec,IMPL_PLAN:$impl_plan,SPECS_DIR:$specs_dir,BRANCH:$branch,HAS_GIT:$has_git}'
|
|
else
|
|
printf '{"FEATURE_SPEC":"%s","IMPL_PLAN":"%s","SPECS_DIR":"%s","BRANCH":"%s","HAS_GIT":"%s"}\n' \
|
|
"$(json_escape "$FEATURE_SPEC")" "$(json_escape "$IMPL_PLAN")" "$(json_escape "$FEATURE_DIR")" "$(json_escape "$CURRENT_BRANCH")" "$(json_escape "$HAS_GIT")"
|
|
fi
|
|
else
|
|
echo "FEATURE_SPEC: $FEATURE_SPEC"
|
|
echo "IMPL_PLAN: $IMPL_PLAN"
|
|
echo "SPECS_DIR: $FEATURE_DIR"
|
|
echo "BRANCH: $CURRENT_BRANCH"
|
|
echo "HAS_GIT: $HAS_GIT"
|
|
fi
|
|
|