fix: Allow underscores in SourceHut usernames

samueldg · Nov 19, 2022 · ca13b9d · ca13b9d
1 parent 7acdf5b
commit ca13b9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pkg/cmd/initcmd.go b/pkg/cmd/initcmd.go
@@ -80,13 +80,13 @@ var dotfilesRepoGuesses = []struct {
 		sshRepoGuessRepl:      "git@$2:$3/$4.git",
 	},
 	{
-		rx:                    regexp.MustCompile(`\Asr\.ht/~([-0-9A-Za-z]+)\z`),
+		rx:                    regexp.MustCompile(`\Asr\.ht/~([a-z_][a-z0-9_-]+)\z`),
 		httpRepoGuessRepl:     "https://$1@git.sr.ht/~$1/dotfiles",
 		httpUsernameGuessRepl: "$1",
 		sshRepoGuessRepl:      "git@git.sr.ht:~$1/dotfiles",
 	},
 	{
-		rx:                    regexp.MustCompile(`\Asr\.ht/~([-0-9A-Za-z]+)/([-0-9A-Za-z]+)\z`),
+		rx:                    regexp.MustCompile(`\Asr\.ht/~([a-z_][a-z0-9_-]+)/([-0-9A-Za-z]+)\z`),
 		httpRepoGuessRepl:     "https://$1@git.sr.ht/~$1/$2",
 		httpUsernameGuessRepl: "$1",
 		sshRepoGuessRepl:      "git@git.sr.ht:~$1/$2",

diff --git a/pkg/cmd/initcmd_test.go b/pkg/cmd/initcmd_test.go
@@ -67,16 +67,16 @@ func TestGuessDotfilesRepoURL(t *testing.T) {
 			expectedSSHRepoURL:   "git@gitlab.com:user/dots.git",
 		},
 		{
-			arg:                  "sr.ht/~user",
-			expectedHTTPRepoURL:  "https://user@git.sr.ht/~user/dotfiles",
-			expectedHTTPUsername: "user",
-			expectedSSHRepoURL:   "git@git.sr.ht:~user/dotfiles",
+			arg:                  "sr.ht/~user_name",
+			expectedHTTPRepoURL:  "https://user_name@git.sr.ht/~user_name/dotfiles",
+			expectedHTTPUsername: "user_name",
+			expectedSSHRepoURL:   "git@git.sr.ht:~user_name/dotfiles",
 		},
 		{
-			arg:                  "sr.ht/~user/dots",
-			expectedHTTPRepoURL:  "https://user@git.sr.ht/~user/dots",
-			expectedHTTPUsername: "user",
-			expectedSSHRepoURL:   "git@git.sr.ht:~user/dots",
+			arg:                  "sr.ht/~user_name/dots",
+			expectedHTTPRepoURL:  "https://user_name@git.sr.ht/~user_name/dots",
+			expectedHTTPUsername: "user_name",
+			expectedSSHRepoURL:   "git@git.sr.ht:~user_name/dots",
 		},
 		{
 			arg:                  "user",