fix(@angular/cli): fix an issue with schematics

The issue here is that the sourceDir string could be anywhere in the
path. We only care about it if its at the start.

Author: hansl

packages/@angular/cli/commands/generate.ts

@@ -142,9 +142,10 @@ export default Command.extend({
     commandOptions.appRoot = parsedPath.appRoot.startsWith(root)
       ? parsedPath.appRoot.substr(root.length)
       : parsedPath.appRoot;
-    commandOptions.path = parsedPath.dir
-      .replace(appConfig.root + path.sep, '')
-      .replace(separatorRegEx, '/');
+    commandOptions.path = parsedPath.dir.replace(separatorRegEx, '/');
+    if (parsedPath.dir.startsWith(root)) {
+      commandOptions.path = commandOptions.path.substr(root.length);
+    }
 
     const cwd = this.project.root;
     const schematicName = rawArgs[0];

tests/e2e/tests/generate/component/component-module-2.ts

@@ -0,0 +1,24 @@
+import * as fs from 'fs-extra';
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectFileToMatch} from '../../../utils/fs';
+
+
+export default function() {
+  const root = process.cwd();
+  const modulePath = join(root, 'src', 'app', 'app.module.ts');
+
+  fs.mkdirSync('./src/app/sub-dir');
+
+  return ng('generate', 'component', 'test-component', '--module', 'app.module.ts')
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestComponentComponent } from '.\/test-component\/test-component.component'/))
+
+    .then(() => process.chdir(join(root, 'src', 'app')))
+    .then(() => ng('generate', 'component', 'test-component2', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestComponent2Component } from '.\/test-component2\/test-component2.component'/))
+
+    // Try to run the unit tests.
+    .then(() => ng('build'));
+}