RHMAP-2648 - Change downgrade message to a version that works and set…

… publish tag to latest-2

CHANGELOG.md

@@ -1,3 +1,12 @@
+Release 2.0.5 - 2015-10-22 - David Martin
+------------------------------------------------------
+
+* RHMAP-2648
+** Change downgrade message to a version that works
+** Set publish tag to `latest-2`
+** Look for `latest-2` tag when checking for updates
+** Change -BUILD-NUMBER to +BUILD-NUMBER
+
 Release 2.0.4 - 2015-09-03 - Niall Donnelly
 ------------------------------------------------------
 

Gruntfile.js

@@ -220,7 +220,7 @@ module.exports = function(grunt) {
     indexFile = path.join(docsDir, 'index.md');
     indexOutput = [
     '<h1>FHC - FeedHenry Command Line Interface API</h1>',
-    '<div class="alert alert-info"><strong>Note: </strong> This API Reference is for version ' + fhc._version.replace('-BUILD-NUMBER', ''),
+    '<div class="alert alert-info"><strong>Note: </strong> This API Reference is for version ' + fhc._version.replace('+BUILD-NUMBER', ''),
     'of FHC. To ensure you get the most relevant help for the version of FHC you have installed, the <code>fhc help</code> command can be used.',
     'See <a href="https://github.com/feedhenry/fh-fhc#usage">https://github.com/feedhenry/fh-fhc#usage</a> for usage.',
     'To find the version of fhc you have installed, use the <code>fhc version</code> command</div>'

lib/cmd/common/version.js

@@ -6,7 +6,7 @@ var fhc = require('../../fhc'),
 const dayInMs = 86400000;
 const daysToCache = 1;
 const timeout = 2000;
-const PATTERN = /-BUILD-NUMBER/;
+const PATTERN = /\+BUILD-NUMBER/;
 
 function cleanupVersion(version){
   if(PATTERN.test(version)){
@@ -64,7 +64,7 @@ module.exports = {
     request.get({
       proxy: ini.get('proxy'),
       json: true,
-      url: 'http://registry.npmjs.org/fh-fhc/latest',
+      url: 'http://registry.npmjs.org/fh-fhc/latest-2',
       timeout: timeout
     }, function(err, response, body) {
       if (err || !body || !body.version) {
@@ -110,7 +110,7 @@ module.exports = {
 
       //If the platform is less that a certain version, then it can't be used with this version of fhc.
       if(semver.lt(platformDetails.Release, fhc._minPlatformVersion)){
-        return cb(new Error("The Platform You Are Targeting Is Not Compatible With This Version (" + fhc._version + ") Of fhc. Please Install A Previous Version: npm install fh-fhc@^" + (semver.major(fhc._version) - 1) + ".0.0" ));
+        return cb(new Error("The version of the platform you are targeting is not compatible with this version of fhc (" + fhc._version + "). Please install a previous version: npm install fh-fhc@" + (semver.major(fhc._version) - 1) ));
       }
 
       return cb();

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fh-fhc",
   "description": "A Command Line Interface for FeedHenry",
-  "version": "2.0.4-BUILD-NUMBER",
+  "version": "2.0.5+BUILD-NUMBER",
   "_minPlatformVersion": "7.15.0-1661",
   "keywords": [
     "feedhenry"
@@ -19,6 +19,9 @@
   "bin": {
     "fhc": "./bin/fhc.js"
   },
+  "publishConfig": {
+    "tag": "latest-2"
+  },
   "dependencies": {
     "async": "0.2.9",
     "cheerio": "0.10.8",