pull ssl/ssh features from git2 + code cleanup

Author: o2sh

Cargo.lock

@@ -29,9 +29,12 @@ clap = "2.33.3"
 color_quant = "1.1.0"
 colored = "2.0.0"
 error-chain = "0.12"
-git2 = {version = "0.13.18", default-features = false}
+git2 = "0.13.18"
+hex = "0.4"
 image = "0.23.14"
+indicatif = "0.16"
 json = "0.12.4"
+md5 = "0.7"
 regex = "1.4.6"
 serde = "1.0.125"
 serde_json = "1.0.64"
@@ -41,9 +44,6 @@ term_size = "0.3.2"
 tokei = "12.1.2"
 toml = "0.5.8"
 yaml-rust = "0.4"
-md5 = "0.7"
-hex = "0.4"
-indicatif = "0.16"
 
 [target.'cfg(windows)'.dependencies]
 ansi_term = "0.12"

Cargo.toml

@@ -2,34 +2,12 @@
 #![recursion_limit = "1024"]
 #![cfg_attr(feature = "fail-on-deprecated", deny(deprecated))]
 
-use onefetch::{cli::Cli, cli_utils, error::*, info, printer::Printer, repo};
+use onefetch::{cli::Cli, cli_utils, error::*, info, printer::Printer};
 
 use std::{io, process};
 
 mod onefetch;
 
-fn get_repo(config: &Cli) -> Result<git2::Repository> {
-    let repo = if config.is_remote {
-        let temp_directory = std::env::temp_dir();
-        let repo_digest = md5::compute(&config.repo_path);
-        let mut repo_directory = temp_directory;
-        repo_directory.push("onefetch");
-        repo_directory.push(hex::encode(repo_digest.0));
-        if repo_directory.exists() {
-            git2::Repository::discover(repo_directory)?
-        } else {
-            repo::clone_remote(&config.repo_path, &repo_directory)?
-        }
-        
-    } else {
-        if !repo::is_valid(&config.repo_path)? {
-            return Err("please run onefetch inside of a non-bare git repository".into());
-        }
-        git2::Repository::discover(&config.repo_path)?
-    };
-    Ok(repo)
-}
-
 fn run() -> Result<()> {
     #[cfg(windows)]
     let _ = ansi_term::enable_ansi_support();
@@ -44,9 +22,7 @@ fn run() -> Result<()> {
         return cli_utils::print_supported_package_managers();
     }
 
-    let repo = get_repo(&config)?;
-
-    let info = info::Info::new(config, repo)?;
+    let info = info::Info::new(config)?;
 
     let mut printer = Printer::new(io::BufWriter::new(io::stdout()), info);
 

src/main.rs

@@ -1,10 +1,16 @@
 use {
     crate::onefetch::{
-        cli::Cli, cli_utils, commit_info::CommitInfo, error::*, language::Language,
-        license::Detector, package_managers::DependencyDetector, repo::Repo, text_color::TextColor,
+        cli::Cli,
+        cli_utils,
+        commit_info::CommitInfo,
+        error::*,
+        language::Language,
+        license::Detector,
+        package_managers::DependencyDetector,
+        repo::{get_repo, Repo},
+        text_color::TextColor,
     },
     colored::{Color, ColoredString, Colorize},
-    git2::Repository,
     serde::ser::SerializeStruct,
     serde::Serialize,
 };
@@ -208,8 +214,9 @@ impl std::fmt::Display for Info {
 }
 
 impl Info {
-    pub fn new(config: Cli, repo: Repository) -> Result<Info> {
+    pub fn new(config: Cli) -> Result<Info> {
         let git_version = cli_utils::get_git_version();
+        let repo = get_repo(config.is_remote, &config.repo_path)?;
         let internal_repo = Repo::new(&repo, config.no_merges)?;
         let (repo_name, repo_url) = internal_repo.get_name_and_url()?;
         let head_refs = internal_repo.get_head_refs()?;

src/onefetch/info.rs

@@ -267,9 +267,28 @@ impl<'a> Repo<'a> {
     }
 }
 
-pub fn clone_remote(url: &str, path: &std::path::PathBuf) -> Result<Repository> {
-    // I'm creating new scope for each option to avoid exposing mutable variables
+pub fn get_repo(is_remote: bool, repo_path: &str) -> Result<Repository> {
+    let repo = if is_remote {
+        let temp_directory = std::env::temp_dir();
+        let repo_digest = md5::compute(repo_path);
+        let mut repo_directory = temp_directory;
+        repo_directory.push("onefetch");
+        repo_directory.push(hex::encode(repo_digest.0));
+        if repo_directory.exists() {
+            Repository::discover(repo_directory)?
+        } else {
+            clone_remote(repo_path, &repo_directory)?
+        }
+    } else {
+        if !is_valid(repo_path)? {
+            return Err("please run onefetch inside of a non-bare git repository".into());
+        }
+        Repository::discover(repo_path)?
+    };
+    Ok(repo)
+}
 
+fn clone_remote(url: &str, path: &std::path::PathBuf) -> Result<Repository> {
     let progress_bar = ProgressBar::new(1);
     let progress_bar_style = ProgressStyle::default_bar()
         .template("{msg}\n{spinner:.green} [{elapsed}] [{wide_bar:.cyan/blue}] {pos}/{len}")
@@ -284,6 +303,7 @@ pub fn clone_remote(url: &str, path: &std::path::PathBuf) -> Result<Repository>
             progress_bar.set_position(v.received_objects() as u64);
             true
         });
+
         v
     };
 
@@ -302,7 +322,7 @@ pub fn clone_remote(url: &str, path: &std::path::PathBuf) -> Result<Repository>
     Ok(repository)
 }
 
-pub fn is_valid(repo_path: &str) -> Result<bool> {
+fn is_valid(repo_path: &str) -> Result<bool> {
     let repo = Repository::open_ext(repo_path, RepositoryOpenFlags::empty(), Vec::<&Path>::new());
     Ok(repo.is_ok() && !repo?.is_bare())
 }