GitoxideLabs
diff --git a/‎git-url/src/lib.rs‎
Lines changed: 24 additions & 0 deletions b/‎git-url/src/lib.rs‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎git-url/tests/parse/mod.rs‎
Lines changed: 6 additions & 2 deletions b/‎git-url/tests/parse/mod.rs‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎git-url/tests/parse/ssh.rs‎
Lines changed: 18 additions & 5 deletions b/‎git-url/tests/parse/ssh.rs‎
Lines changed: 18 additions & 5 deletions
diff --git a/‎git-url/tests/url.rs‎
Lines changed: 2 additions & 1 deletion b/‎git-url/tests/url.rs‎
Lines changed: 2 additions & 1 deletion
@@ -12,6 +12,11 @@ pub enum Protocol {
 
 pub mod owned {
     use crate::Protocol;
+    use bstr::ByteSlice;
+    use std::{
+        borrow::Cow,
+        path::{Path, PathBuf},
+    };
 
     #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
     #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
@@ -43,6 +48,25 @@ pub mod owned {
             }
         }
     }
+
+    impl Url {
+        pub fn expand_path_with(
+            &self,
+            home_for_user: impl FnOnce(&UserExpansion) -> Option<PathBuf>,
+        ) -> Option<PathBuf> {
+            fn make_relative(path: &Path) -> Cow<Path> {
+                if path.is_relative() {
+                    return path.into();
+                }
+                path.components().skip(1).collect::<PathBuf>().into()
+            }
+            match self.expand_user.as_ref() {
+                Some(user) => home_for_user(user)
+                    .and_then(|base| self.path.to_path().ok().map(|path| base.join(make_relative(path)))),
+                None => self.path.to_path().ok().map(ToOwned::to_owned),
+            }
+        }
+    }
 }
 
 #[doc(inline)]
 
@@ -1,8 +1,12 @@
 use git_url::{owned::UserExpansion, Protocol};
 
-fn assert_url(url: &str, expected: git_url::Owned) -> crate::Result {
+fn assert_url_and(url: &str, expected: git_url::Owned) -> Result<git_url::Owned, crate::Error> {
     assert_eq!(git_url::parse(url.as_bytes())?, expected);
-    Ok(())
+    Ok(expected)
+}
+
+fn assert_url(url: &str, expected: git_url::Owned) -> crate::Result {
+    assert_url_and(url, expected).map(|_| ())
 }
 
 fn assert_failure(url: &str, expected_err: &str) {
 
@@ -1,6 +1,7 @@
-use crate::parse::{assert_url, url};
+use crate::parse::{assert_url, assert_url_and, url};
 use git_url::owned::UserExpansion;
 use git_url::Protocol;
+use std::path::Path;
 
 #[test]
 fn without_user_and_without_port() -> crate::Result {
@@ -25,7 +26,7 @@ fn host_is_ipv4() -> crate::Result {
 
 #[test]
 fn username_expansion_with_username() -> crate::Result {
-    assert_url(
+    let expanded_path = assert_url_and(
         "ssh://example.com/~byron/hello",
         url(
             Protocol::Ssh,
@@ -35,12 +36,18 @@ fn username_expansion_with_username() -> crate::Result {
             b"/hello",
             UserExpansion::Name("byron".into()),
         ),
-    )
+    )?
+    .expand_path_with(|user: &UserExpansion| match user {
+        UserExpansion::Current => unreachable!("we have a name"),
+        UserExpansion::Name(name) => Some(format!("/home/{}", name).into()),
+    });
+    assert_eq!(expanded_path, Some(Path::new("/home/byron/hello").into()));
+    Ok(())
 }
 
 #[test]
 fn username_expansion_without_username() -> crate::Result {
-    assert_url(
+    let expanded_path = assert_url_and(
         "ssh://example.com/~/hello/git",
         url(
             Protocol::Ssh,
@@ -50,7 +57,13 @@ fn username_expansion_without_username() -> crate::Result {
             b"/hello/git",
             UserExpansion::Current,
         ),
-    )
+    )?
+    .expand_path_with(|user: &UserExpansion| match user {
+        UserExpansion::Current => Some("/home/byron".into()),
+        UserExpansion::Name(name) => Some(format!("/home/{}", name).into()),
+    });
+    assert_eq!(expanded_path, Some(Path::new("/home/byron/hello/git").into()));
+    Ok(())
 }
 
 #[test]
 
@@ -1,3 +1,4 @@
-pub type Result = std::result::Result<(), Box<dyn std::error::Error>>;
+pub type Error = Box<dyn std::error::Error>;
+pub type Result = std::result::Result<(), Error>;
 
 mod parse;