Merge pull request #373 from CircleCI-Public/open-format

Failing test and some possible fixes

git/git.go

@@ -59,11 +59,11 @@ func findProviderAndSlug(url string) (VcsType, string, error) {
 
 	var vcsParsers = map[VcsType][]*regexp.Regexp{
 		GitHub: {
-			regexp.MustCompile(`^git@github\.com:(.*)`),
+			regexp.MustCompile(`^(?:ssh\://)?git@github\.com[:/](.*)`),
 			regexp.MustCompile(`https://(?:.*@)?github\.com/(.*)`),
 		},
 		Bitbucket: {
-			regexp.MustCompile(`^git@bitbucket\.org:(.*)`),
+			regexp.MustCompile(`^(?:ssh\://)?git@bitbucket\.org[:/](.*)`),
 			regexp.MustCompile(`https://(?:.*@)?bitbucket\.org/(.*)`),
 		},
 	}

git/git_test.go

@@ -62,6 +62,18 @@ var _ = Describe("Dealing with git", func() {
 					Organization: "kiwi",
 					Project:      "fruit",
 				},
+
+				"ssh://[email protected]/cloud/rain": &Remote{
+					VcsType:      GitHub,
+					Organization: "cloud",
+					Project:      "rain",
+				},
+
+				"ssh://[email protected]/snow/ice": &Remote{
+					VcsType:      Bitbucket,
+					Organization: "snow",
+					Project:      "ice",
+				},
 			}
 
 			for url, remote := range cases {