diff --git a/src/main.rs b/src/main.rs index dc67c20..7eb78d4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -36,7 +36,5 @@ fn main() -> Result<()> { cli::Postgres::Import { path } => scripts::postgres::import(&path), cli::Postgres::Dump { path } => scripts::postgres::dump(&path), }, - }; - - Ok(()) + } } diff --git a/src/scripts/django.rs b/src/scripts/django.rs index 3bd4fec..96297ca 100644 --- a/src/scripts/django.rs +++ b/src/scripts/django.rs @@ -1,19 +1,20 @@ +use anyhow::Result; use std::path::PathBuf; -pub fn make_command(app: &PathBuf, command: &str) { +pub fn make_command(app: &PathBuf, command: &str) -> Result<()> { println!("{app:?} and {command:?}"); todo!() } -pub fn makemigrations() { +pub fn makemigrations() -> Result<()> { todo!() } -pub fn manage(command: &[String]) { +pub fn manage(command: &[String]) -> Result<()> { println!("{command:?}"); todo!() } -pub fn migrate() { +pub fn migrate() -> Result<()> { todo!() } -pub fn shell() { +pub fn shell() -> Result<()> { todo!() } diff --git a/src/scripts/docker.rs b/src/scripts/docker.rs index 34557ae..4d4f5b9 100644 --- a/src/scripts/docker.rs +++ b/src/scripts/docker.rs @@ -1,3 +1,5 @@ -pub fn stop_all() { +use anyhow::Result; + +pub fn stop_all() -> Result<()> { todo!() } diff --git a/src/scripts/docker_compose.rs b/src/scripts/docker_compose.rs index 7463bef..2d33571 100644 --- a/src/scripts/docker_compose.rs +++ b/src/scripts/docker_compose.rs @@ -1,34 +1,35 @@ use super::DockerCommand; +use anyhow::Result; // simple commands -pub fn build() { - DockerCommand::docker_compose().args("build").spawn_wait(); +pub fn build() -> Result<()> { + DockerCommand::docker_compose().args("build").spawn_wait() } -pub fn down() { - DockerCommand::docker_compose().args("down").spawn_wait(); +pub fn down() -> Result<()> { + DockerCommand::docker_compose().args("down").spawn_wait() } -pub fn start() { - DockerCommand::docker_compose().args("start").spawn_wait(); +pub fn start() -> Result<()> { + DockerCommand::docker_compose().args("start").spawn_wait() } -pub fn stop() { - DockerCommand::docker_compose().args("stop").spawn_wait(); +pub fn stop() -> Result<()> { + DockerCommand::docker_compose().args("stop").spawn_wait() } -pub fn up() { - DockerCommand::docker_compose().args("up -d").spawn_wait(); +pub fn up() -> Result<()> { + DockerCommand::docker_compose().args("up -d").spawn_wait() } // shortcuts -pub fn rebuild() { - stop(); - build(); - start(); +pub fn rebuild() -> Result<()> { + stop()?; + build()?; + start() } -pub fn restart() { - stop(); - start(); +pub fn restart() -> Result<()> { + stop()?; + start() } diff --git a/src/scripts/postgres.rs b/src/scripts/postgres.rs index 0fba88f..ff59148 100644 --- a/src/scripts/postgres.rs +++ b/src/scripts/postgres.rs @@ -1,11 +1,12 @@ +use anyhow::Result; use std::path::PathBuf; -pub fn import(path: &PathBuf) { +pub fn import(path: &PathBuf) -> Result<()> { println!("{path:?}"); todo!() } -pub fn dump(path: &PathBuf) { +pub fn dump(path: &PathBuf) -> Result<()> { println!("{path:?}"); todo!() }