From 864ba9ab530eb04520e269e708ec52d4f0b81dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B2=E8=80=98=E2=84=A2?= <hotoo.cn@gmail.com>
Date: Sun, 9 Aug 2015 17:16:59 +0800
Subject: [PATCH] feat(gitopen commit): Open git diff page with hash.

---
 README.md               |  5 +++++
 bin/gitopen             |  8 ++++----
 bin/open-commander.js   | 21 +++++++++++++++------
 lib/gitremote.js        |  4 ++--
 lib/index.js            |  8 ++++++--
 lib/scheme/bitbucket.js |  2 +-
 lib/scheme/coding.js    |  2 +-
 lib/scheme/gitcafe.js   |  2 +-
 lib/scheme/github.js    |  2 +-
 lib/scheme/gitlab.js    |  2 +-
 lib/scheme/oschina.js   |  2 +-
 test/gitopen.test.js    | 30 +++++++++++++++++++++---------
 12 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index f5850bf..7bd95ac 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ $ gitopen wiki                  # Open wiki pages.
 $ gitopen release               # Open releases page.
 $ gitopen tags                  # Open tags page.
 $ gitopen commits               # Open commits pages.
+$ gitopen {hash}                # Open commit page by hash code.
 
 $ gitopen README.md             # Open remote blob url. default use current working branch.
 $ gitopen README.md -b branch   # Open remote blob url by given branch.
@@ -184,6 +185,10 @@ alias:
 * `$ gitopen commit`
 * `$ gitopen ci`
 
+### $ gitopen {hash}
+
+Open  commit page by hash code.
+
 ### $ gitopen wiki
 
 Open git repository wiki home page.
diff --git a/bin/gitopen b/bin/gitopen
index 883b4fd..8168749 100755
--- a/bin/gitopen
+++ b/bin/gitopen
@@ -21,9 +21,9 @@ var command = commander(process.argv, {
 if (command.category === 'profile') {
   var username = command.args.username;
   var reponame = command.args.reponame;
-  var url = 'https://github.com/' + username + (reponame? '/'+reponame : '');
+  var url = 'https://github.com/' + username + (reponame ? '/' + reponame : '');
   if (command.verbose) {
-    console.log("URL:", url);
+    console.log('URL:', url);
     process.exit(0);
     return 0;
   }
@@ -53,8 +53,8 @@ command.protocol = config.protocol;
 var url = gitresolve(uri, command);
 // 7. open
 if (command.verbose) {
-  console.log("Option:", command)
-  console.log("URL:", url);
+  console.log('Option:', command);
+  console.log('URL:', url);
 } else {
   xopen(url);
 }
diff --git a/bin/open-commander.js b/bin/open-commander.js
index a93e91f..675ed74 100644
--- a/bin/open-commander.js
+++ b/bin/open-commander.js
@@ -89,7 +89,7 @@ module.exports = function(argv, option) {
   };
 
   // prepare processing branch alias like `:branch-name`
-  for (var i=commander.args.length-1; i>=0; i--) {
+  for (var i = commander.args.length - 1; i >= 0; i--) {
     if (commander.args[i].indexOf(':') === 0) {
       var br = commander.args[i].substring(1);
       options.hash = br;
@@ -106,6 +106,7 @@ module.exports = function(argv, option) {
   // branch-a:branch-b
   // branch-a...branch-b
   var RE_BRANCH_COMPARE = /^(.*?)(?::|\.{3})(.*)$/;
+  var RE_HASH = /^[0-9a-fA-F]{6,40}$/;
 
   var category = commander.args[0];
   var match;
@@ -166,7 +167,7 @@ module.exports = function(argv, option) {
     options.category = 'milestones/new';
     options.args = {
       title: commander.args.slice(1).join(' ')
-    }
+    };
     break;
   case 'milestones':
     options.category = 'milestones';
@@ -194,6 +195,11 @@ module.exports = function(argv, option) {
     break;
   case 'ci':
   case 'commit':
+    //options.category = 'commit';
+    //if (commander.args[2] && commander.args[2] !== '.') {
+      //options.hash = commander.args[2];
+    //}
+    //break;
   case 'commits':
     options.category = 'commits';
     if (commander.branch) {
@@ -230,12 +236,12 @@ module.exports = function(argv, option) {
       options.args = {
         issue_id: category.substring(1),
       };
-    } else if (m = RE_PR_ID.exec(category)) {
+    } else if ((m = RE_PR_ID.exec(category))) {
       options.category = 'pulls/id';
       options.args = {
         pull_id: m[1],
       };
-    } else if (m = RE_PROFILE.exec(category)) {
+    } else if ((m = RE_PROFILE.exec(category))) {
       var username = m[1];
       var reponame = m[2];
       options.category = 'profile';
@@ -243,16 +249,19 @@ module.exports = function(argv, option) {
         username: username,
         reponame: reponame,
       };
-    } else if (m = RE_MILESTONE.exec(category)) {
+    } else if ((m = RE_MILESTONE.exec(category))) {
       options.category = 'milestones/id';
       options.args = {
         milestone_id: m[1],
       };
-    } else if (m = RE_GIST.exec(category)) {
+    } else if ((m = RE_GIST.exec(category))) {
       options.category = 'snippets/new';
       options.args = {
         type: m[1],
       };
+    } else if (RE_HASH.test(category)) {
+      options.category = 'commit';
+      options.hash = category;
     } else {
       // FILE/DIR PATH
       if (!parseFilePath(options, category)) {
diff --git a/lib/gitremote.js b/lib/gitremote.js
index 9b1f230..d3ff315 100644
--- a/lib/gitremote.js
+++ b/lib/gitremote.js
@@ -24,7 +24,7 @@ exports.getCurrentBranch = function getCurrentBranch(cwd) {
     'git symbolic-ref --short HEAD',
     'git rev-parse --abbrev-ref HEAD',
   ];
-  for (var i=0, l=cmds.length; i<l; i++) {
+  for (var i = 0, l = cmds.length; i < l; i++) {
     try {
       var out = child_process.execSync(cmds[i], {cwd: cwd})
           .toString().trim();
@@ -32,7 +32,7 @@ exports.getCurrentBranch = function getCurrentBranch(cwd) {
         return null;
       }
       return out;
-    } catch (ex){}
+    } catch (ex) { /* */ }
   }
   return null;
 };
diff --git a/lib/index.js b/lib/index.js
index f2a018f..2f8fd1f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -133,12 +133,16 @@ module.exports = function(uri, options) {
     case 'network':
       path = scheme.network;
       break;
+    case 'commit':
+      path = scheme['commit']
+                  .replace('{hash}', options.hash);
+      break;
     case 'commits':
       path = scheme.commits;
       break;
     case 'commits-with-branch':
       path = scheme['commits-with-branch']
-                  .replace('{branch-name}', options.args.branch);
+                  .replace('{branch-name}', options.branch);
       break;
     case 'tree':
       path = scheme.tree.replace('{hash}', options.hash)
@@ -158,7 +162,7 @@ module.exports = function(uri, options) {
       break;
     default:
       path = '';
-      if (options.hash !== 'master')  {
+      if (options.hash !== 'master') {
         path = scheme.tree.replace('{hash}', options.hash);
       }
       break;
diff --git a/lib/scheme/bitbucket.js b/lib/scheme/bitbucket.js
index feb7391..9cc5741 100644
--- a/lib/scheme/bitbucket.js
+++ b/lib/scheme/bitbucket.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/{username}/{reponame}',
   'home': '',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/network',
   'tree': '/src/{hash}{path}?at={hash}',
   'blob': '/src/{hash}{path}?at={hast}',
+  'commit': '/commit/{hash}',
   'commits': '/commits',
   'commits-with-branch': '/commits/{branch-name}',
   'milestones': '/admin/issues/milestones',
diff --git a/lib/scheme/coding.js b/lib/scheme/coding.js
index 0fbfdfa..a09a231 100644
--- a/lib/scheme/coding.js
+++ b/lib/scheme/coding.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/u/{username}/p/{reponame}',
   'home': '/git',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/git/graph',
   'tree': '/git/tree/{hash}',
   'blob': '/git/blob/{hash}',
+  'commit': '/commit/{hash}',
   'commits': '/git/commits',
   'commits-with-branch': '/git/commits/{branch-name}',
   'milestones': '/milestones',
diff --git a/lib/scheme/gitcafe.js b/lib/scheme/gitcafe.js
index 0b00305..78d4829 100644
--- a/lib/scheme/gitcafe.js
+++ b/lib/scheme/gitcafe.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/{username}/{reponame}',
   'home': '',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/graphs/master',
   'tree': '/tree/{hash}{path}',
   'blob': '/blob/{hash}{path}',
+  'commit': '/commit/{hash}',
   'commits': '/commits/master',
   'commits-with-branch': '/commits/{branch-name}',
   'milestones': '', // NOT SUPPORT.
diff --git a/lib/scheme/github.js b/lib/scheme/github.js
index ad6f235..9257e05 100644
--- a/lib/scheme/github.js
+++ b/lib/scheme/github.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/{username}/{reponame}',
   'home': '',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/network',
   'tree': '/tree/{hash}{path}',
   'blob': '/blob/{hash}{path}',
+  'commit': '/commit/{hash}',
   'commits': '/commits',
   'commits-with-branch': '/commits/{branch-name}',
   'milestones': '/milestones',
diff --git a/lib/scheme/gitlab.js b/lib/scheme/gitlab.js
index 1dd3ea0..b070bfe 100644
--- a/lib/scheme/gitlab.js
+++ b/lib/scheme/gitlab.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/{username}/{reponame}',
   'home': '',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/network',
   'tree': '/tree/{hash}{path}',
   'blob': '/blob/{hash}{path}',
+  'commit': '/commit/{hash}',
   'commits': '/commits',
   'commits-with-branch': '/commits/{branch-name}',
   'milestones': '/milestones',
diff --git a/lib/scheme/oschina.js b/lib/scheme/oschina.js
index 030c7a5..7897312 100644
--- a/lib/scheme/oschina.js
+++ b/lib/scheme/oschina.js
@@ -1,4 +1,3 @@
-/* global module */
 module.exports = {
   'base': '{protocol}://{hostname}/{username}/{reponame}',
   'home': '',
@@ -10,6 +9,7 @@ module.exports = {
   'network': '/network',
   'tree': '/tree/{hash}{path}',
   'blob': '/blob/{hash}{path}',
+  'commit': '/commit/{hash}',
   'commits': '/commits/master',
   'commits-with-branch': '/commits/{branch-name}',
   'milestones': '/milestones',
diff --git a/test/gitopen.test.js b/test/gitopen.test.js
index e47c535..38ac8a2 100644
--- a/test/gitopen.test.js
+++ b/test/gitopen.test.js
@@ -9,12 +9,12 @@ var RE_URL = /^https?:\/\//i;
 
 describe('gitresolve.parse()', function () {
   var cases = [
-    ['git@github.com:hotoo/gitopen.git', {hostname: 'github.com', username:'hotoo', reponame:'gitopen'}],
-    ['git://github.com/hotoo/gitopen.git', {hostname: 'github.com', username:'hotoo', reponame:'gitopen'}],
-    ['ssh://github.com/hotoo/gitopen.git', {hostname: 'github.com', username:'hotoo', reponame:'gitopen'}],
-    ['ssh://hg@bitbucket.org/hotoo/gitopen.git', {hostname: 'bitbucket.org', username:'hotoo', reponame:'gitopen'}],
-    ['https://github.com/hotoo/gitopen.git', {hostname: 'github.com', username:'hotoo', reponame:'gitopen'}],
-    ['https://hotoo@bitbucket.org/hotoo/gitopen.git', {hostname: 'bitbucket.org', username:'hotoo', reponame:'gitopen'}],
+    ['git@github.com:hotoo/gitopen.git', {hostname: 'github.com', username: 'hotoo', reponame: 'gitopen'}],
+    ['git://github.com/hotoo/gitopen.git', {hostname: 'github.com', username: 'hotoo', reponame: 'gitopen'}],
+    ['ssh://github.com/hotoo/gitopen.git', {hostname: 'github.com', username: 'hotoo', reponame: 'gitopen'}],
+    ['ssh://hg@bitbucket.org/hotoo/gitopen.git', {hostname: 'bitbucket.org', username: 'hotoo', reponame: 'gitopen'}],
+    ['https://github.com/hotoo/gitopen.git', {hostname: 'github.com', username: 'hotoo', reponame: 'gitopen'}],
+    ['https://hotoo@bitbucket.org/hotoo/gitopen.git', {hostname: 'bitbucket.org', username: 'hotoo', reponame: 'gitopen'}],
   ];
   cases.forEach(function(test){
     it('gitresolve.parse(' + test[0] + ')', function () {
@@ -291,7 +291,7 @@ describe('gitresolve()', function () {
           base: '{protocol}://{hostname}/{username}/{reponame}',
           'commits-with-branch': '/commits?branch={branch-name}',
         },
-        args: {branch: 'br'}
+        branch: 'br'
       }).should.be.eql('https://' + test[1] + '/commits?branch=br');
     });
 
@@ -340,6 +340,17 @@ describe('gitresolve()', function () {
       }).should.be.eql('https://' + test[1] + '/snippets/new');
     });
 
+    it('gitresolve(' + test[0] + ', {commit:ed8d9e3})', function () {
+      gitresolve(test[0], {
+        category: 'commit',
+        scheme: {
+          base: '{protocol}://{hostname}/{username}/{reponame}',
+          'commit': '/commits/{hash}',
+        },
+        hash: 'ed8d9e3'
+      }).should.be.eql('https://' + test[1] + '/commits/ed8d9e3');
+    });
+
   });
 });
 
@@ -356,11 +367,11 @@ describe('gitremote()', function () {
   });
 
   it('gitremote.getRemoteUrl({cwd})', function () {
-    resolve(gitremote.getRemoteUrl({cwd:'.'})).should.be.eql('github.com/hotoo/gitopen');
+    resolve(gitremote.getRemoteUrl({cwd: '.'})).should.be.eql('github.com/hotoo/gitopen');
   });
 
   it('gitremote.getRemoteUrl({remote})', function () {
-    resolve(gitremote.getRemoteUrl({remote:'origin'})).should.be.eql('github.com/hotoo/gitopen');
+    resolve(gitremote.getRemoteUrl({remote: 'origin'})).should.be.eql('github.com/hotoo/gitopen');
   });
 
 });
@@ -458,6 +469,7 @@ describe('$ gitopen', function () {
     ['ci', '/hotoo/gitopen/commits'],
     ['commit', '/hotoo/gitopen/commits'],
     ['commits', '/hotoo/gitopen/commits'],
+    ['ed8d9e3', '/hotoo/gitopen/commit/ed8d9e3'],
     ['@hotoo', '/hotoo'],
     ['@hotoo/gitopen', '/hotoo/gitopen'],
     ['snippet', 'https://gist.github.com/'],