From 171c5c2e7d6115e21d3e85b1e9af707989c698e3 Mon Sep 17 00:00:00 2001 From: David Martin Date: Thu, 22 Oct 2015 12:24:35 +0100 Subject: [PATCH] RHMAP-2648 - Change downgrade message to a version that works and set publish tag to latest-2 --- CHANGELOG.md | 9 ++++ Gruntfile.js | 2 +- lib/cmd/common/version.js | 6 +-- npm-shrinkwrap.json | 102 +++++++++++++++++++------------------- package.json | 5 +- 5 files changed, 68 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1fc00dc..e9b78ba0 100644 --- a/CHANGELOG.md +++ b/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 ------------------------------------------------------ diff --git a/Gruntfile.js b/Gruntfile.js index 0ddf8959..2e0bcd58 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -220,7 +220,7 @@ module.exports = function(grunt) { indexFile = path.join(docsDir, 'index.md'); indexOutput = [ '

FHC - FeedHenry Command Line Interface API

', - '
Note: This API Reference is for version ' + fhc._version.replace('-BUILD-NUMBER', ''), + '
Note: 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 fhc help command can be used.', 'See https://github.com/feedhenry/fh-fhc#usage for usage.', 'To find the version of fhc you have installed, use the fhc version command
' diff --git a/lib/cmd/common/version.js b/lib/cmd/common/version.js index 83e8a4c3..0e8d4408 100644 --- a/lib/cmd/common/version.js +++ b/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(); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c3f8b533..cad7816c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "fh-fhc", - "version": "2.0.4-BUILD-NUMBER", + "version": "2.0.5", "dependencies": { "async": { "version": "0.2.9", @@ -19,34 +19,34 @@ "dependencies": { "CSSselect": { "version": "0.7.0", - "from": "CSSselect@0.x", + "from": "CSSselect@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/CSSselect/-/CSSselect-0.7.0.tgz", "dependencies": { "CSSwhat": { "version": "0.4.7", - "from": "CSSwhat@0.4", + "from": "CSSwhat@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz" }, "domutils": { "version": "1.4.3", - "from": "domutils@1.4", + "from": "domutils@>=1.4.0 <1.5.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz", "dependencies": { "domelementtype": { "version": "1.3.0", - "from": "domelementtype@1", + "from": "domelementtype@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" } } }, "boolbase": { "version": "1.0.0", - "from": "boolbase@~1.0.0", + "from": "boolbase@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" }, "nth-check": { "version": "1.0.1", - "from": "nth-check@~1.0.0", + "from": "nth-check@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz" } } @@ -55,34 +55,34 @@ }, "htmlparser2": { "version": "2.6.0", - "from": "htmlparser2@2.x", + "from": "htmlparser2@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-2.6.0.tgz", "dependencies": { "domhandler": { "version": "2.0.3", - "from": "domhandler@2.0", + "from": "domhandler@>=2.0.0 <2.1.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.0.3.tgz" }, "domutils": { "version": "1.0.1", - "from": "domutils@1.0", + "from": "domutils@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.0.1.tgz" }, "domelementtype": { "version": "1.3.0", - "from": "domelementtype@1", + "from": "domelementtype@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" } } }, "underscore": { "version": "1.4.4", - "from": "underscore@~1.4", + "from": "underscore@>=1.4.0 <1.5.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" }, "entities": { "version": "0.5.0", - "from": "entities@0.x", + "from": "entities@>=0.0.0 <1.0.0", "resolved": "https://registry.npmjs.org/entities/-/entities-0.5.0.tgz" } } @@ -121,44 +121,44 @@ "dependencies": { "rimraf": { "version": "2.4.3", - "from": "rimraf@2", + "from": "rimraf@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz", "dependencies": { "glob": { - "version": "5.0.14", - "from": "glob@^5.0.14", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz", + "version": "5.0.15", + "from": "glob@>=5.0.14 <6.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", "dependencies": { "inflight": { "version": "1.0.4", - "from": "inflight@^1.0.4", + "from": "inflight@>=1.0.4 <2.0.0", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "wrappy@1", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } }, "inherits": { "version": "2.0.1", - "from": "inherits@2", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "minimatch": { - "version": "2.0.10", - "from": "minimatch@^2.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz", + "version": "3.0.0", + "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz", "dependencies": { "brace-expansion": { - "version": "1.1.0", - "from": "brace-expansion@^1.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz", + "version": "1.1.1", + "from": "brace-expansion@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz", "dependencies": { "balanced-match": { "version": "0.2.0", - "from": "balanced-match@^0.2.0", + "from": "balanced-match@>=0.2.0 <0.3.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz" }, "concat-map": { @@ -172,19 +172,19 @@ }, "once": { "version": "1.3.2", - "from": "once@^1.3.0", + "from": "once@>=1.3.0 <2.0.0", "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", "dependencies": { "wrappy": { "version": "1.0.1", - "from": "wrappy@1", + "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" } } }, "path-is-absolute": { "version": "1.0.0", - "from": "path-is-absolute@^1.0.0", + "from": "path-is-absolute@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" } } @@ -193,18 +193,18 @@ }, "mkdirp": { "version": "0.3.5", - "from": "mkdirp@0.3", + "from": "mkdirp@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz" }, "graceful-fs": { "version": "1.2.3", - "from": "graceful-fs@~1.2.0", + "from": "graceful-fs@>=1.2.0 <1.3.0", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz" }, "inherits": { - "version": "1.0.1", - "from": "inherits@~1.0.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.1.tgz" + "version": "1.0.2", + "from": "inherits@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz" } } }, @@ -225,7 +225,7 @@ "dependencies": { "abbrev": { "version": "1.0.7", - "from": "abbrev@1", + "from": "abbrev@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" } } @@ -293,53 +293,53 @@ "dependencies": { "pullstream": { "version": "0.4.1", - "from": "pullstream@~0.4.0", + "from": "pullstream@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/pullstream/-/pullstream-0.4.1.tgz", "dependencies": { "over": { "version": "0.0.5", - "from": "over@>= 0.0.5 < 1", + "from": "over@>=0.0.5 <1.0.0", "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz" }, "slice-stream": { "version": "1.0.0", - "from": "slice-stream@>= 1.0.0 < 2", + "from": "slice-stream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/slice-stream/-/slice-stream-1.0.0.tgz" } } }, "binary": { "version": "0.3.0", - "from": "binary@~0.3.0", + "from": "binary@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", "dependencies": { "chainsaw": { "version": "0.1.0", - "from": "chainsaw@~0.1.0", + "from": "chainsaw@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", "dependencies": { "traverse": { "version": "0.3.9", - "from": "traverse@>=0.3.0 <0.4", + "from": "traverse@>=0.3.0 <0.4.0", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz" } } }, "buffers": { "version": "0.1.1", - "from": "buffers@~0.1.1", + "from": "buffers@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz" } } }, "readable-stream": { "version": "1.0.33", - "from": "readable-stream@~1.0.0", + "from": "readable-stream@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0", + "from": "core-util-is@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { @@ -349,20 +349,20 @@ }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x", + "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", - "from": "inherits@2", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } }, "setimmediate": { - "version": "1.0.2", - "from": "setimmediate@~1.0.1", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz" + "version": "1.0.4", + "from": "setimmediate@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz" }, "match-stream": { "version": "0.0.1", @@ -371,7 +371,7 @@ "dependencies": { "buffers": { "version": "0.1.1", - "from": "buffers@~0.1.1", + "from": "buffers@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz" } } diff --git a/package.json b/package.json index 6f8f9fae..72b739a7 100644 --- a/package.json +++ b/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",