Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all \x3Cpre>\x3Ccode> blocks (function() { function addCopyButtons() { document.querySelectorAll('pre code').forEach(function(codeBlock) { if (codeBlock.parentElement.hasAttribute('data-copy-added')) return; codeBlock.parentElement.setAttribute('data-copy-added', 'true'); var btn = document.createElement('button'); btn.textContent = 'Copy'; btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;'; btn.onmouseover = function() { this.style.opacity = '1'; }; btn.onmouseout = function() { this.style.opacity = '0.7'; }; btn.onclick = function() { navigator.clipboard.writeText(codeBlock.textContent).then(function() { btn.textContent = 'Copied!'; setTimeout(function() { btn.textContent = 'Copy'; }, 1500); }); }; codeBlock.parentElement.style.position = 'relative'; codeBlock.parentElement.appendChild(btn); }); } addCopyButtons(); // Re-run on dynamic content var observer = new MutationObserver(addCopyButtons); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); refactor(assert): group the assert_*.sh files into a src/assert/ module by Chemaclass · Pull Request #941 · TypedDevs/bashunit · GitHub
Skip to content

refactor(assert): group the assert_*.sh files into a src/assert/ module#941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chemaclass merged 1 commit into from
Aug 1, 2026
Merged

refactor(assert): group the assert_*.sh files into a src/assert/ module #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .claude/rules/architecture-map.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,9 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
| `env.sh` | all `BASHUNIT_*` defaults/config files, scratch dirs (`_BASHUNIT_RUN_OUTPUT_DIR` + EXIT-trap cleanup) |
| `parallel.sh` | worker temp tree, aggregation, stop-on-failure flag file |
| `console_header.sh` / `console_results.sh` | header/totals rendering, deferred failed/skipped/incomplete/risky blocks (scratch files under the run dir) |
| `assert*.sh` | assertions; `assertions.sh` re-exports; per-assertion path must stay fork-free |
| `assert/index.sh` | aggregator only — sources the `src/assert/` module below, plus `skip_todo.sh` and `test_doubles.sh` |
| `assert/core.sh` | `assert::should_skip`, `assert::fail_with`, `assert::join_to_slot` and the comparison assertions the other files build on |
| `assert/{arrays,assertions,dates,duration,files,folders,json,once,snapshot}.sh` | the per-topic assertions; the per-assertion path must stay fork-free |
| `clock.sh` | time impl selection (EPOCHREALTIME > date > perl > …), return-slot reads |
| `str.sh` / `math.sh` / `io.sh` / `globals.sh` | pure-bash utilities; `globals.sh` has `temp_file`/`temp_dir` (public test API) |
| `test_doubles.sh` | spy/mock state via `_BASHUNIT_SPY_*` globals + files |
Expand DownExpand Up@@ -102,7 +104,7 @@ shell (or, in parallel, in per-test `.result` files aggregated at the end).
- **The build flattens the source graph in DFS order** (`build.sh`
`build::process_file`): a file's body is emitted, *then* its `source` lines are
recursed into. That equals dev-mode order only if a module aggregator
(`src/<module>.sh`, e.g. `src/assertions.sh`) contains **nothing but `source`
(`src/<module>/index.sh`, ADR-010) contains **nothing but `source`
lines and comments** — any other top-level statement would run before its
dependencies in the built artifact but after them in dev mode. Files are
deduped by repo-relative path, so `src/` may hold module dirs and two files may
Expand Down
2 changes: 1 addition & 1 deletion bashunit
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ source "$BASHUNIT_ROOT_DIR/src/helpers.sh"
source "$BASHUNIT_ROOT_DIR/src/test_title.sh"
source "$BASHUNIT_ROOT_DIR/src/upgrade.sh"
source "$BASHUNIT_ROOT_DIR/src/watch.sh"
source "$BASHUNIT_ROOT_DIR/src/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/index.sh"
source "$BASHUNIT_ROOT_DIR/src/doc.sh"
source "$BASHUNIT_ROOT_DIR/src/reports/index.sh"
source "$BASHUNIT_ROOT_DIR/src/rerun.sh"
Expand Down
0 src/assert_arrays.sh → src/assert/arrays.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_assertions.sh → src/assert/assertions.sh
View file
Open in desktop
File renamed without changes.
0 src/assert.sh → src/assert/core.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_dates.sh → src/assert/dates.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_duration.sh → src/assert/duration.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_files.sh → src/assert/files.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_folders.sh → src/assert/folders.sh
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions src/assert/index.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

# Entry point for the src/assert/ module: only `source` lines and comments
# belong here. build.sh emits a file's body before recursing into its `source`
# lines, so any statement here would run before its dependencies in the built
# binary (adrs/adr-010-src-module-directories.md).
#
# core.sh first: the other files call its shared helpers (assert::should_skip,
# assert::fail_with, assert::join_to_slot).
source "$BASHUNIT_ROOT_DIR/src/assert/core.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/arrays.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/assertions.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/once.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/dates.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/duration.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/files.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/folders.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/json.sh"
source "$BASHUNIT_ROOT_DIR/src/assert/snapshot.sh"

# Not assertions, but part of the same public test surface the runner loads.
source "$BASHUNIT_ROOT_DIR/src/skip_todo.sh"
source "$BASHUNIT_ROOT_DIR/src/test_doubles.sh"
0 src/assert_json.sh → src/assert/json.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_once.sh → src/assert/once.sh
View file
Open in desktop
File renamed without changes.
0 src/assert_snapshot.sh → src/assert/snapshot.sh
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions src/assertions.sh
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions tests/unit/build_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,11 +95,11 @@ function test_build_embed_docs_fails_on_missing_markers() {
#
# Discovered by glob, never by a hand-maintained list: the previous list named
# src/assertions.sh and src/runner.sh, and src/coverage.sh was added in #928
# without being appended, so the rule silently stopped covering it. A module's
# aggregator is src/<module>/index.sh (ADR-010); src/assertions.sh is the one
# flat-file aggregator, which has no directory of its own.
# without being appended, so the rule silently stopped covering it. Every
# aggregator is now src/<module>/index.sh (ADR-010), so the glob covers them all
# -- src/assertions.sh was the last flat-file exception and became
# src/assert/index.sh in #940.
function build_aggregators() {
echo "src/assertions.sh"
local index
for index in "$ROOT_DIR"/src/*/index.sh; do
[ -f "$index" ] || continue
Expand All@@ -126,7 +126,7 @@ function test_module_aggregator_discovery_finds_every_module() {

assert_contains "src/runner/index.sh" "$found"
assert_contains "src/coverage/index.sh" "$found"
assert_contains "src/assertions.sh" "$found"
assert_contains "src/assert/index.sh" "$found"
}

function test_build_process_file_embeds_a_file_only_once() {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/completions_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function completions_expected_doc_flags() {
}

function completions_expected_assert_functions() {
grep -hoE '^function assert_[a-z_0-9]+' src/assert*.sh |
grep -hoE '^function assert_[a-z_0-9]+' src/assert/*.sh |
sed 's/^function //' | LC_ALL=C sort -u
}

Expand Down
Loading