Skip to content
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

Jump to bottom

fix(@angular/cli): ng get: return whole config root when no path provided. #5887

Closed
wants to merge 8 commits into from
Closed

fix(@angular/cli): ng get: return whole config root when no path provided. #5887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
309118a
fix(@angular/cli): Throw error when no key provided for ng get
prestonvanloon Apr 8, 2017
ef3a19c
fix(@angular/cli): Throw error when no key provided for ng get
prestonvanloon Apr 8, 2017
69c3140
fix(@angular/cli): ng get: return whole config root when no path prov…
prestonvanloon Apr 9, 2017
cafe9e2
fix(@angular/cli): ng get: return whole config root when no path prov…
prestonvanloon Apr 9, 2017
f903570
fix(@angular/cli): ng get: return whole config root when no path prov…
prestonvanloon Apr 9, 2017
7abb613
Merge branch 'master' into fix/ng-get
prestonvanloon Apr 11, 2017
add3642
Merge branch 'master' into fix/ng-get
prestonvanloon Apr 28, 2017
1941fe6
Merge github.com:angular/angular-cli into fix/ng-get
prestonvanloon May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@angular/cli/commands/get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface GetOptions {

const GetCommand = Command.extend({
name: 'get',
description: 'Get a value from the configuration.',
description: 'Get a value from the configuration. Example: ng get [key]',
works: 'everywhere',

availableOptions: [
Expand All @@ -37,7 +37,7 @@ const GetCommand = Command.extend({
if (value === null || value === undefined) {
throw new SilentError('Value cannot be found.');
} else if (typeof value == 'object') {
console.log(JSON.stringify(value));
console.log(JSON.stringify(value, null, 2));
} else {
console.log(value);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/@angular/cli/models/config/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ describe('Config', () => {
stringKey: 'stringValue'
});

expect(JSON.parse(JSON.stringify(config.get()))).toEqual({
requiredKey: 1,
stringKeyDefault: 'defaultValue',
stringKey: 'stringValue'
});
expect(config.get('requiredKey')).toEqual(1);
expect(config.get('stringKey')).toEqual('stringValue');
expect(config.get('booleanKey')).toEqual(undefined);
Expand Down
5 changes: 4 additions & 1 deletion packages/@angular/cli/models/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ export class CliConfig<JsonType> {
return this._config.$$alias(path, newPath);
}

get(jsonPath: string) {
get(jsonPath?: string) {
if (!jsonPath) {
return this._config.$$root();
}
return this._config.$$get(jsonPath);
}

Expand Down
1 change: 1 addition & 0 deletions tests/e2e/tests/commands/get/get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {expectToFail} from '../../../utils/utils';
export default function() {
return Promise.resolve()
.then(() => expectToFail(() => ng('get', 'apps.zzz.prefix')))
.then(() => ng('get'))
.then(() => ng('get', 'apps.0.prefix'))
.then(({ stdout }) => {
if (!stdout.match(/app/)) {
Expand Down