0.2.13 (#46)

* changes

* do not use glob mod path

* appease clippy

Author: lkurcak

Cargo.lock

@@ -2,7 +2,7 @@
 authors = ["Ľubomír Kurčák <[email protected]>"]
 name = "tend"
 description = "Quickly spin up/down groups of command-line tasks with automated recovery"
-version = "0.2.12"
+version = "0.2.13"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/lubomirkurcak/tend"
@@ -18,7 +18,7 @@ keywords = ["cli", "task", "automation", "recovery", "tend"]
 
 [dependencies]
 anyhow = "1.0.89"
-clap = { version = "4.5.18", features = ["derive"] }
+clap = { version = "4.5.20", features = ["derive"] }
 colored = "2.1.0"
 dirs-next = "2.0.0"
 folktime = "0.2.1"

Cargo.toml

@@ -116,6 +116,72 @@ pub enum Commands {
         #[arg(help = "Use -- to separate program arguments from job arguments.")]
         args: Vec<String>,
     },
+    #[command(about = "Enable jobs")]
+    Enable {
+        #[arg(help = "Name of the job to enable", exclusive = true)]
+        name: Option<String>,
+        #[arg(
+            short,
+            long,
+            help = "Enable all jobs",
+            conflicts_with = "group",
+            conflicts_with = "job"
+        )]
+        all: bool,
+        #[arg(
+            short,
+            long,
+            help = "Enable jobs from specific group(s)",
+            num_args = 1..,
+            conflicts_with = "all",
+            use_value_delimiter = true
+        )]
+        group: Vec<String>,
+        #[arg(
+            short,
+            long,
+            help = "Enable specific job(s)",
+            num_args = 1..,
+            conflicts_with = "all",
+            use_value_delimiter = true
+        )]
+        job: Vec<String>,
+        #[arg(alias = "except", short, long, help = "Exclude specific job(s)", num_args = 1.., use_value_delimiter = true)]
+        exclude: Vec<String>,
+    },
+    #[command(about = "Disable jobs")]
+    Disable {
+        #[arg(help = "Name of the job to disable", exclusive = true)]
+        name: Option<String>,
+        #[arg(
+            short,
+            long,
+            help = "Disable all jobs",
+            conflicts_with = "group",
+            conflicts_with = "job"
+        )]
+        all: bool,
+        #[arg(
+            short,
+            long,
+            help = "Disable jobs from specific group(s)",
+            num_args = 1..,
+            conflicts_with = "all",
+            use_value_delimiter = true
+        )]
+        group: Vec<String>,
+        #[arg(
+            short,
+            long,
+            help = "Disable specific job(s)",
+            num_args = 1..,
+            conflicts_with = "all",
+            use_value_delimiter = true
+        )]
+        job: Vec<String>,
+        #[arg(alias = "except", short, long, help = "Exclude specific job(s)", num_args = 1.., use_value_delimiter = true)]
+        exclude: Vec<String>,
+    },
     #[command(alias = "e", alias = "ed", about = "Edit a job")]
     Edit {
         #[arg(help = "Name of the job to edit")]

src/args.rs

@@ -3,7 +3,7 @@ use colored::{ColoredString, Colorize};
 pub trait Tend {
     fn thick(&self) -> ColoredString;
     fn job(&self) -> ColoredString;
-    fn program(&self) -> ColoredString;
+    // fn program(&self) -> ColoredString;
     fn time_value(&self) -> ColoredString;
     fn success(&self) -> ColoredString;
     fn failure(&self) -> ColoredString;
@@ -18,9 +18,7 @@ impl Tend for str {
         self.bold().cyan()
     }
 
-    fn program(&self) -> ColoredString {
-        self.bold().yellow()
-    }
+    // fn program(&self) -> ColoredString { self.bold().yellow() }
 
     fn time_value(&self) -> ColoredString {
         self.bold().yellow()

src/colors.rs

@@ -5,10 +5,10 @@ use serde::{Deserialize, Serialize};
 use super::Job;
 
 #[derive(PartialEq, Eq)]
-pub enum ControlFlow {
+pub enum ControlFlow<'a> {
     Nothing,
-    RestartCommand,
-    StopJob,
+    RestartCommand(&'a str),
+    StopJob(&'a str),
 }
 
 #[derive(Default, Debug, Clone, Serialize, Deserialize, clap::ValueEnum, Copy, PartialEq, Eq)]
@@ -63,14 +63,16 @@ pub enum Action {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Hook {
+    pub name: String,
     pub event: Event,
     pub action: Action,
 }
 
 impl Job {
-    pub fn stdout_line_callback(&self, line: &str, verbose: bool) -> ControlFlow {
-        for hook in self.event_hooks.values() {
+    pub fn stdout_line_callback<'a>(&'a self, line: &str, verbose: bool) -> ControlFlow<'a> {
+        for hook in &self.event_hooks {
             let Hook {
+                name,
                 event: Event::DetectSubstring { stream, contains },
                 action,
             } = hook;
@@ -86,18 +88,19 @@ impl Job {
                 }
 
                 return match action {
-                    Action::Restart => ControlFlow::RestartCommand,
-                    Action::Stop => ControlFlow::StopJob,
+                    Action::Restart => ControlFlow::RestartCommand(name),
+                    Action::Stop => ControlFlow::StopJob(name),
                 };
             }
         }
 
         ControlFlow::Nothing
     }
 
-    pub fn stderr_line_callback(&self, line: &str, verbose: bool) -> ControlFlow {
-        for hook in self.event_hooks.values() {
+    pub fn stderr_line_callback<'a>(&'a self, line: &str, verbose: bool) -> ControlFlow<'a> {
+        for hook in &self.event_hooks {
             let Hook {
+                name,
                 event: Event::DetectSubstring { stream, contains },
                 action,
             } = hook;
@@ -113,8 +116,8 @@ impl Job {
                 }
 
                 return match action {
-                    Action::Restart => ControlFlow::RestartCommand,
-                    Action::Stop => ControlFlow::StopJob,
+                    Action::Restart => ControlFlow::RestartCommand(name),
+                    Action::Stop => ControlFlow::StopJob(name),
                 };
             }
         }

src/job/event.rs

@@ -12,6 +12,23 @@ pub enum Filter {
 }
 
 impl Filter {
+    pub fn matches_name(&self, job_name: &str) -> bool {
+        match self {
+            Self::All { exclude } => !exclude.iter().any(|x| x == job_name),
+            Self::Subset {
+                groups: _,
+                jobs,
+                exclude,
+            } => {
+                if exclude.iter().any(|x| x == job_name) {
+                    return false;
+                }
+
+                jobs.iter().any(|x| x == job_name)
+            }
+        }
+    }
+
     pub fn matches(&self, job: &Job) -> bool {
         match self {
             Self::All { exclude } => !exclude.contains(&job.name),