feat(task): Completed generation of tasks then runs all tasks

Author: Ozy-Viking

.vscode/settings.json

@@ -1,2 +1,3 @@
 {
-}
+  "rust-analyzer.cargo.features": []
+}

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "cargo-uv"
 authors = ["Zack Hankin <[email protected]>"]
-version = "0.7.0"
+version = "1.0.0-rc.1"
 edition = "2024"
 readme = "./README.md"
 description = "A simple Cargo tool for updating the version in your project."
@@ -28,7 +28,6 @@ thiserror = { version = "2" }
 indexmap = "2.10.0"
 
 [features]
-default = []
 unstable = []
 
 

Cargo.toml

@@ -10,204 +10,11 @@ fn main() -> Result<()> {
     setup_tracing(&cli_args)?;
 
     let packages = Packages::from(cli_args.get_metadata()?);
-    let _tasks = Tasks::generate_tasks(&mut cli_args, packages)?;
+    let mut tasks = Tasks::generate_tasks(&mut cli_args, packages)?;
 
-    // Exit early if display tasks
-    if cli_args.display_tasks() {
-        return Ok(());
-    }
+    tasks = tasks.run_all(&cli_args)?.join_all()?;
+    tracing::info!("Completed run, starting cleanup");
+    tasks.run_cleanup_tasks(&cli_args)?;
 
     exit!();
 }
-
-//     let root_dir = args.root_dir()?;
-//     let git = GitBuilder::new().root_directory(root_dir).build();
-
-//     let starting_branch = if args.git_branch().is_other() {
-//         Some(git.checkout(&args, args.git_branch(), Stash::Unstashed)?)
-//     } else {
-//         None
-//     };
-//     args.try_allow_dirty()?;
-
-//     let meta = args.get_metadata()?;
-//     let mut packages = Packages::from(meta);
-
-//     match args.action() {
-//         Action::Print => {
-//             let root_package = args.get_metadata()?.root_package().ok_or(miette::miette!(
-//                 help = "Use the tree action if in a workspace without a root package.",
-//                 "When printing, expected a root package."
-//             ))?;
-//             println!("{} {}", root_package.name, root_package.version);
-//             return Ok(());
-//         }
-//         Action::Tree => {
-//             println!("{}", packages.display_tree());
-//             return Ok(());
-//         }
-//         _ => (),
-//     }
-
-//     let (included, excluded) = args.workspace.partition_packages(&packages)?;
-
-//     ensure!(
-//         !included.is_empty(),
-//         help = "Check you are not excluding your root package without including others.",
-//         "No packages to modify. Excluded are: {:?}",
-//         excluded
-//             .iter()
-//             .map(|p| p.name().to_string())
-//             .collect::<Vec<_>>()
-//     );
-//     drop(excluded);
-
-//     let mut change_workspace_package_version = args.workspace_package(); // #40
-//     let mut tasks = Tasks::new();
-
-//     for package in included {
-//         if package.version_type() == VersionType::SetByWorkspace {
-//             change_workspace_package_version = true;
-//             tracing::info!(
-//                 "Changing Workspace Package Version due to: {}",
-//                 package.name()
-//             );
-//         } else {
-//             // TODO: Move to refs over cloning.
-//             let task = Task::from_action(
-//                 args.action(),
-//                 package.clone(),
-//                 args.pre.clone(),
-//                 args.build.clone(),
-//                 args.set_version.clone(),
-//                 args.force_version,
-//             )?;
-
-//             tasks.insert(task, None);
-//         }
-//     }
-
-//     if change_workspace_package_version {
-//         let task = match args.action() {
-//             Action::Pre | Action::Patch | Action::Minor | Action::Major => {
-//                 Some(Task::BumpWorkspace {
-//                     bump: args.action(),
-//                     pre: args.pre.clone(),
-//                     build: args.build.clone(),
-//                     force: args.force_version,
-//                 })
-//             }
-//             Action::Set => Some(Task::SetWorkspace {
-//                 version: args.set_version.clone().ok_or(miette::miette!(
-//                     "Expected a new version for Task::from_action when action is Set"
-//                 ))?,
-//             }),
-//             Action::Print | Action::Tree => None,
-//         };
-//         if let Some(t) = task {
-//             tasks.insert(t, None);
-//         }
-//     }
-//     // BUG: #43 Need to undo tasks on failure e.g. checkout, stash ...
-
-//     for mut task in tasks.version_change_tasks() {
-//         match &mut task {
-//             Task::Set {
-//                 version: new_version,
-//                 package,
-//             } => {
-//                 package.set_version(new_version.clone())?;
-//                 if !args.dry_run() {
-//                     package.write_cargo_file()?;
-//                 }
-//             }
-//             Task::Bump {
-//                 package,
-//                 bump,
-//                 pre,
-//                 build,
-//                 force,
-//             } => {
-//                 package.bump_version(*bump, pre.clone(), build.clone(), *force)?;
-//                 if !args.dry_run() {
-//                     package.write_cargo_file()?;
-//                 }
-//             }
-//             Task::BumpWorkspace {
-//                 bump,
-//                 pre,
-//                 build,
-//                 force,
-//             } => {
-//                 let workspace_package = packages.workspace_package().ok_or(miette!(
-//                     "1 or more packages are expecting there to be a workspace.package"
-//                 ))?;
-//                 Some(workspace_package.bump_version(*bump, pre.clone(), build.clone(), *force)?);
-//                 if !args.dry_run() {
-//                     workspace_package.write_cargo_file()?;
-//                 }
-//             }
-//             Task::SetWorkspace { version } => {
-//                 let workspace_package = packages.workspace_package().ok_or(miette!(
-//                     "1 or more packages are expecting there to be a workspace.package"
-//                 ))?;
-//                 Some(workspace_package.set_version(version.clone())?);
-//                 if !args.dry_run() {
-//                     workspace_package.write_cargo_file()?;
-//                 }
-//             }
-//             _ => unreachable!(),
-//         }
-//         tracing::info!("Complete: {task}");
-//         tasks.complete_task(&task);
-//     }
-
-//     let cargo = args.cargo()?;
-//     cargo.generate_lockfile(&args)?;
-
-//     if args.git_tag() {
-//         tracing::info!("Generating git tag");
-
-//         let new_version = packages.root_version()?;
-
-//         git.add_cargo_files()?;
-//         git.commit(&args, &new_version)?; // BUG: #26 Not handling the case when the message is set.
-//         git.tag(&args, &new_version, None)?;
-//         if args.git_push() {
-//             let gpjh = git.push(&args, &new_version).context("git push")?;
-//             tasks.append(gpjh);
-//         }
-//         // BUG: #2 Deletes tag before push so push fails.
-//         if args.dry_run() {
-//             let task = Task::DeleteGitTag(new_version);
-//             tasks.insert(task, None);
-//         }
-//     }
-
-//     if args.cargo_publish() {
-//         tasks.insert(
-//             cargo_uv::Task::Publish,
-//             Some(cargo.publish(&args).context("Cargo Publish")?),
-//         );
-//     }
-
-//     let tasks = match tasks.join_all() {
-//         Ok(ts) => ts,
-//         Err(e) => {
-//             tracing::warn!("Tasks errored, Completed tasks: {:?}", e.completed_tasks);
-//             tracing::warn!("Tasks with unknown status: {:?}", e.incomplete_tasks);
-//             return Err(e.into());
-//         }
-//     };
-
-//     if let Some(Task::DeleteGitTag(version)) = tasks.get_delete_tag() {
-//         let root_dir = args.root_dir()?;
-//         let git = GitBuilder::new().root_directory(root_dir).build();
-//         git.tag(&args, version, Some(vec!["--delete"]))?;
-//     };
-
-//     if let Some((branch, stash)) = starting_branch {
-//         git.checkout(&args, branch, stash)?;
-//     }
-//     Ok(())
-// }

src/bin/cargo_uv.rs

@@ -6,7 +6,7 @@ use std::{
 use miette::IntoDiagnostic;
 use tracing::{debug, instrument};
 
-use crate::{GitBuilder, cli::Cli};
+use crate::{Process, cli::Suppress};
 
 #[derive(Debug, Default)]
 pub struct Cargo {
@@ -34,33 +34,36 @@ impl Cargo {
         cargo
     }
 
-    pub fn publish(&self, cli_args: &Cli) -> miette::Result<Child> {
-        let mut cargo = self.command(cli_args.suppress.includes_cargo());
+    pub fn publish(
+        &self,
+        suppress: Suppress,
+        dry_run: bool,
+        no_verify: bool,
+        allow_dirty: bool,
+    ) -> miette::Result<Child> {
+        let mut cargo = self.command(suppress.includes_cargo());
         cargo.arg("publish");
-        if cli_args.dry_run() {
+        if dry_run {
             cargo.arg("--dry-run");
         }
-        let git = GitBuilder::new()
-            .root_directory(cli_args.root_dir()?)
-            .build();
-        git.dirty_files()?;
 
-        if cli_args.no_verify() {
+        if no_verify {
             cargo.arg("--no-verify");
         }
 
         // BUG: Be able to remove --allow-dirty #1
-        cargo.args(["--allow-dirty"]);
-        tracing::debug!("Running: {:?}", cargo);
-        cargo.spawn().into_diagnostic()
+        // cargo.args(["--allow-dirty"]);
+        if allow_dirty {
+            cargo.args(["--allow-dirty"]);
+        }
+        Process::Spawn.run(cargo)?.try_into_child()
     }
 
-    pub fn generate_lockfile(&self, _cli_args: &Cli) -> miette::Result<()> {
+    pub fn generate_lockfile(&self) -> miette::Result<()> {
         let mut cargo = self.command(true);
         cargo.arg("generate-lockfile");
 
-        tracing::debug!("Running: {:?}", cargo);
-        let output = cargo.output().into_diagnostic()?;
+        let output = Process::Output.run(cargo)?.try_into_output()?;
         if !output.status.success() {
             Err(
                 miette::miette!("{}", String::from_utf8(output.stderr).into_diagnostic()?)

src/cargo.rs

@@ -270,6 +270,10 @@ impl Cli {
         self.set_version.clone()
     }
 
+    pub fn suppress(&self) -> Suppress {
+        self.suppress
+    }
+
     // /// Partition workspace members into those selected and those excluded.
     // ///
     // /// Notes:

src/cli/cli.rs

@@ -29,23 +29,23 @@ impl Branch {
         matches!(self, Self::Current)
     }
 
-    /// Returns `true` if the branch is [`Other`].
+    /// Returns `true` if the branch is [`Named`].
     ///
-    /// [`Other`]: Branch::Other
+    /// [`Named`]: Branch::Named
     #[must_use]
-    pub fn is_other(&self) -> bool {
+    pub fn is_named(&self) -> bool {
         matches!(self, Self::Named { .. })
     }
 
-    pub fn as_other(&self) -> Option<&String> {
+    pub fn as_named(&self) -> Option<&String> {
         if let Self::Named { local } = self {
             Some(local)
         } else {
             None
         }
     }
 
-    pub fn try_into_other(self) -> Result<String, Self> {
+    pub fn try_into_named(self) -> Result<String, Self> {
         if let Self::Named { local } = self {
             Ok(local)
         } else {