Skip to content

chore(docs): change ember-cli and ember to angular-cli and ng #3726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2016
Merged

chore(docs): change ember-cli and ember to angular-cli and ng #3726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/angular-cli/ember-cli/lib/models/command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ Command.prototype.validateAndRun = function(args) {

if (this.works === 'insideProject' && !this.isWithinProject) {
return Promise.reject(new SilentError(
'You have to be inside an ember-cli project in order to use ' +
'You have to be inside an angular-cli project in order to use ' +
'the ' + chalk.green(this.name) + ' command.'
));
}

if (this.works === 'outsideProject' && this.isWithinProject) {
return Promise.reject(new SilentError(
'You cannot use the ' + chalk.green(this.name) + ' command inside an ember-cli project.'
'You cannot use the ' + chalk.green(this.name) + ' command inside an angular-cli project.'
));
}

Expand Down Expand Up @@ -363,7 +363,7 @@ Command.prototype.parseArgs = function(commandArgs) {
// ignore 'argv', 'h', and 'help'
if (!commandOptions.hasOwnProperty(key) && key !== 'argv' && key !== 'h' && key !== 'help') {
this.ui.writeLine(chalk.yellow('The option \'--' + key + '\' is not registered with the ' + this.name + ' command. ' +
'Run `ember ' + this.name + ' --help` for a list of supported options.'));
'Run `ng ' + this.name + ' --help` for a list of supported options.'));
}
if (typeof parsedOptions[key] !== 'object') {
commandOptions[camelize(key)] = parsedOptions[key];
Expand Down Expand Up @@ -408,7 +408,7 @@ Command.prototype._printCommand = printCommand;

Basic help looks like this:

ember generate <blueprint> <options...>
ng generate <blueprint> <options...>
Generates new code from blueprints
aliases: g
--dry-run (Default: false)
Expand All @@ -420,7 +420,7 @@ Command.prototype._printCommand = printCommand;
@method printBasicHelp
*/
Command.prototype.printBasicHelp = function() {
// ember command-name
// ng command-name
var output;
if (this.isRoot) {
output = 'Usage: ' + this.name;
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/new.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe('Acceptance: ng new', function () {
return ng(['new', 'foo', '--skip-npm', '--skip-git'])
.then(function () {
return ng(['new', 'foo', '--skip-npm', '--skip-git']).then(() => {
throw new SilentError('Cannot run ng new, inside of ember-cli project should fail.');
throw new SilentError('Cannot run ng new, inside of angular-cli project should fail.');
}, () => {
expect(!existsSync('foo'));
});
Expand Down