more review changes

fix logic op and convert path to abs dir

Author: 2bndy5

cpp-linter/src/clang_tools/mod.rs

@@ -62,7 +62,7 @@ impl ClangTool {
         match version {
             RequestedVersion::Path(path_buf) => {
                 which_in(name, Some(path_buf), current_dir().unwrap())
-                    .map_err(|_| anyhow!("Could not find {name} by path"))
+                    .map_err(|_| anyhow!("Could not find {self} by path"))
             }
             // Thus, we should use whatever is installed and added to $PATH.
             RequestedVersion::SystemDefault | RequestedVersion::NoValue => {
@@ -77,7 +77,7 @@ impl ClangTool {
                 let mut it = req.comparators.iter();
                 let mut highest_major = it.next().map(|v| v.major).unwrap_or_default() + 1;
                 for n in it {
-                    if n.major < highest_major {
+                    if n.major > highest_major {
                         // +1 because we aren't checking the comparator's operator here.
                         highest_major = n.major + 1;
                     }
@@ -95,7 +95,7 @@ impl ClangTool {
 
                 // now we're ready to search for the binary exe with the major version suffixed.
                 for major in majors {
-                    if let Ok(cmd) = which(format!("{name}-{major}")) {
+                    if let Ok(cmd) = which(format!("{self}-{major}")) {
                         return Ok(cmd);
                     }
                 }
@@ -109,7 +109,7 @@ impl ClangTool {
                 // On Unix systems, this line is not likely reached. Typically, installing clang
                 // will produce a symlink to the executable with the major version appended to the
                 // name.
-                which(name).map_err(|_| anyhow!("Could not find {name} by version"))
+                which(name).map_err(|_| anyhow!("Could not find {self} by version"))
             }
         }
     }

cpp-linter/src/cli/structs.rs

@@ -5,7 +5,10 @@ use clap::{builder::PossibleValue, ValueEnum};
 use semver::VersionReq;
 
 use super::Cli;
-use crate::{clang_tools::clang_tidy::CompilationUnit, common_fs::FileFilter};
+use crate::{
+    clang_tools::clang_tidy::CompilationUnit,
+    common_fs::{normalize_path, FileFilter},
+};
 
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub enum RequestedVersion {
@@ -48,9 +51,20 @@ impl FromStr for RequestedVersion {
                     input
                 ));
             }
-            let path = path
-                .canonicalize()
-                .map_err(|e| anyhow!("Failed to canonicalize path '{input}': {e:?}"))?;
+            let path = if !path.is_dir() {
+                path.parent()
+                    .ok_or(anyhow!(
+                        "Unknown parent directory of the given file path for `--version`: {}",
+                        input
+                    ))?
+                    .to_path_buf()
+            } else {
+                path
+            };
+            let path = match path.canonicalize() {
+                Ok(p) => Ok(normalize_path(&p)),
+                Err(e) => Err(anyhow!("Failed to canonicalize path '{input}': {e:?}")),
+            }?;
             Ok(Self::Path(path))
         }
     }
@@ -292,6 +306,10 @@ impl Default for FeedbackInput {
 mod test {
     // use crate::cli::get_arg_parser;
 
+    use std::{path::PathBuf, str::FromStr};
+
+    use crate::{cli::RequestedVersion, common_fs::normalize_path};
+
     use super::{Cli, LinesChangedOnly, ThreadComments};
     use clap::{Parser, ValueEnum};
 
@@ -332,4 +350,19 @@ mod test {
             ThreadComments::Off
         );
     }
+
+    #[test]
+    fn validate_version_path() {
+        let this_path_str = "src/cli/structs.rs";
+        let this_path = PathBuf::from(this_path_str);
+        let this_canonical = this_path.canonicalize().unwrap();
+        let parent = this_canonical.parent().unwrap();
+        let expected = normalize_path(parent);
+        let req_ver = RequestedVersion::from_str(this_path_str).unwrap();
+        if let RequestedVersion::Path(parsed) = req_ver {
+            assert_eq!(&parsed, &expected);
+        }
+
+        assert!(RequestedVersion::from_str("file.rs").is_err());
+    }
 }