gitronics 0.5.23__tar.gz → 0.5.24__tar.gz

{gitronics-0.5.23 → gitronics-0.5.24}/Cargo.lock

@@ -390,7 +390,7 @@ dependencies = [
 
 [[package]]
 name = "gitronics"
-version = "0.5.23"
+version = "0.5.24"
 dependencies = [
  "chrono",
  "clap",
@@ -401,6 +401,7 @@ dependencies = [
  "log",
  "logtest",
  "migjorn",
+ "path-clean",
  "pyo3",
  "rayon",
  "regex",
@@ -672,6 +673,12 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
+[[package]]
+name = "path-clean"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"

{gitronics-0.5.23 → gitronics-0.5.24}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gitronics"
-version = "0.5.23"
+version = "0.5.24"
 edition = "2024"
 description = "Build MCNP neutronics models from modular components"
 license = "EUPL-1.2"
@@ -30,6 +30,7 @@ clap = { version = "4.6.1", features = ["derive"] }
 indexmap = { version = "2.14.0", features = ["serde"] }
 git2 = "0.21.0"
 dunce = "1.0.5"
+path-clean = "1.0.1"
 
 [dev-dependencies]
 tempfile = "3.0"

{gitronics-0.5.23 → gitronics-0.5.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitronics
-Version: 0.5.23
+Version: 0.5.24
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{gitronics-0.5.23 → gitronics-0.5.24}/src/utils.rs

@@ -7,6 +7,7 @@
 
 use crate::types::{EnvelopeName, FileName, FillerName};
 use log::LevelFilter;
+use path_clean::PathClean;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::io;
@@ -90,11 +91,15 @@ pub enum GitronicsError {
 
 impl GitronicsError {
     pub fn io_path(path: impl AsRef<Path>, source: io::Error) -> Self {
+        let path_ref = path.as_ref();
+
+        let cleaned_path = dunce::canonicalize(path_ref)
+            .unwrap_or_else(|_| path_ref.to_path_buf().clean())
+            .display()
+            .to_string();
+
         Self::IoPath {
-            path: dunce::canonicalize(path.as_ref())
-                .unwrap_or_else(|_| path.as_ref().to_path_buf())
-                .display()
-                .to_string(),
+            path: cleaned_path,
             source,
         }
     }
@@ -211,4 +216,19 @@ mod tests {
         let err = get_file_paths(dir.path()).unwrap_err();
         assert!(err.to_string().contains("Duplicate file name `file1`"));
     }
+
+    #[test]
+    fn test_io_path_normalizes_parent_segments_when_not_canonicalizable() {
+        let err = GitronicsError::io_path(
+            Path::new("non_existing/../clean/path.yaml"),
+            io::Error::new(io::ErrorKind::NotFound, "missing"),
+        );
+
+        match err {
+            GitronicsError::IoPath { path, .. } => {
+                assert_eq!(Path::new(&path), Path::new("clean/path.yaml"));
+            }
+            _ => panic!("Expected IoPath error"),
+        }
+    }
 }