fix(@angular/cli): Verify workspace file for inProject commands

Author: Brocco

packages/@angular/cli/models/command-runner.ts

@@ -11,6 +11,8 @@ import { logging } from '@angular-devkit/core';
 import { camelize } from '@angular-devkit/core/src/utils/strings';
 
 import * as yargsParser from 'yargs-parser';
+import * as fs from 'fs';
+import { join } from 'path';
 
 export interface CommandMap {
   [key: string]: CommandConstructor;
@@ -74,6 +76,7 @@ export async function runCommand(commandMap: CommandMap,
     return await runHelp(command, options);
   } else {
     verifyCommandInScope(command, executionScope);
+    verifyWorkspace(command, executionScope, context.project.root);
     delete options.h;
     delete options.help;
     return await validateAndRunCommand(command, options);
@@ -204,6 +207,21 @@ function verifyCommandInScope(command: Command, scope = CommandScope.everywhere)
   }
 }
 
+function verifyWorkspace(command: Command, executionScope: CommandScope, root: string): void {
+  if (command.scope === CommandScope.everywhere) {
+    return;
+  }
+  if (executionScope === CommandScope.inProject) {
+    if (fs.existsSync(join(root, 'angular.json'))) {
+      return;
+    }
+    if (fs.existsSync(join(root, '.angular.json'))) {
+      return;
+    }
+    throw new Error('Invalid project: missing workspace file.');
+  }
+}
+
 // Execute a command's `printHelp`.
 async function runHelp(command: Command, options: any): Promise<void> {
   return await command.printHelp(options);

tests/e2e/tests/misc/workspace-verification.ts

@@ -0,0 +1,13 @@
+import {deleteFile} from '../../utils/fs';
+import {ng} from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
+
+
+export default function() {
+  return ng('generate', 'component', 'foo', '--dry-run')
+    .then(() => deleteFile('angular.json'))
+    // fails because it needs to be inside a project
+    // without a workspace file
+    .then(() => expectToFail(() => ng('generate', 'component', 'foo', '--dry-run')))
+    .then(() => ng('version'));
+}