Normalize $CARGO_HOME in license file path (sstadick#12)

* Normalize $CARGO_HOME in license file path

* update THIRDPARTY.yaml

* fix one clippy warning abs() -> unsigned_abs()

* ignore clippy lint regarding PartialEq derive without Eq

Cargo.toml

@@ -28,6 +28,8 @@ binary-dependencies = [ "anyhow", "env_logger", "structopt" ]
 anyhow = {version = "1.0.43", optional = true}
 cargo_metadata = "0.14.0"
 env_logger = {version = "0.9.0", optional = true}
+# https://doc.rust-lang.org/cargo/guide/cargo-home.html points to this for finding cargo home
+home = "0.5.3"
 itertools = "0.10.1"
 log = "0.4.14"
 regex = "1.5.4"

src/discovery.rs

@@ -53,7 +53,7 @@ fn compare(mut text_freq: HashMap<String, u32>, template_freq: &HashMap<String,
 
     for (word, &count) in template_freq {
         let text_count = text_freq.remove(word).unwrap_or(0);
-        let diff = ((text_count as i32) - (count as i32)).abs() as u32;
+        let diff = ((text_count as i32) - (count as i32)).unsigned_abs() as u32;
         errors += diff;
     }
 

src/finalized_license.rs

@@ -8,6 +8,7 @@ use crate::license::License;
 
 pub static LICENSE_NOT_FOUNT_TEXT: &str = "NOT FOUND";
 
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
 pub struct LicenseAndText {
     /// The license itself in SPDX format

src/found_license.rs

@@ -1,6 +1,6 @@
 //! A FoundLicense represents the raw form of the found parts of a license for a given package.
 
-use cargo_metadata::Package;
+use cargo_metadata::{camino::Utf8PathBuf, Package};
 use thiserror::Error;
 
 use crate::{
@@ -258,8 +258,20 @@ impl Licensed for Package {
             .as_ref()
             .and_then(|license| license.parse::<License>().ok())
             .or_else(|| {
-                self.license_file()
-                    .map(|p| License::File(p.into_std_path_buf()))
+                self.license_file().map(|license_file| {
+                    // If the license file starts with the cargo_home path, strip it and replace with the ENV var $CARGO_HOME.
+                    // This makes licenses comparable across machines.
+                    let license_file = if let Some(stripped_license_file) = home::cargo_home()
+                        .ok()
+                        .and_then(|cargo_home| license_file.strip_prefix(cargo_home).ok())
+                    {
+                        Utf8PathBuf::from("$CARGO_HOME").join(stripped_license_file)
+                    } else {
+                        // license file is not under $CARGO_HOME keep it as is
+                        license_file
+                    };
+                    License::File(license_file.into_std_path_buf())
+                })
             })
             .unwrap_or_default()
     }