fix(@angular/cli): ng get: return whole config root when no path prov…

…ided. Close #5887
angular · May 9, 2017 · a5d8bc1 · a5d8bc1
1 parent 382ba8d
commit a5d8bc1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/packages/@angular/cli/commands/get.ts b/packages/@angular/cli/commands/get.ts
@@ -32,16 +32,12 @@ const GetCommand = Command.extend({
           + 'you need the --global argument.');
       }
 
-      if (!rawArgs[0]) {
-        throw new SilentError('No key specified. Run "ng help get" for usage.');
-      }
-
       const value = config.get(rawArgs[0]);
 
       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);
       }

diff --git a/packages/@angular/cli/models/config/config.spec.ts b/packages/@angular/cli/models/config/config.spec.ts
@@ -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);

diff --git a/packages/@angular/cli/models/config/config.ts b/packages/@angular/cli/models/config/config.ts
@@ -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);
   }
 

diff --git a/tests/e2e/tests/commands/get/get.ts b/tests/e2e/tests/commands/get/get.ts
@@ -4,7 +4,7 @@ import {expectToFail} from '../../../utils/utils';
 export default function() {
   return Promise.resolve()
     .then(() => expectToFail(() => ng('get', 'apps.zzz.prefix')))
-    .then(() => expectToFail(() => ng('get')))
+    .then(() => ng('get'))
     .then(() => ng('get', 'apps.0.prefix'))
     .then(({ stdout }) => {
       if (!stdout.match(/app/)) {