From 42d49b3e7a6e460dcfc5668573a9ea29a20b21e6 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 30 Sep 2026 20:27:41 +0200 Subject: [PATCH] chore: prepare 0.1.27-rc.3 --- .run_status.toml | 2 +- AGENTS.md | 6 +- CHANGELOG.md | 32 ++++++---- Cargo.lock | 62 +++++++++---------- Cargo.toml | 10 +-- README.md | 2 +- badges/version.svg | 2 +- crates/john-slop-core/src/config.rs | 4 +- docs/architecture.md | 2 +- docs/configuration.md | 7 ++- .../0004-supported-cargo-workspace.md | 4 +- docs/editors.md | 2 +- docs/experiments/crate-boundary.md | 2 +- docs/releasing.md | 4 +- fuzz/Cargo.lock | 10 +-- fuzz/Cargo.toml | 2 +- release.sh | 2 +- scripts/package-release.sh | 2 +- tasks.md | 28 ++++++++- tests/fixtures/evaluation/signoff.toml | 2 +- tests/workspace_contract.rs | 2 +- 21 files changed, 113 insertions(+), 76 deletions(-) diff --git a/.run_status.toml b/.run_status.toml index a27cbdf..8291ac7 100644 --- a/.run_status.toml +++ b/.run_status.toml @@ -5,7 +5,7 @@ coverage = 92.72 [last_run_clean.run_duration] secs = 63 -nanos = 4658149 +nanos = 266754653 [last_run_incremental] run_status = "Success" diff --git a/AGENTS.md b/AGENTS.md index f2dc334..7e5348d 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -148,9 +148,9 @@ The precedence from lowest to highest is: `crates/john-slop-core/assets/heuristics.toml`; 2. runtime diagnostic catalogs: the optional user-wide `diagnostics.toml`, then explicitly selected catalogs in command-line order; -3. user base config at `$XDG_CONFIG_HOME/john_slop/config.toml`, conventionally - `~/.config/john_slop/config.toml` on Linux; -4. named user config at `$XDG_CONFIG_HOME/john_slop/.toml` when a +3. user base config at `$XDG_CONFIG_HOME/john-slop/config.toml`, conventionally + `~/.config/john-slop/config.toml` on Linux; +4. named user config at `$XDG_CONFIG_HOME/john-slop/.toml` when a validated config name is selected; 5. an explicit `--config ` file; 6. explicit CLI flags for the current invocation. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bc2df8..9303da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ All notable changes to John Slop are recorded here. The format follows ## [Unreleased] +## [0.1.27-rc.3] - 2026-09-30 + +### Changed + +- Unified the root Cargo package, repository slug, release bundles, runtime + configuration directory, documentation, and Git remote around the canonical + `john-slop` spelling. Rust source continues to import the package as + `john_slop`, because Rust identifiers cannot contain hyphens. + ## [0.1.27-rc.2] - 2026-09-30 ### Fixed @@ -166,14 +175,15 @@ All notable changes to John Slop are recorded here. The format follows - Stdio LSP replacement diagnostics and versioned quick fixes. - Runnable examples, reviewed fixtures, fuzz targets, benchmarks, and CI gates. -[Unreleased]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.27-rc.2...HEAD -[0.1.27-rc.2]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.27-rc.1...v0.1.27-rc.2 -[0.1.27-rc.1]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.26...v0.1.27-rc.1 -[0.1.26]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.25...v0.1.26 -[0.1.25]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.24...v0.1.25 -[0.1.24]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.23...v0.1.24 -[0.1.23]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.22...v0.1.23 -[0.1.22]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.21...v0.1.22 -[0.1.21]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.20...v0.1.21 -[0.1.20]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/compare/v0.1.0...v0.1.20 -[0.1.0]: https://proxy.dandaedre.com/gitea/idle-org/john_slop/releases/tag/v0.1.0 +[Unreleased]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.3...HEAD +[0.1.27-rc.3]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.2...v0.1.27-rc.3 +[0.1.27-rc.2]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.1...v0.1.27-rc.2 +[0.1.27-rc.1]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.26...v0.1.27-rc.1 +[0.1.26]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.25...v0.1.26 +[0.1.25]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.24...v0.1.25 +[0.1.24]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.23...v0.1.24 +[0.1.23]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.22...v0.1.23 +[0.1.22]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.21...v0.1.22 +[0.1.21]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.20...v0.1.21 +[0.1.20]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.0...v0.1.20 +[0.1.0]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/releases/tag/v0.1.0 diff --git a/Cargo.lock b/Cargo.lock index 1e90bf4..5e3d603 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -698,37 +698,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] -name = "john-slop-core" -version = "0.1.27-rc.2" -dependencies = [ - "directories", - "figment", - "globset", - "miette", - "regex", - "serde", - "tempfile", - "thiserror", - "toml 1.1.6+spec-1.1.0", - "unicode-security", - "walkdir", - "zip", -] - -[[package]] -name = "john-slop-lsp" -version = "0.1.27-rc.2" -dependencies = [ - "john-slop-core", - "serde_json", - "thiserror", - "tokio", - "tower-lsp-server", -] - -[[package]] -name = "john_slop" -version = "0.1.27-rc.2" +name = "john-slop" +version = "0.1.27-rc.3" dependencies = [ "clap", "criterion", @@ -751,6 +722,35 @@ dependencies = [ "zip", ] +[[package]] +name = "john-slop-core" +version = "0.1.27-rc.3" +dependencies = [ + "directories", + "figment", + "globset", + "miette", + "regex", + "serde", + "tempfile", + "thiserror", + "toml 1.1.6+spec-1.1.0", + "unicode-security", + "walkdir", + "zip", +] + +[[package]] +name = "john-slop-lsp" +version = "0.1.27-rc.3" +dependencies = [ + "john-slop-core", + "serde_json", + "thiserror", + "tokio", + "tower-lsp-server", +] + [[package]] name = "libc" version = "0.2.189" diff --git a/Cargo.toml b/Cargo.toml index 720129f..c9f4a1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,11 +4,11 @@ default-members = [".", "crates/john-slop-core", "crates/john-slop-lsp"] resolver = "3" [workspace.package] -version = "0.1.27-rc.2" +version = "0.1.27-rc.3" edition = "2024" rust-version = "1.98.1" license = "MIT" -repository = "https://proxy.dandaedre.com/gitea/idle-org/john_slop" +repository = "https://proxy.dandaedre.com/gitea/idle-org/john-slop" [workspace.dependencies] clap = { version = "4.6.7", default-features = false, features = ["derive", "error-context", "help", "std", "suggestions", "usage"] } @@ -18,8 +18,8 @@ figment = { version = "0.10.19", default-features = false, features = ["toml"] } futures = { version = "0.3.34", default-features = false, features = ["std"] } globset = { version = "0.4.20", default-features = false } insta = { version = "1.48.0", default-features = false } -john-slop-core = { version = "0.1.27-rc.2", path = "crates/john-slop-core" } -john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.27-rc.2", path = "crates/john-slop-lsp" } +john-slop-core = { version = "0.1.27-rc.3", path = "crates/john-slop-core" } +john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.27-rc.3", path = "crates/john-slop-lsp" } miette = { version = "7.6.0", default-features = false, features = ["derive"] } regex = "1.13.1" serde = { version = "1.0.229", features = ["derive"] } @@ -40,7 +40,7 @@ zip = { version = "8.6.0", default-features = false, features = ["deflate-flate2 unsafe_code = "forbid" [package] -name = "john_slop" +name = "john-slop" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/README.md b/README.md index 2b211be..20625e4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ for human review; it does not prove AI authorship or identify a model. Rust 1.98.1 or newer is required. Install from the upstream Git repository: ```sh -cargo install --git https://proxy.dandaedre.com/gitea/idle-org/john_slop \ +cargo install --git https://proxy.dandaedre.com/gitea/idle-org/john-slop \ --locked --all-features ``` diff --git a/badges/version.svg b/badges/version.svg index 9290c09..07aff91 100644 --- a/badges/version.svg +++ b/badges/version.svg @@ -1 +1 @@ -version: 0.1.27-rc.2version0.1.27-rc.2 \ No newline at end of file +version: 0.1.27-rc.3version0.1.27-rc.3 \ No newline at end of file diff --git a/crates/john-slop-core/src/config.rs b/crates/john-slop-core/src/config.rs index 71a1b3f..c06eb3c 100644 --- a/crates/john-slop-core/src/config.rs +++ b/crates/john-slop-core/src/config.rs @@ -880,7 +880,7 @@ fn required( impl ConfigPaths { /// Resolve paths using the operating system's application-directory APIs. pub fn discover(name: Option<&ConfigName>, explicit: Option) -> Option { - let directory = ProjectDirs::from("com", "idle-org", "john_slop")? + let directory = ProjectDirs::from("com", "idle-org", "john-slop")? .config_dir() .to_owned(); Some(Self::in_directory(directory, name, explicit)) @@ -1504,7 +1504,7 @@ mod tests { #[test] fn config_paths_keep_named_files_inside_the_config_directory() { - let directory = PathBuf::from("/configuration-root/john_slop"); + let directory = PathBuf::from("/configuration-root/john-slop"); let name = "strict-mode".parse::().unwrap(); let paths = ConfigPaths::in_directory( directory.clone(), diff --git a/docs/architecture.md b/docs/architecture.md index 3a6b952..2eae2c5 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -20,7 +20,7 @@ The crate boundary separates dependency families: replacement planning, and presentation-neutral domain values; - `john-slop-lsp` owns asynchronous editor state and protocol conversion while depending only on `john-slop-core`; -- the root `john_slop` package re-exports both libraries to preserve its public +- the root `john-slop` package re-exports both libraries to preserve its public API and distributes the detector, formatter, and LSP binaries. The root manifest is intentionally both a package and the workspace root. A diff --git a/docs/configuration.md b/docs/configuration.md index fdfaeb7..68ca705 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -22,10 +22,15 @@ catalog accepts only `schema_version` and `[[rules]]`; unrelated settings are a configuration error rather than being silently applied from the wrong file. On Linux, the user directory conventionally resolves to -`~/.config/john_slop`. John Slop uses operating-system APIs rather than reading +`~/.config/john-slop`. John Slop uses operating-system APIs rather than reading `HOME` directly, so Windows and macOS receive their native application config directories. Run this to inspect the exact paths on the current machine: +The RC3 naming migration changes the former `john_slop` application directory +to `john-slop`. Move existing `config.toml`, named configurations, and +`diagnostics.toml` into the new directory before upgrading; the old directory +is no longer loaded automatically. + ```sh john-slop config paths ``` diff --git a/docs/decisions/0004-supported-cargo-workspace.md b/docs/decisions/0004-supported-cargo-workspace.md index 2e8f81e..9537182 100644 --- a/docs/decisions/0004-supported-cargo-workspace.md +++ b/docs/decisions/0004-supported-cargo-workspace.md @@ -7,7 +7,7 @@ The crate-boundary experiment extracted reusable analysis/configuration/input code into `john-slop-core` and LSP protocol state into `john-slop-lsp`, leaving -the root `john_slop` package as a compatibility facade and binary distribution. +the root `john-slop` package as a compatibility facade and binary distribution. Cold core and no-LSP builds used roughly 35–55% less CPU and disk, while LSP and whole-project builds were effectively unchanged. The experiment initially recommended waiting because three publishable packages require synchronized @@ -23,7 +23,7 @@ Adopt the three-package layout as the supported architecture: - `john-slop-core` owns embedded catalogs and reusable synchronous domain logic; - `john-slop-lsp` depends on core and owns protocol state/conversion; -- root `john_slop` remains the compatibility facade and owns all three binaries. +- root `john-slop` remains the compatibility facade and owns all three binaries. Keep the root manifest as both a package and the workspace root. Moving its sources under another directory solely to create a virtual manifest adds path, diff --git a/docs/editors.md b/docs/editors.md index f7766fa..afc4d32 100644 --- a/docs/editors.md +++ b/docs/editors.md @@ -71,7 +71,7 @@ Vim's native `formatprg` option is enough for formatting. Add this to `~/.vimrc`: ```vim -augroup john_slop_format +augroup john-slop-format autocmd! autocmd BufRead,BufNewFile *.txt setfiletype text autocmd FileType text,markdown,rust setlocal formatprg=john-slop-fmt diff --git a/docs/experiments/crate-boundary.md b/docs/experiments/crate-boundary.md index b416849..a252314 100644 --- a/docs/experiments/crate-boundary.md +++ b/docs/experiments/crate-boundary.md @@ -8,7 +8,7 @@ package boundary and accepted those measured costs; the durable policy is in ## Candidate design -The experiment keeps the root `john_slop` package as a compatibility facade and +The experiment keeps the root `john-slop` package as a compatibility facade and binary distribution. It moves reusable analysis into `john-slop-core`, moves protocol state into `john-slop-lsp`, and makes the facade's LSP dependency optional behind the default-enabled `lsp` feature. Existing default API paths diff --git a/docs/releasing.md b/docs/releasing.md index 43c6958..a9e815e 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -4,7 +4,7 @@ Releases are built from a clean, reviewed Linux checkout with the exact Rust toolchain recorded in `BUILD-INFO`. If publishing Rust packages, publish and verify `john-slop-core` first, -`john-slop-lsp` second, and the root `john_slop` facade last. All three versions +`john-slop-lsp` second, and the root `john-slop` facade last. All three versions must remain synchronized; path dependencies carry matching registry versions. Before publication, assemble all three crates in Cargo's dependency order with `scripts/package-workspace.sh --no-verify`. The flag is required until the @@ -51,7 +51,7 @@ then pass the path of a readable Gitea token file to the repository wrapper: ``` The wrapper keeps the token out of command-line arguments, exports it as -`GITEA_TOKEN` only to `rust_realease`, selects the `john_slop` workspace package, +`GITEA_TOKEN` only to `rust_realease`, selects the `john-slop` workspace package, and publishes raw binary artifacts. A hyphenated Cargo version such as `0.1.27-rc.2` automatically marks the Gitea release as a prerelease. Additional arguments are forwarded, so use `--dry-run` before publication and diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index ef1c2de..2171312 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -385,7 +385,7 @@ dependencies = [ [[package]] name = "john-slop-core" -version = "0.1.27-rc.2" +version = "0.1.27-rc.3" dependencies = [ "directories", "figment", @@ -403,7 +403,7 @@ dependencies = [ name = "john-slop-fuzz" version = "0.0.0" dependencies = [ - "john_slop", + "john-slop", "libfuzzer-sys", "tempfile", "toml 1.1.6+spec-1.1.0", @@ -411,7 +411,7 @@ dependencies = [ [[package]] name = "john-slop-lsp" -version = "0.1.27-rc.2" +version = "0.1.27-rc.3" dependencies = [ "john-slop-core", "serde_json", @@ -421,8 +421,8 @@ dependencies = [ ] [[package]] -name = "john_slop" -version = "0.1.27-rc.2" +name = "john-slop" +version = "0.1.27-rc.3" dependencies = [ "clap", "globset", diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 279007a..b06b519 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -8,7 +8,7 @@ edition = "2024" cargo-fuzz = true [dependencies] -john_slop = { path = "..", default-features = false, features = ["lsp"] } +john-slop = { path = "..", default-features = false, features = ["lsp"] } libfuzzer-sys = "0.4.13" tempfile = "3.27.0" toml = "1.1.6" diff --git a/release.sh b/release.sh index 1e9dd53..c647aab 100755 --- a/release.sh +++ b/release.sh @@ -33,7 +33,7 @@ manifest_version=$(sed -n 's/^version = "\([^"]*\)"/\1/p' "$repository_dir/Cargo set -- \ "$repository_dir" \ - --package john_slop \ + --package john-slop \ --artifact-format binary \ "$@" case "$manifest_version" in diff --git a/scripts/package-release.sh b/scripts/package-release.sh index 16cc37a..1c613bc 100755 --- a/scripts/package-release.sh +++ b/scripts/package-release.sh @@ -15,7 +15,7 @@ target_triple=$(rustc -vV | sed -n 's/^host: //p') source_date_epoch=$(git log -1 --format=%ct) export SOURCE_DATE_EPOCH="$source_date_epoch" -bundle_name="john_slop-${release_version}-${target_triple}" +bundle_name="john-slop-${release_version}-${target_triple}" bundle_dir="dist/${bundle_name}" archive_path="dist/${bundle_name}.tar.gz" diff --git a/tasks.md b/tasks.md index c876a4e..b4abc6e 100644 --- a/tasks.md +++ b/tasks.md @@ -347,7 +347,7 @@ become more complex. The complete measurements and adoption rationale are in ## Milestone 13 — Supported Cargo workspace - [x] Promote the experimental three-package layout to the supported project - architecture. Keep the root `john_slop` compatibility facade and binary + architecture. Keep the root `john-slop` compatibility facade and binary package as the workspace root; centralize shared package metadata, dependency versions, and lint policy with Cargo workspace inheritance while retaining per-package feature activation and optionality. @@ -608,7 +608,7 @@ metadata and binary versions agree on `0.1.23`. ## Milestone 24 — Runtime diagnostic catalogs -- [x] Load a dedicated `$CONFIG_DIR/john_slop/diagnostics.toml` before normal +- [x] Load a dedicated `$CONFIG_DIR/john-slop/diagnostics.toml` before normal configuration overrides, and accept repeatable explicit diagnostic catalogs. Restrict these files to schema metadata and `[[rules]]`, retain merge-by-ID, reject malformed/incomplete/duplicate definitions, and test precedence. @@ -722,7 +722,7 @@ configured audit and deny policies. ## Post-milestone release publishing - [x] Add a small `release.sh` wrapper that reads a Gitea token from a supplied - file, keeps it out of process arguments, and delegates the tagged `john_slop` + file, keeps it out of process arguments, and delegates the tagged `john-slop` release to `rust_realease` with optional arguments such as `--dry-run`. Acceptance: missing, unreadable, and empty token files fail before publication; @@ -766,6 +766,28 @@ RustSec, dependency policy, package assembly, exact binary versions, and 92.72% coverage passed. Cargo metadata, release links, and local origin now agree on the proxy endpoint; RC1 remains unchanged. +## Release candidate 0.1.27-rc.3 + +- [x] Rename the root Cargo package, upstream repository slug, release bundle, + runtime configuration directory, and user-facing documentation to the + canonical `john-slop` spelling. Retain underscores only where Rust identifier + syntax requires Cargo's code-level `john_slop` form. +- [x] Synchronize all release artifacts at `0.1.27-rc.3`, run the complete + quality and release gates, align local Git configuration with the renamed + upstream, and create immutable annotated tag `v0.1.27-rc.3`. + +Acceptance: every user-facing project, package, repository, configuration, and +artifact name uses `john-slop`; remaining `john_slop` occurrences are required +Rust identifiers or stable diagnostic namespaces; all gates pass and prior RC +tags remain unchanged before RC3 is tagged. + +Accepted on 2026-09-30: formatting, Clippy, all-feature and no-default-feature +tests, documentation, RustSec, dependency policy, package assembly, exact binary +versions, and 92.72% coverage passed. Cargo metadata and release artifacts use +`john-slop`; required Rust crate identifiers and stable diagnostic namespaces +retain underscores. The local origin is prepared for the renamed upstream, and +the earlier RC tags remain unchanged. + ## Deferred by design - Statistical or model-based authorship classification. diff --git a/tests/fixtures/evaluation/signoff.toml b/tests/fixtures/evaluation/signoff.toml index f8fe085..9a45006 100644 --- a/tests/fixtures/evaluation/signoff.toml +++ b/tests/fixtures/evaluation/signoff.toml @@ -1,5 +1,5 @@ schema_version = 1 -release = "0.1.27-rc.2" +release = "0.1.27-rc.3" reviewed_on = "2026-09-30" status = "accepted-with-runtime-catalog-boundary" catalog_sha256 = "da34ce00dfd2d801e772fa440d932abb98c929f5ad08ff3ad5e47e0ed4d84d5a" diff --git a/tests/workspace_contract.rs b/tests/workspace_contract.rs index 5a9234a..ce2d77e 100644 --- a/tests/workspace_contract.rs +++ b/tests/workspace_contract.rs @@ -88,7 +88,7 @@ fn workspace_members_and_resolved_versions_are_synchronized() { let locked_packages = lockfile["package"] .as_array() .expect("Cargo.lock package must be an array"); - for package_name in ["john_slop", "john-slop-core", "john-slop-lsp"] { + for package_name in ["john-slop", "john-slop-core", "john-slop-lsp"] { let package = locked_packages .iter() .find(|package| package["name"].as_str() == Some(package_name))