Handle dash in repository name

commit-id:d55283ee

.spr.yml

@@ -6,4 +6,4 @@ showPRLink: true
 cleanupRemoteBranch: true
 logGitCommands: false
 logGitHubCalls: false
-statusBitsHeader: true
+statusBitsHeader: false

cmd/spr/main.go

@@ -48,6 +48,16 @@ func main() {
 		rake.YamlFileWriter(configfilepath),
 	)
 
+	if cfg.GitHubRepoOwner == "" {
+		fmt.Println("unable to auto configure repository owner - must be set manually in .spr.yml")
+		os.Exit(3)
+	}
+
+	if cfg.GitHubRepoName == "" {
+		fmt.Println("unable to auto configure repository name - must be set manually in .spr.yml")
+		os.Exit(4)
+	}
+
 	gitcmd = realgit.NewGitCmd(&cfg)
 
 	ctx := context.Background()

config/config.go

@@ -65,7 +65,7 @@ func getRepoDetailsFromRemote(remote string) (string, string, bool) {
 	userFormat := `(git@)?`
 	// "/" is expected in "http://" or "ssh://" protocol, when no protocol given
 	// it should be ":"
-	repoFormat := `github.com(/|:)(?P<repoOwner>\w+)/(?P<repoName>\w+)`
+	repoFormat := `github.com(/|:)(?P<repoOwner>\w+)/(?P<repoName>[\w-]+)`
 	// This is neither required in https access nor in ssh one
 	suffixFormat := `(.git)?`
 	regexFormat := fmt.Sprintf(`^origin\s+%s%s%s%s \(push\)`,

config/config_test.go

@@ -23,6 +23,9 @@ func TestGetRepoDetailsFromRemote(t *testing.T) {
 		{"origin  git@github.com:r2/d2.git (push)", "r2", "d2", true},
 		{"origin  git@github.com:r2/d2.git (fetch)", "", "", false},
 		{"origin  git@github.com:r2/d2 (push)", "r2", "d2", true},
+
+		{"origin	https://github.com/r2/d2-a.git (push)", "r2", "d2-a", true},
+		{"origin	https://github.com/r2/d2_a.git (push)", "r2", "d2_a", true},
 	}
 	for i, testCase := range testCases {
 		t.Logf("Testing %v %q", i, testCase.remote)