Add hash to timeline

Author: mre

src/bin/analyzer/main.rs

@@ -10,9 +10,10 @@
 )]
 
 use anyhow::{Context, Result};
+use codeprints_analyzer::git;
+use codeprints_analyzer::Merger;
 use codeprints_analyzer::Parser;
 use codeprints_analyzer::Timeline;
-use codeprints_analyzer::{count_commits, Merger};
 use glob::glob;
 use std::fs;
 use structopt::StructOpt;
@@ -39,7 +40,7 @@ fn main() -> Result<()> {
             committer,
         } => {
             print!("Analyzing commits in current repository...");
-            let input = count_commits(&before, &after, author, committer).context(
+            let input = git::count_commits(&before, &after, author, committer).context(
                 "Cannot read project history. Make sure there is no typo in the command",
             )?;
             let mut parser = Parser::new(input);
@@ -51,7 +52,8 @@ fn main() -> Result<()> {
             }
             let timeline = parser.parse()?;
 
-            write(&timeline, "codeprints.json")?;
+            let sha = git::sha()?;
+            write(&timeline, &format!("codeprints_{}.json", sha))?;
         }
         Command::Merge {} => {
             // Find all `codeprints*.json` files in the current directory

src/git.rs

@@ -30,7 +30,7 @@ pub fn count_commits(
     Ok(commits)
 }
 
-// Parse a date from the git log
+/// Parse a date from the git log
 pub fn parse_date(line: &str) -> Result<Option<NaiveDate>> {
     if line.trim().is_empty() {
         // Empty lines are allowed, but skipped
@@ -39,3 +39,9 @@ pub fn parse_date(line: &str) -> Result<Option<NaiveDate>> {
     let date: NaiveDate = line.parse().context(format!("Invalid date {}", line))?;
     Ok(Some(date))
 }
+
+/// Get the current git commit sha
+pub fn sha() -> Result<String> {
+    let sha = cmd("git", &["rev-parse", "--short", "HEAD"]).read()?;
+    Ok(sha)
+}

src/lib.rs

@@ -12,13 +12,14 @@
     unused_qualifications
 )]
 
-mod git;
+/// Git helper functions
+pub mod git;
+
 mod merge;
 mod parser;
 mod quartiles;
 mod types;
 
-pub use crate::git::count_commits;
 pub use crate::merge::Merger;
 pub use crate::parser::Parser;
-pub use crate::types::Timeline as Timeline;
+pub use crate::types::Timeline;