make config paths relative too

BrianHicks · Nov 20, 2020 · d234b4d · d234b4d
1 parent b296b7a
commit d234b4d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/src/store.rs b/src/store.rs
@@ -156,11 +156,17 @@ impl Store {
             .scan()
             .context("could not scan the project roots for Elm files")?;
 
+        let current_dir =
+            std::env::current_dir().context("could not get current working directory")?;
+
         for (import, existing) in self.forbidden.iter_mut() {
             existing.usages = match imports_to_files.get(import) {
                 Some(new_usages) => new_usages
                     .iter()
-                    .map(|found| found.path.to_owned())
+                    .map(|found| {
+                        pathdiff::diff_paths(&found.path, &current_dir)
+                            .unwrap_or_else(|| found.path.to_owned())
+                    })
                     .collect(),
                 None => BTreeSet::new(),
             }

diff --git a/tests/golden-results/removed-forbidden.sh.config.toml b/tests/golden-results/removed-forbidden.sh.config.toml
@@ -4,26 +4,26 @@
 roots = ['../vendor/elm-spa-example']
 [forbidden.Html]
 usages = [
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Article/Body.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Article/Feed.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Article.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Asset.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Author.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Avatar.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Loading.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Main.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Article/Editor.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Article.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Blank.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Home.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Login.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/NotFound.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Profile.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Register.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page/Settings.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Page.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/PaginatedList.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Route.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Timestamp.elm',
-    '/Users/brianhicks/code/brian/elm-forbid-import/vendor/elm-spa-example/src/Username.elm',
+    'vendor/elm-spa-example/src/Article/Body.elm',
+    'vendor/elm-spa-example/src/Article/Feed.elm',
+    'vendor/elm-spa-example/src/Article.elm',
+    'vendor/elm-spa-example/src/Asset.elm',
+    'vendor/elm-spa-example/src/Author.elm',
+    'vendor/elm-spa-example/src/Avatar.elm',
+    'vendor/elm-spa-example/src/Loading.elm',
+    'vendor/elm-spa-example/src/Main.elm',
+    'vendor/elm-spa-example/src/Page/Article/Editor.elm',
+    'vendor/elm-spa-example/src/Page/Article.elm',
+    'vendor/elm-spa-example/src/Page/Blank.elm',
+    'vendor/elm-spa-example/src/Page/Home.elm',
+    'vendor/elm-spa-example/src/Page/Login.elm',
+    'vendor/elm-spa-example/src/Page/NotFound.elm',
+    'vendor/elm-spa-example/src/Page/Profile.elm',
+    'vendor/elm-spa-example/src/Page/Register.elm',
+    'vendor/elm-spa-example/src/Page/Settings.elm',
+    'vendor/elm-spa-example/src/Page.elm',
+    'vendor/elm-spa-example/src/PaginatedList.elm',
+    'vendor/elm-spa-example/src/Route.elm',
+    'vendor/elm-spa-example/src/Timestamp.elm',
+    'vendor/elm-spa-example/src/Username.elm',
 ]