create Repo struct and migrate get_version

Author: o2sh

Diff for: src/main.rs

@@ -2,7 +2,7 @@
 #![recursion_limit = "1024"]
 #![cfg_attr(feature = "fail-on-deprecated", deny(deprecated))]
 
-use onefetch::{cli::Cli, cli_utils, error::*, git_utils, info};
+use onefetch::{cli::Cli, cli_utils, error::*, info, repo};
 
 use {
     process::{Command, Stdio},
@@ -21,7 +21,7 @@ fn run() -> Result<()> {
 
     let config = Cli::new()?;
 
-    if !git_utils::is_valid_repo(&config.repo_path)? {
+    if !repo::is_valid(&config.repo_path)? {
         return Err("please run onefetch inside of a non-bare git repository".into());
     }
 

Diff for: src/onefetch/git_utils.rs

@@ -1,10 +1,9 @@
 use {
     crate::onefetch::{
-        cli::Cli, commit_info::CommitInfo, deps, error::*, git_utils, language::Language,
-        license::Detector, text_color::TextColor,
+        cli::Cli, commit_info::CommitInfo, deps, error::*, language::Language, license::Detector,
+        repo::Repo, text_color::TextColor,
     },
     colored::{Color, ColoredString, Colorize},
-    git2::Repository,
     std::process::Command,
 };
 
@@ -83,7 +82,7 @@ impl std::fmt::Display for Info {
             )?;
         }
 
-        if !self.config.disabled_fields.version {
+        if !self.config.disabled_fields.version  && !self.version.is_empty(){
             writeln!(
                 f,
                 "{}{}",
@@ -211,19 +210,19 @@ impl std::fmt::Display for Info {
 
 impl Info {
     pub fn new(config: Cli) -> Result<Info> {
-        let repo = Repository::discover(&config.repo_path)?;
-        let workdir = git_utils::get_repo_work_dir(&repo)?;
-        let (repository_name, repository_url) = git_utils::get_repo_name_and_url(&repo)?;
-        let current_commit_info = git_utils::get_current_commit_info(&repo);
-        let pending = git_utils::get_pending_changes(&repo);
+        let repo = Repo::new(&config.repo_path)?;
+        let workdir = repo.get_work_dir()?;
+        let (repository_name, repository_url) = repo.get_name_and_url()?;
+        let current_commit_info = repo.get_current_commit_info();
+        let pending = repo.get_pending_changes();
+        let version = repo.get_version()?;
         let git_history = Info::get_git_history(&workdir, config.no_merges);
         let creation_date = Info::get_creation_date(&git_history);
         let number_of_commits = Info::get_number_of_commits(&git_history);
         let authors = Info::get_authors(&git_history, config.number_of_authors);
         let last_change = Info::get_date_of_last_commit(&git_history);
         let (number_of_tags, number_of_branches) = Info::get_number_of_tags_branches(&workdir);
         let (git_v, git_user) = Info::get_git_version_and_username(&workdir);
-        let version = Info::get_version(&workdir);
         let repo_size = Info::get_packed_size(&workdir);
         let project_license = Detector::new()?.get_project_license(&workdir);
         let dependencies = deps::DependencyDetector::new().get_dependencies(&workdir)?;
@@ -243,7 +242,7 @@ impl Info {
             git_username: git_user,
             project_name: repository_name,
             current_commit: current_commit_info?,
-            version: version?,
+            version,
             creation_date: creation_date?,
             dominant_language,
             languages: languages_stats,
@@ -357,25 +356,6 @@ impl Info {
         (version, username)
     }
 
-    fn get_version(dir: &str) -> Result<String> {
-        let output = Command::new("git")
-            .arg("-C")
-            .arg(dir)
-            .arg("describe")
-            .arg("--abbrev=0")
-            .arg("--tags")
-            .output()
-            .expect("Failed to execute git.");
-
-        let output = String::from_utf8_lossy(&output.stdout);
-
-        if output == "" {
-            Ok("??".into())
-        } else {
-            Ok(output.to_string().replace('\n', ""))
-        }
-    }
-
     fn get_number_of_commits(git_history: &[String]) -> String {
         let number_of_commits = git_history.len();
         number_of_commits.to_string()

Diff for: src/onefetch/info.rs

@@ -4,10 +4,10 @@ pub mod cli_utils;
 pub mod commit_info;
 pub mod deps;
 pub mod error;
-pub mod git_utils;
 pub mod image_backends;
 pub mod info;
 pub mod info_fields;
 pub mod language;
 pub mod license;
+pub mod repo;
 pub mod text_color;