From a683b1920a89b3da079d6b83fcd867ce56a73684 Mon Sep 17 00:00:00 2001 From: zce Date: Thu, 14 Feb 2019 20:54:42 +0800 Subject: [PATCH 1/2] fix: errors quote --- index.js | 10 +++++----- test/test.options.args.required.js | 2 +- test/test.variadic.args.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 84436d8ea..ec5f8de19 100644 --- a/index.js +++ b/index.js @@ -792,7 +792,7 @@ Command.prototype.opts = function() { */ Command.prototype.missingArgument = function(name) { - console.error("error: missing required argument `%s'", name); + console.error("error: missing required argument `%s`", name); process.exit(1); }; @@ -806,9 +806,9 @@ Command.prototype.missingArgument = function(name) { Command.prototype.optionMissingArgument = function(option, flag) { if (flag) { - console.error("error: option `%s' argument missing, got `%s'", option.flags, flag); + console.error("error: option `%s` argument missing, got `%s`", option.flags, flag); } else { - console.error("error: option `%s' argument missing", option.flags); + console.error("error: option `%s` argument missing", option.flags); } process.exit(1); }; @@ -822,7 +822,7 @@ Command.prototype.optionMissingArgument = function(option, flag) { Command.prototype.unknownOption = function(flag) { if (this._allowUnknownOption) return; - console.error("error: unknown option `%s'", flag); + console.error("error: unknown option `%s`", flag); process.exit(1); }; @@ -834,7 +834,7 @@ Command.prototype.unknownOption = function(flag) { */ Command.prototype.variadicArgNotLast = function(name) { - console.error("error: variadic arguments must be last `%s'", name); + console.error("error: variadic arguments must be last `%s`", name); process.exit(1); }; diff --git a/test/test.options.args.required.js b/test/test.options.args.required.js index 10eebc10b..ea019c2fd 100644 --- a/test/test.options.args.required.js +++ b/test/test.options.args.required.js @@ -15,7 +15,7 @@ console.error = function () { process.on('exit', function (code) { code.should.equal(1); info.length.should.equal(1); - info[0].should.equal("error: option `-c, --cheese ' argument missing"); + info[0].should.equal("error: option `-c, --cheese ` argument missing"); process.exit(0) }); diff --git a/test/test.variadic.args.js b/test/test.variadic.args.js index 80bdad530..1c58bcc10 100644 --- a/test/test.variadic.args.js +++ b/test/test.variadic.args.js @@ -57,4 +57,4 @@ try { process.exit = oldProcessExit; console.error = oldConsoleError; -'error: variadic arguments must be last `variadicArg\''.should.eql(errorMessage); +'error: variadic arguments must be last `variadicArg`'.should.eql(errorMessage); From dddba4411de45ff67f8887e31035c6c7e65cd586 Mon Sep 17 00:00:00 2001 From: zce Date: Sun, 17 Mar 2019 18:47:35 +0800 Subject: [PATCH 2/2] use straight single quotes --- index.js | 10 +++++----- test/test.options.args.required.js | 2 +- test/test.variadic.args.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index ec5f8de19..f809365a5 100644 --- a/index.js +++ b/index.js @@ -792,7 +792,7 @@ Command.prototype.opts = function() { */ Command.prototype.missingArgument = function(name) { - console.error("error: missing required argument `%s`", name); + console.error("error: missing required argument '%s'", name); process.exit(1); }; @@ -806,9 +806,9 @@ Command.prototype.missingArgument = function(name) { Command.prototype.optionMissingArgument = function(option, flag) { if (flag) { - console.error("error: option `%s` argument missing, got `%s`", option.flags, flag); + console.error("error: option '%s' argument missing, got '%s'", option.flags, flag); } else { - console.error("error: option `%s` argument missing", option.flags); + console.error("error: option '%s' argument missing", option.flags); } process.exit(1); }; @@ -822,7 +822,7 @@ Command.prototype.optionMissingArgument = function(option, flag) { Command.prototype.unknownOption = function(flag) { if (this._allowUnknownOption) return; - console.error("error: unknown option `%s`", flag); + console.error("error: unknown option '%s'", flag); process.exit(1); }; @@ -834,7 +834,7 @@ Command.prototype.unknownOption = function(flag) { */ Command.prototype.variadicArgNotLast = function(name) { - console.error("error: variadic arguments must be last `%s`", name); + console.error("error: variadic arguments must be last '%s'", name); process.exit(1); }; diff --git a/test/test.options.args.required.js b/test/test.options.args.required.js index ea019c2fd..826900a22 100644 --- a/test/test.options.args.required.js +++ b/test/test.options.args.required.js @@ -15,7 +15,7 @@ console.error = function () { process.on('exit', function (code) { code.should.equal(1); info.length.should.equal(1); - info[0].should.equal("error: option `-c, --cheese ` argument missing"); + info[0].should.equal("error: option '-c, --cheese ' argument missing"); process.exit(0) }); diff --git a/test/test.variadic.args.js b/test/test.variadic.args.js index 1c58bcc10..f8e1b0fc8 100644 --- a/test/test.variadic.args.js +++ b/test/test.variadic.args.js @@ -57,4 +57,4 @@ try { process.exit = oldProcessExit; console.error = oldConsoleError; -'error: variadic arguments must be last `variadicArg`'.should.eql(errorMessage); +'error: variadic arguments must be last \'variadicArg\''.should.eql(errorMessage);