cache the current version of fhc as well

CHANGELOG.md

@@ -1,3 +1,7 @@
+Release 1.1.4 - 2015-06-19 - Wei Li
+------------------------------------------------------
+* Cache the current version of fhc so that the cached data will be invalidated if fhc version is changed.
+
 Release 1.1.3 - 2015-06-16 - Wei Li
 ------------------------------------------------------
 * Fix the version check. Use npm.js instead.

lib/cmd/common/version.js

@@ -6,6 +6,14 @@ var fhc = require('../../fhc'),
 const dayInMs = 86400000;
 const daysToCache = 1;
 const timeout = 2000;
+const PATTERN = /-BUILD-NUMBER/;
+
+function cleanupVersion(version){
+  if(PATTERN.test(version)){
+    return version.replace(PATTERN, '');
+  }
+  return version;
+}
 
 module.exports = {
   'desc': 'Version info about the FeedHenry instance we\'re connected to',
@@ -41,9 +49,11 @@ module.exports = {
       cachedLatest = JSON.parse(cachedLatest)
     } catch (error) {}
     if (!_.isEmpty(cachedLatest)) {
-      if (cachedLatest.ts - (new Date().getTime() - (dayInMs * daysToCache)) > 0) {
-        self.latest = cachedLatest;
-        return cb(cachedLatest.is);
+      if(cachedLatest.current && semver.eq(cleanupVersion(cachedLatest.current), cleanupVersion(fhc._version))){
+        if (cachedLatest.ts - (new Date().getTime() - (dayInMs * daysToCache)) > 0) {
+          self.latest = cachedLatest;
+          return cb(cachedLatest.is);
+        }
       }
     }
 
@@ -63,12 +73,13 @@ module.exports = {
       }
       var latestV = body.version,
         localV = fhc._version,
-        isUpToDate = semver.gte(localV, latestV);
+        isUpToDate = semver.gte(cleanupVersion(localV), cleanupVersion(latestV));
 
       self.latest = {
         version: latestV,
         is: isUpToDate,
-        ts: new Date().getTime()
+        ts: new Date().getTime(),
+        current: fhc._version
       };
 
       // Cache the result

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fh-fhc",
   "description": "A Command Line Interface for FeedHenry",
-  "version": "1.1.3-BUILD-NUMBER",
+  "version": "1.1.4-BUILD-NUMBER",
   "keywords": [
     "feedhenry"
   ],
@@ -30,7 +30,7 @@
     "nopt": "1.0.0",
     "open": "0.0.5",
     "request": "2.11.4",
-    "semver": "1.0.14",
+    "semver": "4.3.6",
     "tabtab": "0.0.2",
     "underscore": "1.5.2",
     "underscore-deep-extend": "0.0.5",