More flexibly handle github repo references. (#10)

Author: eamonnsullivan

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eamonnsullivan</groupId>
   <artifactId>github-api-lib</artifactId>
-  <version>0.1.18</version>
+  <version>0.1.19</version>
   <name>github-api-lib</name>
   <description>Library of Github API calls that I happen to need.</description>
   <url>https://github.com/eamonnsullivan/github-api-lib</url>

src/eamonnsullivan/github_api_lib/repos.clj

@@ -1,16 +1,20 @@
 (ns eamonnsullivan.github-api-lib.repos
-  (:require [eamonnsullivan.github-api-lib.core :as core]))
+  (:require [clojure.string :as string]
+            [eamonnsullivan.github-api-lib.core :as core]))
 
 (def ^:dynamic *default-page-size* 10)
 
 (defn parse-repo
   "Parse a repository url (a full url or just the owner/name part) and
   return a map with :owner and :name keys."
   [url]
-  (let [matches (re-matches #"(https://github.com/)?([^/]*)/([^/]*).*$" url)
-        [_ _ owner name] matches]
+  (let [matches (re-matches #"(https://github.com/|git@github.com:)?([^/]*)/([^/]*)(.git)?.*$" url)
+        [_ _ owner name _] matches]
     (if (and owner name (not-empty owner) (not-empty name))
-      {:owner owner :name name}
+      {:owner owner
+       :name (if (string/ends-with? name ".git")
+               (string/replace name #".git$" "")
+               name)}
       (throw (ex-info (format "Could not parse repository from url: %s" url) {})))))
 
 (defn get-repo-id

test/eamonnsullivan/github_api_lib/repos_test.clj

@@ -19,6 +19,10 @@
     (is (= {:owner "eamonnsullivan" :name "github-search"} (sut/parse-repo "eamonnsullivan/github-search/blob/master/src/eamonnsullivan/github_search.clj")))
     (is (= {:owner "eamonnsullivan" :name "github-pr-lib"} (sut/parse-repo "eamonnsullivan/github-pr-lib/pull/1")))
     (is (= {:owner "bbc" :name "optimo"} (sut/parse-repo "bbc/optimo/pull/1277"))))
+  (testing "handles ssh urls as well"
+    (is (= {:owner "eamonnsullivan" :name "emacs.d"} (sut/parse-repo "git@github.com:eamonnsullivan/emacs.d.git")))
+    (is (= {:owner "eamonnsullivan" :name "github-search"} (sut/parse-repo "git@github.com:eamonnsullivan/github-search.git")))
+    (is (= {:owner "eamonnsullivan" :name "github-pr-lib"} (sut/parse-repo "git@github.com:eamonnsullivan/github-pr-lib.git"))))
   (testing "Throws an exception when the url is incomplete or unrecognised"
     (is (thrown-with-msg? RuntimeException
                           #"Could not parse repository from url: something else"