Merge pull request #107 from pablodiegoss/master

Add Git info for user and version

Author: spenserblack

Diff for: src/info.rs

@@ -14,6 +14,8 @@ use crate::{AsciiArt, CommitInfo, Configuration, Error, InfoFieldOn};
 type Result<T> = std::result::Result<T, crate::Error>;
 
 pub struct Info {
+    git_version: String,
+    git_username: String,
     project_name: String,
     current_commit: CommitInfo,
     version: String,
@@ -40,7 +42,18 @@ impl std::fmt::Display for Info {
             Some(&c) => c,
             None => Color::White,
         };
-
+        if !self.disable_fields.git_info{
+            let git_info;
+            if self.git_username != "" {
+                git_info = format!("{} : {}", self.git_username, self.git_version);
+                write!(&mut buf, "{}{}", &self.get_formatted_info_label(&self.git_username, color), " : ")?;
+            } else {
+                git_info = self.git_version.clone();
+            }
+            write_buf(&mut buf, &self.get_formatted_info_label(&self.git_version, color), "")?;
+            let separator = "-".repeat(git_info.len());
+            write_buf(&mut buf, &self.get_formatted_info_label("", color), &separator)?;
+        }
         if !self.disable_fields.project {
             write_buf(&mut buf, &self.get_formatted_info_label("Project: ", color), &self.project_name)?;
         }
@@ -190,6 +203,7 @@ impl Info {
         bold_flag: bool,
     ) -> Result<Info> {
         let authors = Info::get_authors(&dir, 3);
+        let (git_v, git_user) = Info::get_git_info(&dir);
         let current_commit_info = Info::get_current_commit_info(&dir)?;
         let config = Info::get_configuration(&dir)?;
         let version = Info::get_version(&dir)?;
@@ -202,6 +216,8 @@ impl Info {
         let dominant_language = Language::get_dominant_language(languages_stats.clone());
 
         Ok(Info {
+            git_version: git_v,
+            git_username: git_user,
             project_name: config.repository_name,
             current_commit: current_commit_info,
             version,
@@ -266,6 +282,25 @@ impl Info {
         authors
     }
 
+    fn get_git_info(dir: &str) -> (String, String){
+        let version = Command::new("git")
+            .arg("--version")
+            .output()
+            .expect("Failed to execute git.");
+        let version = String::from_utf8_lossy(&version.stdout).replace('\n',"");
+
+        let username = Command::new("git")
+            .arg("-C")
+            .arg(dir)
+            .arg("config")
+            .arg("--get")
+            .arg("user.name")
+            .output()
+            .expect("Failed to execute git.");
+        let username = String::from_utf8_lossy(&username.stdout).replace('\n',"");
+        (version, username)
+    }
+
     fn get_current_commit_info(dir: &str) -> Result<CommitInfo> {
         let repo = Repository::open(dir).map_err(|_| Error::NotGitRepo)?;
         let head = repo.head().map_err(|_| Error::ReferenceInfoError)?;

Diff for: src/main.rs

@@ -38,6 +38,7 @@ type Result<T> = result::Result<T, Error>;
 
 #[derive(Default)]
 pub struct InfoFieldOn {
+    git_info:bool,
     project: bool,
     head: bool,
     version: bool,
@@ -55,6 +56,7 @@ pub struct InfoFieldOn {
 #[derive(PartialEq, Eq, EnumString, EnumCount, EnumIter, IntoStaticStr)]
 #[strum(serialize_all = "snake_case")]
 enum InfoFields {
+    GitInfo,
     Project,
     HEAD,
     Version,
@@ -193,6 +195,7 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
                 .unwrap_or(InfoFields::UnrecognizedField);
 
             match item {
+                InfoFields::GitInfo => disable_fields.git_info = true,
                 InfoFields::Project => disable_fields.project = true,
                 InfoFields::HEAD => disable_fields.head = true,
                 InfoFields::Version => disable_fields.version = true,