Handle scp-like syntax in URL parsing, add more tests

pkg/url.go

@@ -1,28 +1,57 @@
 package pkg
 
 import (
-	"net/url"
+	urlpkg "net/url"
 	"path"
+	"regexp"
 	"strings"
 
 	"github.com/pkg/errors"
 )
 
-// TODO: maybe use https://github.com/whilp/git-urls?
+// scpSyntax matches the SCP-like addresses used by the ssh procotol (eg, [user@]host.xz:path/to/repo.git/).
+// See: https://golang.org/src/cmd/go/internal/get/vcs.go
+var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+)@([a-zA-Z0-9._-]+):(.*)$`)
 
 func URLToPath(rawurl string) (string, error) {
-	parsed, err := url.Parse(rawurl)
+	url, err := parseURL(rawurl)
 	if err != nil {
-		return "", errors.Wrap(err, "Failed parsing URL")
+		return "", err
 	}
 
-	repoHost := strings.Split(parsed.Host, ":")[0]
+	// remove port numbers from host
+	repoHost := strings.Split(url.Host, ":")[0]
 
-	repoPath := parsed.Path
-	//repoPath = strings.TrimSuffix(repoPath, ".git/")
-	//repoPath = strings.TrimSuffix(repoPath, ".git")
-
-	localPath := path.Join(repoHost, repoPath)
+	// remove trailing ".git" from repo name
+	localPath := path.Join(repoHost, url.Path)
 	localPath = strings.TrimSuffix(localPath, ".git")
+
+	// remove tilde (~) char from username
+	localPath = strings.ReplaceAll(localPath, "~", "")
+
 	return localPath, nil
 }
+
+func parseURL(rawurl string) (url *urlpkg.URL, err error) {
+	// If rawurl matches SCP-like syntax, convert it into a URL.
+	// eg, "git@github.com:user/repo" becomes "ssh://git@github.com/user/repo".
+	if m := scpSyntax.FindStringSubmatch(rawurl); m != nil {
+		url = &urlpkg.URL{
+			Scheme: "ssh",
+			User:   urlpkg.User(m[1]),
+			Host:   m[2],
+			Path:   m[3],
+		}
+	} else {
+		url, err = urlpkg.Parse(rawurl)
+		if err != nil {
+			return nil, errors.Wrap(err, "Failed parsing URL")
+		}
+	}
+
+	if url.Host == "" && url.Path == "" {
+		return nil, errors.New("Parsed URL is empty")
+	}
+
+	return url, nil
+}