Add basic tool management. (#27)

Foundation for running commands with locked tool versions.

Author: xStrom

.prep/prep.toml

@@ -1,3 +1,8 @@
 [project]
 name = "Prep"
 license = "Apache-2.0 OR MIT"
+
+[tools]
+rustup = "=1"
+rust = "=1.93"
+ripgrep = "=14.1.1"

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Added
 
+* `tools` command for tool management. ([#27] by [@xStrom])
+* `--strict` option to `clippy`, `copyright`, and `format` commands to use locked tool versions. ([#27] by [@xStrom])
+
 ## [0.2.0] - 2026-02-07
 
 ### Added
@@ -35,6 +38,7 @@
 [#22]: https://github.com/Nevermore/prep/pull/22
 [#23]: https://github.com/Nevermore/prep/pull/23
 [#24]: https://github.com/Nevermore/prep/pull/24
+[#27]: https://github.com/Nevermore/prep/pull/27
 
 [Unreleased]: https://github.com/Nevermore/prep/compare/v0.2.0...HEAD
 [0.2.0]: https://github.com/Nevermore/prep/compare/v0.1.0...v0.2.0

Cargo.lock

@@ -18,6 +18,7 @@ anyhow = "1.0.101"
 cargo_metadata = "0.23.1"
 clap = "4.5.57"
 regex = "1.12.3"
+semver = "1.0.27"
 serde = "1.0.228"
 time = "0.3.47"
 toml = "0.9.11"

Cargo.toml

@@ -23,6 +23,7 @@ anyhow.workspace = true
 cargo_metadata.workspace = true
 clap = { workspace = true, features = ["derive"] }
 regex.workspace = true
+semver.workspace = true
 serde = { workspace = true, features = ["derive"] }
 time.workspace = true
 toml.workspace = true

prep/Cargo.toml

@@ -9,9 +9,9 @@ use crate::session::Session;
 /// Can be ran in `extended` mode for more thorough checks.
 ///
 /// Set `fail_fast` to `false` to run the checks to the end regardless of failure.
-pub fn run(session: &Session, extended: bool, fail_fast: bool) -> anyhow::Result<()> {
+pub fn run(session: &mut Session, extended: bool, fail_fast: bool) -> anyhow::Result<()> {
     let mut errs: Vec<anyhow::Error> = Vec::new();
-    let mut step = |f: &dyn Fn() -> anyhow::Result<()>| -> anyhow::Result<()> {
+    let mut step = |f: &mut dyn FnMut() -> anyhow::Result<()>| -> anyhow::Result<()> {
         if let Err(e) = f() {
             if fail_fast {
                 return Err(e);
@@ -22,16 +22,16 @@ pub fn run(session: &Session, extended: bool, fail_fast: bool) -> anyhow::Result
     };
 
     //step(&|| copyright::run(session))?;
-    step(&|| format::run(session, true))?;
+    step(&mut || format::run(session, true, true))?;
 
     if extended {
         // We need to avoid --all-targets because it will unify dev and regular dep features.
-        step(&|| clippy::run(session, CargoTargets::Main, true))?;
-        step(&|| clippy::run(session, CargoTargets::Auxiliary, true))?;
+        step(&mut || clippy::run(session, true, CargoTargets::Main))?;
+        step(&mut || clippy::run(session, true, CargoTargets::Auxiliary))?;
     } else {
         // Slightly faster due to shared build cache,
         // but will miss unified feature bugs.
-        step(&|| clippy::run(session, CargoTargets::All, true))?;
+        step(&mut || clippy::run(session, true, CargoTargets::All))?;
     }
 
     if errs.is_empty() {

prep/src/cmd/ci.rs

@@ -5,14 +5,25 @@ use anyhow::{Context, ensure};
 
 use crate::cmd::CargoTargets;
 use crate::session::Session;
-use crate::tools::cargo;
+use crate::tools::cargo::{Cargo, CargoDeps};
 use crate::ui;
 
 /// Runs Clippy analysis on the given `targets`.
 ///
-/// In `strict` mode warnings are treated as errors.
-pub fn run(session: &Session, targets: CargoTargets, strict: bool) -> anyhow::Result<()> {
-    let mut cmd = cargo::new("")?;
+/// In `strict` mode warnings are treated as errors and Cargo version is locked.
+pub fn run(session: &mut Session, strict: bool, targets: CargoTargets) -> anyhow::Result<()> {
+    let mut cmd = if strict {
+        let tools_cfg = session.config().tools();
+        let rustup_ver_req = tools_cfg.rustup().clone();
+        let ver_req = tools_cfg.rust().clone();
+        let toolset = session.toolset();
+        let deps = CargoDeps::new(rustup_ver_req);
+        toolset.get::<Cargo>(&deps, &ver_req)?
+    } else {
+        let toolset = session.toolset();
+        let deps = CargoDeps::new(None);
+        toolset.get::<Cargo>(&deps, None)?
+    };
     let mut cmd = cmd
         .current_dir(session.root_dir())
         .arg("clippy")

prep/src/cmd/clippy.rs

@@ -14,11 +14,14 @@ use crate::ui::style::{ERROR, HEADER, LITERAL, NOTE};
 // TODO: Allow excluding files from the check
 
 /// Verify copyright headers.
-pub fn run(session: &Session) -> anyhow::Result<()> {
+///
+/// In `strict` mode ripgrep version is locked.
+pub fn run(session: &mut Session, _strict: bool) -> anyhow::Result<()> {
     let config = session.config();
     let project = config.project();
     let header_regex = header_regex(project.name(), project.license());
 
+    // TODO: Strict mode for ripgrep.
     let mut cmd = Command::new("rg");
     let cmd = cmd
         .current_dir(session.root_dir())

prep/src/cmd/copyright.rs

@@ -4,12 +4,25 @@
 use anyhow::{Context, ensure};
 
 use crate::session::Session;
-use crate::tools::cargo;
+use crate::tools::cargo::{Cargo, CargoDeps};
 use crate::ui;
 
-/// Format the workspace
-pub fn run(session: &Session, check: bool) -> anyhow::Result<()> {
-    let mut cmd = cargo::new("")?;
+/// Format the workspace.
+///
+/// In `strict` mode Cargo version is locked.
+pub fn run(session: &mut Session, strict: bool, check: bool) -> anyhow::Result<()> {
+    let mut cmd = if strict {
+        let tools_cfg = session.config().tools();
+        let rustup_ver_req = tools_cfg.rustup().clone();
+        let ver_req = tools_cfg.rust().clone();
+        let toolset = session.toolset();
+        let deps = CargoDeps::new(rustup_ver_req);
+        toolset.get::<Cargo>(&deps, &ver_req)?
+    } else {
+        let toolset = session.toolset();
+        let deps = CargoDeps::new(None);
+        toolset.get::<Cargo>(&deps, None)?
+    };
     let mut cmd = cmd.current_dir(session.root_dir()).arg("fmt").arg("--all");
     if check {
         cmd = cmd.arg("--check");

prep/src/cmd/format.rs

@@ -8,6 +8,7 @@ pub mod clippy;
 pub mod copyright;
 pub mod format;
 pub mod init;
+pub mod tools;
 
 /// Cargo targets.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, ValueEnum)]