fix cargo clippy and go module parser and remove yarn logic

Author: o2sh

Diff for: CONTRIBUTING.md

@@ -121,7 +121,7 @@ pub enum PackageManager {
 fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
     match *self {
         // ...
-        PackageManager::Cargo => write!(f, "Cargo"),
+        PackageManager::Cargo => write!(f, "cargo"),
         // ...
     }
 }

Diff for: src/onefetch/deps/mod.rs

@@ -40,7 +40,7 @@ impl DependencyDetector {
         DependencyDetector { package_managers }
     }
 
-    pub fn get_deps_info(&self, dir: &str) -> Result<String> {
+    pub fn get_dependencies(&self, dir: &str) -> Result<String> {
         let deps = fs::read_dir(dir)
             .chain_err(|| "Could not read directory")?
             .filter_map(std::result::Result::ok)
@@ -58,19 +58,7 @@ impl DependencyDetector {
                     &self.package_managers[entry.file_name().unwrap().to_str().unwrap()];
                 let contents = fs::read_to_string(entry)?;
                 let number_of_deps = parser(&contents)?;
-                let used_package_manager;
-
-                // If a yarn.lock file is found and the current package manager
-                // is NPM, change the package manager to Yarn instead
-                if found_package_manager == &package_manager::PackageManager::Npm
-                    && std::path::Path::new(&format!("{}yarn.lock", dir)).exists()
-                {
-                    used_package_manager = &package_manager::PackageManager::Yarn;
-                } else {
-                    used_package_manager = found_package_manager;
-                }
-
-                Ok(format!("{} ({})", number_of_deps, used_package_manager))
+                Ok(format!("{} ({})", number_of_deps, found_package_manager))
             })
             .filter_map(Result::ok)
             .collect::<Vec<_>>();

Diff for: src/onefetch/deps/package_manager.rs

@@ -4,17 +4,15 @@ pub enum PackageManager {
     GoModules,
     Npm,
     Pip,
-    Yarn,
 }
 
 impl std::fmt::Display for PackageManager {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match *self {
-            PackageManager::Cargo => write!(f, "Cargo"),
-            PackageManager::GoModules => write!(f, "Go Modules"),
-            PackageManager::Npm => write!(f, "Npm"),
-            PackageManager::Pip => write!(f, "Pip"),
-            PackageManager::Yarn => write!(f, "Yarn"),
+            PackageManager::Cargo => write!(f, "cargo"),
+            PackageManager::GoModules => write!(f, "go modules"),
+            PackageManager::Npm => write!(f, "npm"),
+            PackageManager::Pip => write!(f, "pip"),
         }
     }
 }

Diff for: src/onefetch/deps/package_parser.rs

@@ -12,8 +12,22 @@ pub fn cargo(contents: &str) -> Result<usize> {
 }
 
 pub fn go_modules(contents: &str) -> Result<usize> {
-    let count = Regex::new(r"v[0-9]+")?.find_iter(contents).count()
-        - Regex::new(r"=>")?.find_iter(contents).count();
+    let mut count = 0;
+    let mut start = false;
+    for line in contents.lines() {
+        if line.contains("require") {
+            start = true;
+            continue;
+        }
+
+        if start && line.contains(')') {
+            break;
+        }
+
+        if start {
+            count += 1;
+        }
+    }
 
     Ok(count)
 }

Diff for: src/onefetch/info.rs

@@ -232,7 +232,7 @@ impl Info {
         let last_change = Info::get_date_of_last_commit(&git_history);
         let project_license = Detector::new()?.get_project_license(workdir_str);
         let dominant_language = Language::get_dominant_language(&languages_stats);
-        let dependencies = deps::DependencyDetector::new().get_deps_info(workdir_str)?;
+        let dependencies = deps::DependencyDetector::new().get_dependencies(workdir_str)?;
         let colors = Info::get_colors(
             &config.ascii_language,
             &dominant_language,