Bump to 2.0

knolleary · knolleary · commit 6bcf587d1e86 · 2021-06-10T10:15:47.000+01:00
diff --git a/README.md b/README.md
@@ -7,6 +7,13 @@ The Node-RED admin command line interface.
 
 A command line tool for remotely administering Node-RED.
 
+It is built into `node-red` and can be run as:
+
+    node-red admin ....
+
+
+## Standalone install
+
 Install this globally to make the `node-red-admin` command available on your path:
 
     npm install -g node-red-admin
@@ -39,4 +46,4 @@ By default, the tool stores its configuration in `~/.node-red/.cli-config.json`.
 can specify a different directory for the config file using the `--userDir` argument.
 
 The `--json` option causes the tool to format its output as JSON making it suitable
-for scripting.
+for scripting.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-admin",
-    "version": "0.2.7",
+    "version": "2.0.0",
     "description": "The Node-RED admin command line interface",
     "homepage": "http://nodered.org",
     "bugs": {
@@ -13,7 +13,7 @@
     },
     "main": "lib/index.js",
     "engines": {
-        "node": ">=8"
+        "node": ">=12"
     },
     "contributors": [
         {
@@ -38,12 +38,13 @@
         "grunt-cli": "^1.3.2",
         "grunt-contrib-jshint": "^3.0.0",
         "grunt-simple-mocha": "^0.4.1",
-        "mocha": "^7.1.0",
-        "should": "^13.2.3",
-        "sinon": "1.17.7"
+        "mocha": "9.0.0",
+        "should": "13.2.3",
+        "sinon": "11.1.1",
+        "sinon-test": "^3.1.0"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.8"
+        "bcrypt": "5.0.1"
     },
     "bin": {
         "node-red-admin": "node-red-admin.js"
diff --git a/test/lib/commands/disable_spec.js b/test/lib/commands/disable_spec.js
@@ -32,7 +32,7 @@ describe("commands/disable", function() {
 
     it('disables a node', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes/testnode");
                 opts.should.eql({
diff --git a/test/lib/commands/enable_spec.js b/test/lib/commands/enable_spec.js
@@ -32,7 +32,7 @@ describe("commands/enable", function() {
 
     it('enables a node', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes/testnode");
                 opts.should.eql({
diff --git a/test/lib/commands/hash_spec.js b/test/lib/commands/hash_spec.js
@@ -34,7 +34,7 @@ describe("commands/hash-pw", function() {
         prompt.read.restore();
     });
     it('generates a bcrypt hash of provided password',function(done) {
-        sinon.stub(prompt,"read",function(opts,callback) {
+        sinon.stub(prompt,"read").callsFake(function(opts,callback) {
             callback(null,"a-test-password");
         });
 
@@ -48,7 +48,7 @@ describe("commands/hash-pw", function() {
         });
     });
     it('ignores blank password',function(done) {
-        sinon.stub(prompt,"read",function(opts,callback) {
+        sinon.stub(prompt,"read").callsFake(function(opts,callback) {
             callback(null,"");
         });
 
@@ -58,7 +58,7 @@ describe("commands/hash-pw", function() {
         });
     });
     it('ignores null password',function(done) {
-        sinon.stub(prompt,"read",function(opts,callback) {
+        sinon.stub(prompt,"read").callsFake(function(opts,callback) {
             callback(null,null);
         });
 
diff --git a/test/lib/commands/info_spec.js b/test/lib/commands/info_spec.js
@@ -32,7 +32,7 @@ describe("commands/info", function() {
 
     it('displays information on a module', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes/testnode");
                 opts.should.eql({});
@@ -52,7 +52,7 @@ describe("commands/info", function() {
 
     it('reports error', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes/testnode");
                 opts.should.eql({});
diff --git a/test/lib/commands/install_spec.js b/test/lib/commands/install_spec.js
@@ -32,7 +32,7 @@ describe("commands/install", function() {
 
     it('installs a node', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes");
                 opts.should.eql({
diff --git a/test/lib/commands/list_spec.js b/test/lib/commands/list_spec.js
@@ -29,7 +29,7 @@ describe("commands/list", function() {
 
     it('lists all nodes', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes");
                 opts.should.eql({});
diff --git a/test/lib/commands/login_spec.js b/test/lib/commands/login_spec.js
@@ -27,8 +27,8 @@ var result = require("./result_helper");
 
 describe("commands/list", function() {
     beforeEach(function() {
-        sinon.stub(config,"tokens",function(token) {});
-        sinon.stub(prompt,"read",function(opts,callback) {
+        sinon.stub(config,"tokens").callsFake(function(token) {});
+        sinon.stub(prompt,"read").callsFake(function(opts,callback) {
             if (/Username/.test(opts.prompt)) {
                 callback(null,"username");
             } else if (/Password/.test(opts.prompt)) {
diff --git a/test/lib/commands/remove_spec.js b/test/lib/commands/remove_spec.js
@@ -32,7 +32,7 @@ describe("commands/remove", function() {
 
     it('removes a node', function(done) {
         var error;
-        sinon.stub(request,"request",function(path,opts) {
+        sinon.stub(request,"request").callsFake(function(path,opts) {
             try {
                 should(path).be.eql("/nodes/testnode");
                 opts.should.eql({
diff --git a/test/lib/commands/result_helper.js b/test/lib/commands/result_helper.js
@@ -25,11 +25,11 @@ module.exports = {
     logDetails: sinon.spy(),
 
     reset: function() {
-        module.exports.log.reset();
-        module.exports.warn.reset();
-        module.exports.help.reset();
-        module.exports.logList.reset();
-        module.exports.logNodeList.reset();
-        module.exports.logDetails.reset();
+        module.exports.log.resetHistory();
+        module.exports.warn.resetHistory();
+        module.exports.help.resetHistory();
+        module.exports.logList.resetHistory();
+        module.exports.logNodeList.resetHistory();
+        module.exports.logDetails.resetHistory();
     }
 };
diff --git a/test/lib/commands/target_spec.js b/test/lib/commands/target_spec.js
@@ -27,7 +27,7 @@ describe("commands/target", function() {
     var target;
     beforeEach(function() {
         target = "http://test.example.com";
-        sinon.stub(config,"target", function(arg) {
+        sinon.stub(config,"target").callsFake(function(arg) {
             if (arg) { target = arg } else { return target;}
         });
     });
diff --git a/test/lib/config_spec.js b/test/lib/config_spec.js
@@ -16,6 +16,7 @@
 
 var should = require("should");
 var sinon = require("sinon");
+sinon.test = require("sinon-test")(sinon);
 var fs = require("fs");
 
 var config = require("../../lib/config");
@@ -26,23 +27,23 @@ describe("lib/config", function() {
         config.unload();
     });
     it('loads preferences when target referenced', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{"target":"http://example.com:1880"}';
         });
         config.target().should.eql("http://example.com:1880");
     }));
     it('provide default value for target', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{}';
         });
         config.target().should.eql("http://localhost:1880");
     }));
-    
+
     it('saves preferences when target set', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{"target":"http://another.example.com:1880"}';
         });
-        this.stub(fs,"writeFileSync",function() {});
+        this.stub(fs,"writeFileSync").callsFake(function() {});
 
         config.target().should.eql("http://another.example.com:1880");
         config.target("http://final.example.com:1880");
@@ -52,18 +53,18 @@ describe("lib/config", function() {
         fs.writeFileSync.calledOnce.should.be.true;
 
     }));
-    
+
     it('provide default value for tokens', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{}';
         });
         should.not.exist(config.tokens());
     }));
     it('saves preferences when tokens set', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{}';
         });
-        this.stub(fs,"writeFileSync",function() {});
+        this.stub(fs,"writeFileSync").callsFake(function() {});
 
         should.not.exist(config.tokens());
         config.tokens({access_token:"123"});
@@ -72,12 +73,12 @@ describe("lib/config", function() {
         fs.readFileSync.calledOnce.should.be.true;
         fs.writeFileSync.calledOnce.should.be.true;
     }));
-    
+
     it('setting preference to null removes it', sinon.test(function() {
-        this.stub(fs,"readFileSync",function() {
+        this.stub(fs,"readFileSync").callsFake(function() {
             return '{"tokens":{"access_token":"123"}}';
         });
-        this.stub(fs,"writeFileSync",function() {});
+        this.stub(fs,"writeFileSync").callsFake(function() {});
 
         config.tokens().should.eql({access_token:"123"});
         config.tokens(null);
@@ -86,5 +87,5 @@ describe("lib/config", function() {
         fs.readFileSync.calledOnce.should.be.true;
         fs.writeFileSync.calledOnce.should.be.true;
     }));
-    
+
 });
diff --git a/test/lib/request_spec.js b/test/lib/request_spec.js
@@ -25,8 +25,8 @@ var config = require("../../lib/config");
 describe("lib/request", function() {
     "use strict";
     before(function() {
-        sinon.stub(config,"target",function() { return "http://example.com/target"; });
-        sinon.stub(config,"tokens",function() { return null; });
+        sinon.stub(config,"target").returns("http://example.com/target");
+        sinon.stub(config,"tokens").returns(null);
     });
     after(function() {
         config.target.restore();
@@ -200,7 +200,7 @@ describe("lib/request", function() {
     it('attaches authorization header if token available', function(done) {
         sinon.stub(request, 'get').returns(Promise.resolve({status: 200,data:{a:"b"}}));
         config.tokens.restore();
-        sinon.stub(config,"tokens",function() { return {access_token:"123456"}});
+        sinon.stub(config,"tokens").returns({access_token:"123456"});
 
         api.request("/foo",{}).then(function(res) {
             try {
