orchestra: pre-release WIP snapshot (orchestra-06g4wdj06g7fk00qf73z9ddbt4-920248b2)

scripts/orchestra_e2e_healthcheck.sh

@@ -76,7 +76,7 @@ emit() {
 # usage <format>: the --help body. Also the source check_usage_text_mentions_every_flag
 # reads, so the flag list has exactly one home.
 usage() {
-  emit "$1" 'Usage: %s [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\n' "${0##*/}"
+  emit "$1" 'Usage: %s [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks] [--sorted]\n\n' "${0##*/}"
   emit "$1" 'Healthcheck script for Orchestra E2E tests.\n'
   emit "$1" 'Exits 0 with a success message if all checks pass.\n'
   emit "$1" '  --quiet  Suppress the success message; still exits 0.\n'
@@ -86,6 +86,7 @@ usage() {
   emit "$1" '  --timing Print elapsed milliseconds for the run.\n'
   emit "$1" '  --strict Reject an unrecognised flag: exits 2.\n'
   emit "$1" '  --list-checks  Print the name of each check; exits 0.\n'
+  emit "$1" '  --sorted  With --list-checks, list the names alphabetically.\n'
   emit "$1" '\nChecks:\n'
   local name
   for name in $CHECKS; do
@@ -94,6 +95,12 @@ usage() {
   emit "$1" '\nVersion: %s\n' "$VERSION"
 }
 
+# sorted_checks: the check names, one per line, in alphabetical order.
+# LC_ALL=C keeps the order fixed if a name with a digit or capital is added.
+sorted_checks() {
+  printf '%s\n' $CHECKS | LC_ALL=C sort
+}
+
 main() {
   local start_us
   start_us=$(now_us)
@@ -103,16 +110,16 @@ main() {
   local timing=
   local strict=
   local unknown=
+  local list=
+  local sorted=
   for arg in "$@"; do
     if [ "$arg" = --help ]; then
       usage text
       exit 0
     elif [ "$arg" = --list-checks ]; then
-      local listed
-      for listed in $CHECKS; do
-        emit text '%s\n' "$listed"
-      done
-      exit 0
+      list=1
+    elif [ "$arg" = --sorted ]; then
+      sorted=1
     elif [ "$arg" = --quiet ]; then
       quiet=1
     elif [ "$arg" = --json ]; then
@@ -128,6 +135,15 @@ main() {
     fi
   done
 
+  if [ -n "$list" ]; then
+    if [ -n "$sorted" ]; then
+      sorted_checks
+    else
+      printf '%s\n' $CHECKS
+    fi
+    exit 0
+  fi
+
   if [ -n "$strict" ] && [ -n "$unknown" ]; then
     printf 'unknown flag: %s\n' "$unknown" >&2
     exit 2

scripts/test_healthcheck.sh

@@ -7,7 +7,7 @@ NAMES='repo_root_readable scripts_dir_present healthcheck_executable_bit
 selftest_present test_healthcheck_present readme_present
 no_crlf_line_endings no_tabs_in_scripts
 shebang_is_bash usage_text_mentions_every_flag'
-USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n  --quiet  Suppress the success message; still exits 0.\n  --json   Print a single-line JSON result; still exits 0.\n  --help   Print this usage text and exit 0.\n  --summary  Print one line per check before the success message.\n  --timing Print elapsed milliseconds for the run.\n  --strict Reject an unrecognised flag: exits 2.\n  --list-checks  Print the name of each check; exits 0.\n\nChecks:\n  repo_root_readable\n  scripts_dir_present\n  healthcheck_executable_bit\n  selftest_present\n  test_healthcheck_present\n  readme_present\n  no_crlf_line_endings\n  no_tabs_in_scripts\n  shebang_is_bash\n  usage_text_mentions_every_flag\n\nVersion: 1.0.0')"
+USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks] [--sorted]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n  --quiet  Suppress the success message; still exits 0.\n  --json   Print a single-line JSON result; still exits 0.\n  --help   Print this usage text and exit 0.\n  --summary  Print one line per check before the success message.\n  --timing Print elapsed milliseconds for the run.\n  --strict Reject an unrecognised flag: exits 2.\n  --list-checks  Print the name of each check; exits 0.\n  --sorted  With --list-checks, list the names alphabetically.\n\nChecks:\n  repo_root_readable\n  scripts_dir_present\n  healthcheck_executable_bit\n  selftest_present\n  test_healthcheck_present\n  readme_present\n  no_crlf_line_endings\n  no_tabs_in_scripts\n  shebang_is_bash\n  usage_text_mentions_every_flag\n\nVersion: 1.0.0')"
 fails=0
 
 check() { # check <expected-stdout> <label> [args...]
@@ -63,6 +63,16 @@ if [ "$listed" != "$want_listed" ]; then
   fails=$((fails + 1))
 fi
 
+# --sorted lists the names alphabetically, in either argument order.
+want_sorted=$(printf '%s\n' $NAMES | LC_ALL=C sort)
+for args in '--list-checks --sorted' '--sorted --list-checks'; do
+  sorted_out=$(bash "$HC" $args 2>/dev/null)
+  if [ "$sorted_out" != "$want_sorted" ]; then
+    printf 'FAIL: %s\n---got---\n%s\n---want---\n%s\n' "$args" "$sorted_out" "$want_sorted"
+    fails=$((fails + 1))
+  fi
+done
+
 # --summary prints one name: outcome line per check, then the success line.
 summary_out=$(bash "$HC" --summary 2>/dev/null)
 for name in $NAMES; do