Add auto_sudo feature

Cargo clippy

Cargo.toml

@@ -20,3 +20,8 @@ serde_derive = "1.0.117"
 serde_yaml = "0.8.13"
 clap = "3.0.0-beta.2"
 clap_generate = "3.0.0-beta.2"
+sudo = {version = "0.5.0", optional = true}
+
+[features]
+default = ["auto_sudo"]
+auto_sudo = ["sudo"]

README.md

@@ -6,7 +6,7 @@ The runit sv command rewritten in rust with nice new features.
 - Listing services
 - Custom timeout
 - Much cleaner code than the original sv command
-- Automatically use sudo (like yay) (Planned, not yet implemented)
+- Automatically use sudo if ran as user (feature: `auto_sudo`. Used by default)
 
 # Installation
 
@@ -83,4 +83,4 @@ sudo rsv start cupsd # start cupsd service (enable if service is disabled)
 # TODO
 - [x] Listing services
 - [x] Shell completion
-- [ ] Auto sudo
+- [x] Auto sudo

src/run.rs

@@ -15,7 +15,10 @@ pub fn run(app: &ArgMatches) -> Result<String, Box<dyn error::Error>> {
     // Get current subcommand
     let (subcommand, matches) = app
         .subcommand()
-        .ok_or("No subcommand provided".to_owned())?;
+        .ok_or_else(|| "No subcommand provided".to_owned())?;
+
+    #[cfg(feature = "auto_sudo")]
+    sudo::escalate_if_needed()?;
 
     if subcommand == "list" {
         return run_list_command(config, matches);
@@ -85,7 +88,7 @@ fn format_services(services: Vec<Service>) -> String {
             return format!("{}", err);
         }
 
-        s.push_str(format!("{}", item.format_status(status.unwrap())).as_str());
+        s.push_str(item.format_status(status.unwrap()).as_str());
     }
 
     s

src/sv/error.rs

@@ -49,7 +49,7 @@ impl Error {
             Error::ServiceAlreadyEnabled(name) => format!("Service '{}' already enabled", name),
             Error::ServiceAlreadyDisabled(name) => format!("Service '{}' already disabled", name),
             Error::IoError(err) => format!("{}", err),
-            Error::ForceKilled() => format!("killed"),
+            Error::ForceKilled() => "killed".to_string(),
         }
     }
 }

src/sv/service.rs

@@ -103,7 +103,7 @@ impl Service {
 
                 let service_uri = item.unwrap().file_name().into_string().unwrap();
 
-                if services.iter().find(|s| s.uri == service_uri).is_some() {
+                if services.iter().any(|s| s.uri == service_uri) {
                     continue;
                 }
 

src/sv/status.rs

@@ -53,15 +53,15 @@ impl ServiceState {
 
 impl ServiceStatus {
     pub fn no_state_available() -> ServiceStatus {
-        return ServiceStatus {
+        ServiceStatus {
             pid: 0,
             time: Duration::from_secs(0),
             state: ServiceState::Down,
             normallyup: false,
             paused: false,
             want: Wants::NoWant,
             term: false,
-        };
+        }
     }
 
     pub fn new(service: &Service, buff: [u8; 20]) -> Result<ServiceStatus, Error> {