From de5e6b4d10f3f748b4bc9505639ec0ce20035291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Jane=C5=BEi=C4=8D?= <janezic.mj@gmail.com>
Date: Sat, 27 May 2023 13:30:09 +0200
Subject: [PATCH] feat: rename commands and remove aliases in favour of
 completion

BREAKING CHANGE: changed commands as follows
D -> Docker
Dc -> Compose
Dj -> Django
Pg -> Postgres
---
 src/cli/ahab.rs           | 8 ++++----
 src/cli/django.rs         | 5 -----
 src/cli/docker.rs         | 1 -
 src/cli/docker_compose.rs | 7 -------
 src/cli/postgres.rs       | 2 --
 src/main.rs               | 8 ++++----
 src/scripts/django.rs     | 1 -
 7 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/cli/ahab.rs b/src/cli/ahab.rs
index d95b854..17f28c2 100644
--- a/src/cli/ahab.rs
+++ b/src/cli/ahab.rs
@@ -19,25 +19,25 @@ pub enum Commands {
     },
 
     /// Docker related subcommands
-    D {
+    Docker {
         #[command(subcommand)]
         command: Docker,
     },
 
     /// Docker compose related subcommands
-    Dc {
+    Compose {
         #[command(subcommand)]
         command: DockerCompose,
     },
 
     /// Docker compose related subcommands
-    Dj {
+    Django {
         #[command(subcommand)]
         command: Django,
     },
 
     /// Postgres related subcommands
-    Pg {
+    Postgres {
         #[command(subcommand)]
         command: Postgres,
     },
diff --git a/src/cli/django.rs b/src/cli/django.rs
index 44d312e..7626cfa 100644
--- a/src/cli/django.rs
+++ b/src/cli/django.rs
@@ -7,7 +7,6 @@ use clap::Parser;
 #[derive(Parser, Debug)]
 pub enum Django {
     /// Prepare empty management command 'command' in app 'app'.
-    #[clap(alias("mc"))]
     MakeCommand {
         #[arg(value_enum)]
         app: PathBuf,
@@ -16,24 +15,20 @@ pub enum Django {
     },
 
     /// Run Django's manage.py makemigrations.
-    #[clap(alias("mm"))]
     Makemigrations,
 
     /// Pass arguments to Django's manage.py.
-    #[clap(alias("m"))]
     Manage {
         #[arg(value_enum)]
         rest: Vec<String>,
     },
 
     /// Run Django's manage.py migrate.
-    #[clap(alias("mg"))]
     Migrate {
         #[arg(value_enum)]
         rest: Vec<String>,
     },
 
     /// Run Django's manage.py shell.
-    #[clap(alias("s"))]
     Shell,
 }
diff --git a/src/cli/docker.rs b/src/cli/docker.rs
index a9b80e2..3945c00 100644
--- a/src/cli/docker.rs
+++ b/src/cli/docker.rs
@@ -3,6 +3,5 @@ use clap::Parser;
 #[derive(Parser, Debug)]
 pub enum Docker {
     /// Stop all containers via `docker stop $(docker ps -q)`
-    #[clap(alias("sa"))]
     StopAll,
 }
diff --git a/src/cli/docker_compose.rs b/src/cli/docker_compose.rs
index 9ca500c..95b1615 100644
--- a/src/cli/docker_compose.rs
+++ b/src/cli/docker_compose.rs
@@ -6,30 +6,23 @@ use clap::Subcommand;
 #[derive(Subcommand, Debug)]
 pub enum DockerCompose {
     /// Build containers.
-    #[clap(alias("b"))]
     Build,
 
     /// Down containers.
-    #[clap(alias("d"))]
     Down,
 
     /// Stop, build and start containers.
-    #[clap(alias("rb"))]
     Rebuild,
 
     /// Stop and start containers.
-    #[clap(alias("rs"))]
     Restart,
 
     /// Start containers.
-    #[clap(alias("st"))]
     Start,
 
     /// Stop containers.
-    #[clap(alias("s"))]
     Stop,
 
     /// Up containers.
-    #[clap(alias("u"))]
     Up,
 }
diff --git a/src/cli/postgres.rs b/src/cli/postgres.rs
index 9808e6e..3a0b71f 100644
--- a/src/cli/postgres.rs
+++ b/src/cli/postgres.rs
@@ -5,14 +5,12 @@ use clap::Subcommand;
 #[derive(Subcommand, Debug)]
 pub enum Postgres {
     /// Import dump via pg_restore
-    #[clap(alias("i"))]
     Import {
         #[arg(value_enum)]
         path: PathBuf,
     },
 
     /// Dump via pg_dump with format=c
-    #[clap(alias("d"))]
     Dump {
         #[arg(value_enum)]
         path: PathBuf,
diff --git a/src/main.rs b/src/main.rs
index dbdcfb1..8a8a76b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,10 +22,10 @@ fn main() -> Result<()> {
             );
             Ok(())
         }
-        cli::Commands::D { command } => match command {
+        cli::Commands::Docker { command } => match command {
             cli::Docker::StopAll => scripts::docker::stop_all(),
         },
-        cli::Commands::Dc { command } => match command {
+        cli::Commands::Compose { command } => match command {
             cli::DockerCompose::Build => scripts::docker_compose::build(),
             cli::DockerCompose::Down => scripts::docker_compose::down(),
             cli::DockerCompose::Rebuild => scripts::docker_compose::rebuild(),
@@ -34,14 +34,14 @@ fn main() -> Result<()> {
             cli::DockerCompose::Stop => scripts::docker_compose::stop(),
             cli::DockerCompose::Up => scripts::docker_compose::up(),
         },
-        cli::Commands::Dj { command } => match command {
+        cli::Commands::Django { command } => match command {
             cli::Django::MakeCommand { app, name } => scripts::django::make_command(&app, &name),
             cli::Django::Makemigrations => scripts::django::makemigrations(),
             cli::Django::Manage { rest } => scripts::django::manage(&rest),
             cli::Django::Migrate { rest } => scripts::django::migrate(&rest),
             cli::Django::Shell => scripts::django::shell(),
         },
-        cli::Commands::Pg { command } => match command {
+        cli::Commands::Postgres { command } => match command {
             cli::Postgres::Import { path } => scripts::postgres::import(&path),
             cli::Postgres::Dump { path } => scripts::postgres::dump(&path),
         },
diff --git a/src/scripts/django.rs b/src/scripts/django.rs
index c423297..99c5b31 100644
--- a/src/scripts/django.rs
+++ b/src/scripts/django.rs
@@ -68,4 +68,3 @@ pub fn migrate(rest: &[String]) -> Result<()> {
 
     manage(&full_rest)
 }
-