wip: add with_new for ergonomics

watchexec · Mar 9, 2024 · 397ed9e · 397ed9e
1 parent 3c1b517
commit 397ed9e
Show file tree

Hide file tree

Showing 3 changed files with 327 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ process-wrap = "6.0.0"
 use std::process::Command;
 use process_wrap::std::*;
 
-let mut child = StdCommandWrap::new(Command::new("watch").arg("ls"))
+let mut child = StdCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessGroup::leader())
   .spawn()?;
 let status = child.wait()?;
@@ -51,7 +51,7 @@ dbg!(status);
 use tokio::process::Command;
 use process_wrap::tokio::*;
 
-let mut child = TokioCommandWrap::new(Command::new("watch").arg("ls"))
+let mut child = TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessGroup::leader())
   .spawn()?;
 let status = child.wait().await?;
@@ -64,7 +64,7 @@ dbg!(status);
 use tokio::process::Command;
 use process_wrap::tokio::*;
 
-let mut child = TokioCommandWrap::new(Command::new("watch").arg("ls"))
+let mut child = TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(JobObject::new())
   .spawn()?;
 let status = child.wait().await?;
@@ -77,7 +77,7 @@ dbg!(status);
 use tokio::process::Command;
 use process_wrap::tokio::*;
 
-let mut child = TokioCommandWrap::new(Command::new("watch").arg("ls"))
+let mut child = TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessSession::leader())
   .spawn()?;
 let status = child.wait().await?;
@@ -90,7 +90,7 @@ dbg!(status);
 use tokio::process::Command;
 use process_wrap::tokio::*;
 
-let mut child = TokioCommandWrap::new(Command::new("watch").arg("ls"))
+let mut child = TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessSession)
   .wrap(KillOnDrop)
   .spawn()?;
@@ -113,15 +113,15 @@ dbg!(status);
 - Feature: `process-group` (default)
 
 ```rust
-TokioCommandWrap::new(Command::new("watch").arg("ls"))
+TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessGroup::leader())
   .spawn()?;
 ```
 
 Or join a different group instead:
 
 ```rust
-TokioCommandWrap::new(Command::new("watch").arg("ls"))
+TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessGroup::attach_to(pgid))
   .spawn()?;
 ```
@@ -138,7 +138,7 @@ This combines creating a new session and a new group, and setting this process a
 To join the session from another process, use `ProcessGroup::attach_to()` instead.
 
 ```rust
-TokioCommandWrap::new(Command::new("watch").arg("ls"))
+TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(ProcessSession)
   .spawn()?;
 ```
@@ -159,7 +159,7 @@ This is a shim to allow setting Windows process creation flags with this API, as
 Note the `CREATE_SUSPENDED` will always be set, as it is required for the crate to function.
 
 ```rust
-TokioCommandWrap::new(Command::new("watch").arg("ls"))
+TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(CreationFlags::NO_WINDOW | CreationFlags::DETACHED)
   .wrap(JobObject::new())
   .spawn()?;
@@ -168,7 +168,7 @@ TokioCommandWrap::new(Command::new("watch").arg("ls"))
 Or with custom flags:
 
 ```rust
-TokioCommandWrap::new(Command::new("watch").arg("ls"))
+TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(CreationFlags::custom(CREATE_NEW_CONSOLE | CREATE_PROTECTED_PROCESS))
   .wrap(JobObject::new())
   .spawn()?;
@@ -183,7 +183,7 @@ TokioCommandWrap::new(Command::new("watch").arg("ls"))
 This is a shim to allow wrappers to handle the kill-on-drop flag, as it can't be read from Command.
 
 ```rust
-let child = TokioCommandWrap::new(Command::new("watch").arg("ls"))
+let child = TokioCommandWrap::with_new("watch", |command| { command.arg("ls"); })
   .wrap(KillOnDrop)
   .wrap(ProcessGroup::leader())
   .spawn()?;

diff --git a/src/tokio/core.rs b/src/tokio/core.rs
@@ -1,5 +1,6 @@
 use std::{
 	any::TypeId,
+	ffi::OsStr,
 	future::Future,
 	io::{Error, Result},
 	process::ExitStatus,
@@ -20,7 +21,9 @@ pub struct TokioCommandWrap {
 }
 
 impl TokioCommandWrap {
-	pub fn new(command: Command) -> Self {
+	pub fn with_new(program: impl AsRef<OsStr>, init: impl FnOnce(&mut Command)) -> Self {
+		let mut command = Command::new(program);
+		init(&mut command);
 		Self {
 			command,
 			wrappers: IndexMap::new(),
@@ -41,14 +44,13 @@ impl TokioCommandWrap {
 		self
 	}
 
-	pub fn spawn(mut self) -> Result<Box<dyn TokioChildWrapper>> {
-		let mut command = self.command;
+	pub fn spawn(&mut self) -> Result<Box<dyn TokioChildWrapper>> {
 		for (id, wrapper) in &mut self.wrappers {
 			debug!(?id, "pre_spawn");
-			wrapper.pre_spawn(&mut command)?;
+			wrapper.pre_spawn(&mut self.command)?;
 		}
 
-		let mut child = command.spawn()?;
+		let mut child = self.command.spawn()?;
 		for (id, wrapper) in &mut self.wrappers {
 			debug!(?id, "post_spawn");
 			wrapper.post_spawn(&mut child)?;
@@ -64,6 +66,15 @@ impl TokioCommandWrap {
 	}
 }
 
+impl From<Command> for TokioCommandWrap {
+	fn from(command: Command) -> Self {
+		Self {
+			command,
+			wrappers: IndexMap::new(),
+		}
+	}
+}
+
 pub trait TokioCommandWrapper: std::fmt::Debug {
 	// process-wrap guarantees that `other` will be of the same type as `self`
 	// note that other crates that may use this trait should guarantee this, but