refactor: refactor verify to get current user signature

cocogitto · Sep 12, 2020 · dad15d1 · dad15d1
1 parent a2b7098
commit dad15d1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/bin/cog.rs b/src/bin/cog.rs
@@ -188,7 +188,7 @@ fn main() -> Result<()> {
                 let subcommand = matches.subcommand_matches(VERIFY).unwrap();
                 let message = subcommand.value_of("message").unwrap();
 
-                match CocoGitto::verify(message) {
+                match cocogitto.verify(message) {
                     Ok(()) => exit(0),
                     Err(err) => {
                         eprintln!("{}", err);

diff --git a/src/hook.rs b/src/hook.rs
@@ -7,9 +7,9 @@ pub struct Hook {
     pub command: String,
 }
 
+// TODO
 impl Hook {
     pub(crate) fn run(&self) -> Result<()> {
-        todo!();
         let command_display = format!("`{}`", &self.command.green());
         println!("Running pre-version hook : {}", command_display);
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -59,6 +59,7 @@ impl CocoGitto {
         let changelog_path = settings
             .changelog_path
             .unwrap_or_else(|| PathBuf::from("CHANGELOG.md"));
+
         Ok(CocoGitto {
             repository,
             changelog_path,
@@ -180,18 +181,24 @@ impl CocoGitto {
         Ok(logs)
     }
 
-    pub fn verify(message: &str) -> Result<()> {
-        Commit::parse_commit_message(message).map(|commit_message| {
-            println!(
-                "{}",
-                Commit {
-                    shorthand: "not committed".to_string(),
-                    message: commit_message,
-                    author: " ".to_string(),
-                    date: Utc::now().naive_utc(),
-                }
-            )
-        })
+    pub fn verify(&self, message: &str) -> Result<()> {
+        let commit = Commit::parse_commit_message(message);
+
+        match commit {
+            Ok(message) => {
+                println!(
+                    "{}",
+                    Commit {
+                        shorthand: "not committed".to_string(),
+                        message,
+                        author: self.repository.get_author()?,
+                        date: Utc::now().naive_utc(),
+                    }
+                );
+                Ok(())
+            }
+            Err(err) => Err(err)
+        }
     }
 
     pub fn conventional_commit(

diff --git a/src/repository.rs b/src/repository.rs
@@ -172,6 +172,11 @@ impl Repository {
         Ok(commits)
     }
 
+    pub(crate) fn get_author(&self) -> Result<String> {
+        self.0.signature()?.name()
+            .map(|name| name.to_string())
+            .ok_or_else(|| anyhow!("Cannot get committer name"))
+    }
     fn tree_to_treeish<'a>(
         repo: &'a Git2Repository,
         arg: Option<&String>,