feat(git): Add functionality so commit command works

Author: cladam

src/cli.rs

@@ -1,20 +1,16 @@
-use anyhow::{Context, Result};
-use clap::{Command, CommandFactory, Parser, Subcommand};
-use colored::*;
-use std::io::Write;
-use thiserror::Error;
+use clap::Parser;
 
 /// A CLI to streamline your Git workflow for Trunk-Based Development
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 #[command(propagate_version = true)]
-struct Cli {
+pub struct Cli {
     #[command(subcommand)]
-    command: Commands,
+    pub command: Commands,
 }
 
 #[derive(clap::Subcommand, Debug)]
-enum Commands {
+pub(crate) enum Commands {
     /// Show the current Git status
     Status,
     /// Commits changes to the current branch or 'main' if no branch is checked out.

src/git.rs

@@ -1,16 +1,12 @@
 use std::process::{Command, Stdio};
 use thiserror::Error;
 use anyhow::{Context, Result};
-use colored::Colorize;
-use crate::git;
 
 // Using `thiserror` to create a structured error type.
 #[derive(Error, Debug)]
 pub enum GitError {
     #[error("Git command failed: {0}")]
     Git(String),
-    #[error("Working directory is not clean: {0}")]
-    DirectoryNotClean(String),
 }
 
 /// Runs a Git command with the specified subcommand and arguments.
@@ -31,16 +27,9 @@ fn run_git_command(command: &str, args: &[&str]) -> Result<String> {
     }
 }
 
-/// Checks if the git working directory is clean.
-pub fn is_working_directory_clean() -> Result<()> {
-    let output = run_git_command("status", &["--porcelain"])?;
-    if output.is_empty() {
-        Ok(())
-    } else {
-        Err(GitError::DirectoryNotClean(
-            "You have unstaged changes. Please commit or stash them first.".to_string()
-        ).into())
-    }
+/// Show the current status of the repository.
+pub fn status() -> Result<String> {
+    run_git_command("status", &["--short"])
 }
 
 /// Pull the latest changes with rebase.

src/main.rs

@@ -1,6 +1,30 @@
 mod cli;
 mod git;
+use clap::Parser;
+use colored::Colorize;
 
-fn main() {
-    println!("Hello, world!");
+fn main() -> anyhow::Result<()> {
+    let cli = cli::Cli::parse();
+    match cli.command {
+        cli::Commands::Status => {
+            println!("--- Checking Git status ---");
+            let status = git::status()?;
+            println!("{}", format!("Git Status:\n{}", status).green());
+        }
+        cli::Commands::Commit { r#type, scope, message} => {
+            println!("--- Committing changes ---");
+            let scope_part = scope.map_or("".to_string(), |s| format!("({})", s));
+            let header = format!("{}{}: {}", r#type, scope_part, message);
+            let commit_message = format!("{}", header);
+
+            println!("{}", format!("Commit message will be:\n---\n{}\n---", commit_message).blue());
+            // Stage changes first, before any other operations.
+            git::add_all()?;
+            git::pull_latest_with_rebase()?;
+            git::commit(&commit_message)?;
+            git::push()?;
+            println!("{}", "Successfully committed and pushed changes.".green());
+        }
+    }
+    Ok(())
 }