fix(@angular/cli): Fixing global path issue

Author: sumitarora

packages/@angular/cli/models/config.ts

@@ -95,8 +95,10 @@ export class CliConfig extends CliConfigBase<ConfigInterface> {
 
   static fromProject(projectPath?: string): CliConfig {
     const configPath = this.configFilePath(projectPath);
-    if (!configPath || configPath === this.globalConfigFilePath()) {
-      return null;
+
+    if (!configPath ||
+     (configPath === this.globalConfigFilePath() && process.cwd() !== path.dirname(configPath))) {
+        return null;
     }
     if (configCacheMap.has(configPath)) {
       return configCacheMap.get(configPath);

packages/@angular/cli/models/config/config.ts

@@ -74,9 +74,13 @@ export class CliConfig<JsonType> {
       ? ts.sys.readFile(configPath)
       : '{}';
     const schemaContent = fs.readFileSync(DEFAULT_CONFIG_SCHEMA_PATH, 'utf-8');
-    const otherContents = otherPath
-      .map(path => fs.existsSync(path) && ts.sys.readFile(path))
-      .filter(content => !!content);
+
+    let otherContents = new Array<string>();
+    if (configPath !== otherPath[0]) {
+      otherContents = otherPath
+        .map(path => fs.existsSync(path) && ts.sys.readFile(path))
+        .filter(content => !!content);
+    }
 
     let content: T;
     let schema: Object;

tests/e2e/tests/generate/generate-error.ts

@@ -0,0 +1,8 @@
+import {ng} from '../../utils/process';
+import {deleteFile} from '../../utils/fs';
+import {expectToFail} from '../../utils/utils';
+
+export default function() {
+  return deleteFile('.angular-cli.json')
+    .then(() => expectToFail(() => ng('generate', 'class', 'hello')));
+}