feat: customisable task entrypoint

Cargo.toml

@@ -41,3 +41,4 @@ tui = {version = "0.22.0", package = "ratatui"}
 url = "2.4.0"
 assert_cmd = "2.0.12"
 semver = "1.0.18"
+shlex = "1.1.0"

src/actors/command.rs

@@ -18,6 +18,8 @@ use std::{
     path::PathBuf,
 };
 
+use shlex;
+
 use crate::config::{
     pipe::{OutputRedirection, Pipe},
     Config, Task,
@@ -109,6 +111,7 @@ pub struct CommandActor {
     started_at: DateTime<Local>,
     env: Vec<(String, String)>,
     pipes: Vec<Pipe>,
+    entrypoint: Option<String>,
 }
 
 impl CommandActor {
@@ -164,6 +167,7 @@ impl CommandActor {
                 verbose,
                 env.into_iter().collect(),
                 task_pipes,
+                op.entrypoint.clone(),
             )
             .start();
 
@@ -187,6 +191,7 @@ impl CommandActor {
         verbose: bool,
         env: Vec<(String, String)>,
         pipes: Vec<Pipe>,
+        entrypoint: Option<String>,
     ) -> Self {
         Self {
             op_name,
@@ -203,6 +208,7 @@ impl CommandActor {
             started_at: Local::now(),
             env,
             pipes,
+            entrypoint,
         }
     }
 
@@ -250,17 +256,47 @@ impl CommandActor {
     fn reload(&mut self) -> Result<()> {
         let args = &self.operator.command;
 
-        self.log_debug(format!("EXEC: {} at {:?}", args, self.cwd));
-        self.console.do_send(PanelStatus {
-            panel_name: self.op_name.clone(),
-            status: None,
-        });
+        let default_entrypoint = {
+            #[cfg(not(target_os = "windows"))]
+            {"bash -c"}
+
+            #[cfg(target_os = "windows")]
+            {"cmd /c"}
+        };
+
+        let exec = {
+            let entrypoint_lex = match &self.entrypoint {
+                Some(e) => if !e.is_empty() { e.as_str() } else { default_entrypoint },
+                None => default_entrypoint,
+            };
+
+            let entrypoint_split = {
+                let mut s = shlex::split(entrypoint_lex).unwrap();
 
-        #[cfg(target_os = "windows")]
-        let exec = Exec::cmd("cmd").args(&["/c", args]);
+                match args {
+                    Some(a) => {
+                        s.push(a.to_owned());
+                        s
+                    },
+                    None => s,
+                }
+            };
 
-        #[cfg(not(target_os = "windows"))]
-        let exec = Exec::cmd("bash").args(&["-c", args]);
+            let entrypoint = &entrypoint_split[0];
+            let nargs: Vec<String> = entrypoint_split[1..]
+                .to_owned()
+                .into_iter()
+                .filter(|s| !s.is_empty())
+                .collect();
+
+            self.log_debug(format!("EXEC: {} {:?} at {:?}", entrypoint_lex, nargs, self.cwd));
+            self.console.do_send(PanelStatus {
+                panel_name: self.op_name.clone(),
+                status: None,
+            });
+
+            Exec::cmd(entrypoint).args(&nargs)
+        };
 
         let mut p = exec
             .cwd(&self.cwd)

src/config/mod.rs

@@ -37,7 +37,8 @@ impl<T: std::clone::Clone> Lift<T> {
 #[serde(deny_unknown_fields)]
 pub struct Task {
     pub workdir: Option<String>,
-    pub command: String,
+    pub command: Option<String>,
+    pub entrypoint: Option<String>,
 
     #[serde(default)]
     pub watch: Lift<String>,
@@ -397,7 +398,7 @@ mod tests {
             );
 
             let job_with_alias = config.ops.get("with_alias").unwrap();
-            assert_eq!(&job_with_alias.command, "echo with_alias");
+            assert_eq!(&job_with_alias.command.clone().unwrap(), "echo with_alias");
         }
     }
 

whiz.yaml

@@ -16,6 +16,10 @@ once:
         A: world
     command: "echo hello $A"
 
+entrypoint_only:
+    entrypoint: "ls ./src ./src/config"
+    command: ''
+
 once_b:
     command: "sleep 2 && echo $B"
     depends_on: once
@@ -35,6 +39,12 @@ sleep_count:
     depends_on:
         - once
 
+no_command:
+    entrypoint: python3 -c "print(\"No command specified\")"
+
+no_explicit_entrypoint:
+    command: echo "there's no entrypoint :("
+
 dodo:
     workdir: .
     watch: target
@@ -45,6 +55,14 @@ dodo:
 color:
     command: python3 -c 'print(u"\u001b[31mHelloWorld\u001b[0m")'
 
+color2:
+    command: 'print(u"\033[92mHello World\033[0m")'
+    entrypoint: 'python3 -c'
+
+what_shell:
+    command: echo $(which $0)
+    entrypoint: 'sh -c'
+
 watch_parent:
     workdir: src
     command: ls