Merge branch 'ref_capture' of https://github.com/choldgraf/git-url-parse into new-version

Author: IonicaBizau

example/index.js

@@ -37,6 +37,27 @@ console.log(GitUrlParse("https://github.com/IonicaBizau/node-git-url-parse.git")
 //   , owner: "IonicaBizau"
 // }
 
+console.log(GitUrlParse("https://github.com/IonicaBizau/git-url-parse/blob/master/test/index.js"));
+// { protocols: [ 'https' ],
+//   protocol: 'https',
+//   port: null,
+//   resource: 'github.com',
+//   user: '',
+//   pathname: '/IonicaBizau/git-url-parse/blob/master/test/index.js',
+//   hash: '',
+//   search: '',
+//   href: 'https://github.com/IonicaBizau/git-url-parse/blob/master/test/index.js',
+//   token: '',
+//   toString: [Function],
+//   source: 'github.com',
+//   name: 'git-url-parse',
+//   owner: 'IonicaBizau',
+//   organization: '',
+//   ref: 'master',
+//   filepathtype: 'blob',
+//   filepath: 'test/index.js',
+//   full_name: 'IonicaBizau/git-url-parse' }
+
 console.log(GitUrlParse("https://github.com/IonicaBizau/node-git-url-parse.git").toString("ssh"));
 // => "[email protected]:IonicaBizau/node-git-url-parse.git"
 

lib/index.js

@@ -24,6 +24,9 @@ const gitUp = require("git-up");
  *  - `source` (String): The Git provider (e.g. `"github.com"`).
  *  - `owner` (String): The repository owner.
  *  - `name` (String): The repository name.
+ *  - `ref` (String): The repository ref (e.g., "master" or "dev").
+ *  - `filepath` (String): A filepath relative to the repository root.
+ *  - `filepathtype` (String): The type of filepath in the url ("blob" or "tree").
  *  - `full_name` (String): The owner and name values in the `owner/name` format.
  *  - `toString` (Function): A function to stringify the parsed url into another url type.
  *  - `organization` (String): The organization the owner belongs to. This is CloudForge specific.
@@ -60,10 +63,21 @@ function gitUrlParse(url) {
             break;
         default:
             splits = urlInfo.name.split("/");
-            if (splits.length === 2) {
+            if (splits.length >= 2) {
                 urlInfo.owner = splits[0];
                 urlInfo.name = splits[1];
             }
+
+            urlInfo.ref = "";
+            urlInfo.filepathtype = "";
+            urlInfo.filepath = "";
+            if ((splits.length > 3) && (["blob", "tree"].indexOf(splits[2]) >= 0)) {
+                urlInfo.filepathtype = splits[2];
+                urlInfo.ref = splits[3];
+                if (splits.length > 4) {
+                    urlInfo.filepath = splits.slice(4).join('/');
+                }
+            }
             break;
     }
 

test/index.js

@@ -10,6 +10,7 @@ const URLS = {
   , ftp: "ftp://github.com/IonicaBizau/git-url-parse"
   , ftps: "ftps://github.com/IonicaBizau/git-url-parse"
   , gitSsh: "git+ssh://[email protected]/IonicaBizau/git-url-parse.git"
+  , ref: "https://github.com/IonicaBizau/git-url-parse/blob/master/test/index.js"
 };
 
 tester.describe("parse urls", test => {
@@ -124,6 +125,19 @@ tester.describe("parse urls", test => {
         test.expect(res.name).toBe("name");
     });
 
+    // ref and filepath urls
+    test.should("parse ref/filepath urls", () => {
+        var res = gitUrlParse(URLS.ref);
+        test.expect(res.protocol).toBe("https");
+        test.expect(res.source).toBe("github.com");
+        test.expect(res.owner).toBe("IonicaBizau");
+        test.expect(res.name).toBe("git-url-parse");
+        test.expect(res.href).toBe(URLS.ref);
+        test.expect(res.ref).toBe("master");
+        test.expect(res.filepathtype).toBe("blob");
+        test.expect(res.filepath).toBe("test/index.js");
+    });
+
     test.should("parse subdomains", () => {
         var res = gitUrlParse("https://gist.github.com/owner/id");
         test.expect(res.source).toBe("github.com");