Skip to content

Commit

Permalink
Merge 61f610d into b5e38b6
Browse files Browse the repository at this point in the history
  • Loading branch information
@chancancode
chancancode committed Jul 16, 2019
2 parents b5e38b6 + 61f610d commit a79cab8
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 14 deletions.
2 changes: 1 addition & 1 deletion blueprints/module-unification-app/files/package.json
View file
Expand Up @@ -33,7 +33,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.11.0-beta.1",
"ember-data": "~3.11.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
Expand Down
10 changes: 7 additions & 3 deletions lib/utilities/print-command.js
View file
Expand Up @@ -67,7 +67,7 @@ module.exports = function(initialMargin, shouldDescriptionBeGrey) {
}

if (option.default !== undefined) {
output += ` ${chalk.cyan(`(Default: ${option.default})`)}`;
output += ` ${chalk.cyan(`(Default: ${formatValue(option.default)})`)}`;
}

if (option.description) {
Expand All @@ -82,7 +82,7 @@ module.exports = function(initialMargin, shouldDescriptionBeGrey) {
return (a.length > 4 ? '--' : '-') + a + (option.type === Boolean ? '' : ' <value>');
} else {
let key = Object.keys(a)[0];
return `${(key.length > 4 ? '--' : '-') + key} (--${option.name}=${a[key]})`;
return `${(key.length > 4 ? '--' : '-') + key} (--${option.name}=${formatValue(a[key])})`;
}
})
.join(', ')}`
Expand All @@ -94,5 +94,9 @@ module.exports = function(initialMargin, shouldDescriptionBeGrey) {
};

function formatType(type) {
return typeof type === 'string' ? type : type.name;
return typeof type === 'string' ? formatValue(type) : type.name;
}

function formatValue(val) {
return val === '' ? '""' : val;
}
2 changes: 1 addition & 1 deletion tests/fixtures/addon/npm/package.json
View file
Expand Up @@ -41,7 +41,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.11.0",
"ember-source": "~3.11.1",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^6.2.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/addon/yarn/package.json
View file
Expand Up @@ -41,7 +41,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.11.0",
"ember-source": "~3.11.1",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^1.0.0",
"ember-welcome-page": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/app/npm/package.json
View file
Expand Up @@ -33,13 +33,13 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.11.0-beta.1",
"ember-data": "~3.11.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.11.0",
"ember-source": "~3.11.1",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-node": "^9.0.1",
"loader.js": "^4.7.0",
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/app/yarn/package.json
View file
Expand Up @@ -33,13 +33,13 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.11.0-beta.1",
"ember-data": "~3.11.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.11.0",
"ember-source": "~3.11.1",
"ember-welcome-page": "^4.0.0",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-node": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/help/help-with-addon.txt
View file
Expand Up @@ -93,7 +93,7 @@ ember init \u001b[33m<glob-pattern>\u001b[39m \u001b[36m<options...>\u001b[39m
\u001b[90maliases: -sb\u001b[39m
\u001b[36m--welcome\u001b[39m \u001b[36m(Boolean)\u001b[39m \u001b[36m(Default: true)\u001b[39m Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.
\u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m
\u001b[36m--name\u001b[39m \u001b[36m(String)\u001b[39m \u001b[36m(Default: )\u001b[39m
\u001b[36m--name\u001b[39m \u001b[36m(String)\u001b[39m \u001b[36m(Default: "")\u001b[39m
\u001b[90maliases: -n <value>\u001b[39m

ember install \u001b[33m<addon-name>\u001b[39m \u001b[36m<options...>\u001b[39m
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/help/help.txt
View file
Expand Up @@ -93,7 +93,7 @@ ember init \u001b[33m<glob-pattern>\u001b[39m \u001b[36m<options...>\u001b[39m
\u001b[90maliases: -sb\u001b[39m
\u001b[36m--welcome\u001b[39m \u001b[36m(Boolean)\u001b[39m \u001b[36m(Default: true)\u001b[39m Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.
\u001b[36m--yarn\u001b[39m \u001b[36m(Boolean)\u001b[39m
\u001b[36m--name\u001b[39m \u001b[36m(String)\u001b[39m \u001b[36m(Default: )\u001b[39m
\u001b[36m--name\u001b[39m \u001b[36m(String)\u001b[39m \u001b[36m(Default: "")\u001b[39m
\u001b[90maliases: -n <value>\u001b[39m

ember install \u001b[33m<addon-name>\u001b[39m \u001b[36m<options...>\u001b[39m
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/module-unification-app/npm/package.json
View file
Expand Up @@ -33,7 +33,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.11.0-beta.1",
"ember-data": "~3.11.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/module-unification-app/yarn/package.json
View file
Expand Up @@ -33,7 +33,7 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-data": "~3.11.0-beta.1",
"ember-data": "~3.11.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/utilities/print-command-test.js
View file
Expand Up @@ -84,4 +84,25 @@ describe('printCommand', function() {

expect(output).to.equal(testString);
});

it('quotes empty strings', function() {
let output = printCommand.call({
availableOptions: [
{
name: 'type',
type: ['', 'foo', 'bar'], // setting to empty string is allowed
default: '',
aliases: [{ 'no-type': '' }],
},
],
anonymousOptions: [],
});

let testString = processHelpString(`\
\u001b[36m<options...>\u001b[39m${EOL}\
\u001b[36m--type\u001b[39m \u001b[36m("", foo, bar)\u001b[39m \u001b[36m(Default: "")\u001b[39m${EOL}\
\u001b[90maliases: --no-type (--type="")\u001b[39m`);

expect(output).to.equal(testString);
});
});

0 comments on commit a79cab8

Please sign in to comment.