Compare release/build dates during update check

Switch GitHub API libraries so that short SHAs can be used to get commit dates. It adds two GitHub API calls so rate-limiting will occur more quickly, but hardcoding the build date would only cut out one call.

Author: Ortham

bower.json

@@ -33,7 +33,6 @@
     "Jed": "SlexAxton/Jed#1.1.1",
     "jed-gettext-parser": "1.0.0",
     "marked": "0.3.6",
-    "lodash": "4.17.4",
-    "octokat": "0.8.0"
+    "lodash": "4.17.4"
   }
 }

package.json

@@ -16,6 +16,7 @@
     "decompress": "^4.0.0",
     "decompress-unzip": "^4.0.1",
     "fs-extra": "^3.0.1",
+    "github-api": "^3.0.0",
     "polymer-analyzer": "^2.1.0",
     "replace": "^0.3.0",
     "request": "^2.79.0"

src/gui/html/index.html

@@ -468,7 +468,7 @@ <h2>First-Time Tips</h2>
   <script src="../../../bower_components/Jed/jed.js"></script>
   <script src="../../../bower_components/jed-gettext-parser/jedGettextParser.js"></script>
   <script src="../../../bower_components/lodash/dist/lodash.core.min.js"></script>
-  <script src="../../../bower_components/octokat/dist/octokat.js"></script>
+  <script src="../../../node_modules/github-api/dist/GitHub.bundle.min.js"></script>
   <script src="js/dialog.js"></script>
   <script src="js/dom.js"></script>
   <script src="js/events.js"></script>

src/gui/html/js/updateExists.js

@@ -2,13 +2,13 @@
 (function exportModule(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['bower_components/octokat/dist/octokat.js'], factory);
+    define(['node_modules/github-api/dist/GitHub.bundle.min.js'], factory);
   } else {
     // Browser globals
     root.loot = root.loot || {};
-    root.loot.updateExists = factory(root.Octokat);
+    root.loot.updateExists = factory(root.GitHub);
   }
-}(this, (Octokat) => {
+}(this, (GitHub) => {
   const versionRegex = /^(\d+)\.(\d+)\.(\d+)$/;
 
   function compare(lhs, rhs) {
@@ -40,20 +40,31 @@
       return Promise.reject(new Error('Invalid arguments, both version and build must be given'));
     }
 
-    const repo = (new Octokat()).repos('loot', 'loot');
+    const repo = (new GitHub()).getRepo('loot', 'loot');
 
-    return repo.releases.latest.fetch().then((latestRelease) => {
-      const comparison = compare(currentVersion, latestRelease.tagName);
+    return repo.getRelease('latest').then((response) => {
+      const latestReleaseTagName = response.data.tag_name;
+      const comparison = compare(currentVersion, latestReleaseTagName);
       if (comparison === -1) {
         return true;
       } else if (comparison === 1) {
         return false;
       }
 
-      return repo.tags.fetch().then((tags) => {
-        const tag = tags.items.find((element) => element.name === latestRelease.tagName);
+      return repo.listTags().then((tagsResponse) => (
+        tagsResponse.data.find((element) => element.name === latestReleaseTagName)
+      )).then((tag) => {
+        if (tag.commit.sha.startsWith(currentBuild)) {
+          return false;
+        }
 
-        return !tag.commit.sha.startsWith(currentBuild);
+        return repo.getCommit(tag.commit.sha)
+          .then((commitResponse) => Date.parse(commitResponse.data.committer.date))
+          .then((tagDate) => (
+            repo.getSingleCommit(currentBuild)
+              .then((commitResponse) => Date.parse(commitResponse.data.commit.committer.date))
+              .then((buildCommitDate) => tagDate > buildCommitDate)
+          ));
       });
     }).catch((error) => {
       if (!error.message) {

src/tests/gui/html/js/mock_octokat.js

@@ -1,38 +1,54 @@
 'use strict';
 
 /* Mock the octokat methods used. */
-function Octokat() {  // eslint-disable-line no-unused-vars
-  this.repos = (/* owner, repo */) => ({
-    releases: {
-      latest: {
-        fetch() {
-          return Promise.resolve({
-            tagName: '0.9.2',
-          });
+function GitHub() {  // eslint-disable-line no-unused-vars
+  this.getRepo = (/* owner, repo */) => ({
+    getRelease: (/* latest */) => (
+      Promise.resolve({
+        data: {
+          tag_name: '0.9.2',
         },
-      },
-    },
-    tags: {
-      fetch() {
-        return Promise.resolve({
-          items: [{
-            name: '0.9.2',
-            commit: {
-              sha: '6b58f92a5d41f5d7f149a1263dac78687a065ff5',
-            },
-          }, {
-            name: '0.9.1',
-            commit: {
-              sha: 'dc24e10a4774903ede4e94165e7d6fa806466e4a',
-            },
-          }, {
-            name: '0.9.0',
-            commit: {
-              sha: '44a0d8505d5402dd24cf0fda9540da9557866c80',
+      })
+    ),
+    listTags: () => (
+      Promise.resolve({
+        data: [{
+          name: '0.9.2',
+          commit: {
+            sha: '6b58f92a5d41f5d7f149a1263dac78687a065ff5',
+          },
+        }, {
+          name: '0.9.1',
+          commit: {
+            sha: 'dc24e10a4774903ede4e94165e7d6fa806466e4a',
+          },
+        }, {
+          name: '0.9.0',
+          commit: {
+            sha: '44a0d8505d5402dd24cf0fda9540da9557866c80',
+          },
+        }],
+      })
+    ),
+    getCommit: (/* sha */) => (
+      Promise.resolve({
+        data: {
+          committer: {
+            date: '2011-04-14T16:00:49Z',
+          },
+        },
+      })
+    ),
+    getSingleCommit: (ref) => (
+      Promise.resolve({
+        data: {
+          commit: {
+            committer: {
+              date: ref === 'deadbeef' ? '2011-04-14T16:00:00Z' : '2011-04-14T16:00:49Z',
             },
-          }],
-        });
-      },
-    },
+          },
+        },
+      })
+    ),
   });
 }

src/tests/gui/html/js/test_updateExists.js

@@ -43,12 +43,18 @@ describe('updateExists()', () => {
     )
   );
 
-  it('should resolve to true if the given version equals the latest version but the short build SHAs are unequal', () =>
+  it('should resolve to true if the given version equals the latest version but the short build SHAs are unequal and the latest version commit is newer', () =>
     loot.updateExists('0.9.2', 'deadbeef').then((result) =>
       result.should.be.true
     )
   );
 
+  it('should resolve to false if the given version equals the latest version but the short build SHAs are unequal and the build commits dates are equal', () =>
+    loot.updateExists('0.9.2', 'feedbac').then((result) =>
+      result.should.be.false
+    )
+  );
+
   it('should resolve to false if the given version equals the latest version and the short build SHAs are equal', () =>
     loot.updateExists('0.9.2', '6b58f92').then((result) =>
       result.should.be.false