fix(@angular/cli): fix issue of folder getting generated on dry run

sumitarora · sumitarora · commit 2dfeaae65d6a · 2017-04-21T12:27:10.000-04:00
diff --git a/packages/@angular/cli/blueprints/class/index.ts b/packages/@angular/cli/blueprints/class/index.ts
@@ -26,7 +26,8 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName.split('.')[0], appConfig);
+    const parsedPath =
+     dynamicPathParser(this.project, entityName.split('.')[0], appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts
@@ -123,7 +123,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
 
diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts
@@ -76,7 +76,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
 
diff --git a/packages/@angular/cli/blueprints/enum/index.ts b/packages/@angular/cli/blueprints/enum/index.ts
@@ -19,7 +19,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/guard/index.ts b/packages/@angular/cli/blueprints/guard/index.ts
@@ -45,7 +45,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/interface/index.ts b/packages/@angular/cli/blueprints/interface/index.ts
@@ -24,7 +24,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/module/index.ts b/packages/@angular/cli/blueprints/module/index.ts
@@ -38,7 +38,7 @@ export default Blueprint.extend({
   normalizeEntityName: function (entityName: string) {
     this.entityName = entityName;
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts
@@ -71,7 +71,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts
@@ -50,7 +50,7 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig);
+    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js
@@ -509,7 +509,7 @@ Blueprint.prototype.install = function(options) {
     ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' +
       ' changes will be written.'));
   }
-
+  
   this._normalizeEntityName(options.entity);
   this._checkForPod(options.verbose);
   this._checkInRepoAddonExists(options.inRepoAddon);
diff --git a/packages/@angular/cli/utilities/dynamic-path-parser.ts b/packages/@angular/cli/utilities/dynamic-path-parser.ts
@@ -3,7 +3,8 @@ import * as process from 'process';
 import * as fs from 'fs';
 const stringUtils = require('ember-cli-string-utils');
 
-export function dynamicPathParser(project: any, entityName: string, appConfig: any) {
+export function dynamicPathParser
+  (project: any, entityName: string, appConfig: any, dryRun: boolean) {
   const projectRoot = project.root;
   const sourceDir = appConfig.root;
   const appRoot = path.join(sourceDir, 'app');
@@ -38,7 +39,9 @@ export function dynamicPathParser(project: any, entityName: string, appConfig: a
       // Folder not found, create it, and return it
       const dasherizedPart = stringUtils.dasherize(part);
       const dasherizedDirName = path.join(tempPath, dasherizedPart);
-      fs.mkdirSync(dasherizedDirName);
+      if (!dryRun) {
+        fs.mkdirSync(dasherizedDirName);
+      }
       return dasherizedDirName;
 
     }, parsedOutputPath.root);
diff --git a/packages/@angular/cli/utilities/resolve-module-file.ts b/packages/@angular/cli/utilities/resolve-module-file.ts
@@ -39,7 +39,7 @@ export function resolveModulePath(
 }
 
 function buildFullPath(project: any, relativeModulePath: string, appConfig: any, projectRoot: any) {
-  const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig);
+  const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig, false);
   const fullModulePath = path.join(projectRoot, parsedPath.dir, parsedPath.base);
 
   return fullModulePath;
diff --git a/tests/acceptance/dynamic-path-parser.spec.js b/tests/acceptance/dynamic-path-parser.spec.js
@@ -42,28 +42,28 @@ describe('dynamic path parser', () => {
 
   it('parse from proj root dir', () => {
     process.env.PWD = project.root;
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it('parse from proj src dir', () => {
     process.env.PWD = path.join(project.root, 'src');
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client dir`, () => {
     process.env.PWD = path.join(project.root, 'src', 'client');
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app dir`, () => {
     process.env.PWD = path.join(project.root, 'src', 'client', 'app');
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
@@ -82,7 +82,7 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir');
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
     expect(result.name).to.equal(entityName);
   });
@@ -100,7 +100,7 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir');
-    var result = dynamicPathParser(project, '..' + path.sep + entityName, appConfig);
+    var result = dynamicPathParser(project, '..' + path.sep + entityName, appConfig, false);
     expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
@@ -121,7 +121,7 @@ describe('dynamic path parser', () => {
       };
       mockFs(mockFolder);
       process.env.PWD = path.join(project.root, 'src', 'app', 'child-dir', 'grand-child-dir');
-      var result = dynamicPathParser(project, '..' + path.sep + entityName, appConfig);
+      var result = dynamicPathParser(project, '..' + path.sep + entityName, appConfig, false);
       expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
       expect(result.name).to.equal(entityName);
     });
@@ -137,14 +137,14 @@ describe('dynamic path parser', () => {
     };
     mockFs(mockFolder);
     process.env.PWD = path.join(project.root, 'src', 'app', 'my-route');
-    var result = dynamicPathParser(project, entityName, appConfig);
+    var result = dynamicPathParser(project, entityName, appConfig, false);
     expect(result.dir).to.equal(`${appDir}${path.sep}+my-route`);
     expect(result.name).to.equal(entityName);
   });
 
   it('create new dirs as dasherized', () => {
     process.env.PWD = project.root;
-    var result = dynamicPathParser(project, path.join('NewDir', entityName), appConfig);
+    var result = dynamicPathParser(project, path.join('NewDir', entityName), appConfig, false);
     expect(result.dir).to.equal(`${appDir}${path.sep}new-dir`);
     expect(result.name).to.equal(entityName);
   });

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ Blueprint.prototype.install = function(options) {`
`509`	`509`	`ui.writeLine(chalk.yellow('You specified the dry-run flag, so no' +`
`510`	`510`	`' changes will be written.'));`
`511`	`511`	`}`
`512`		`-`
	`512`	`+`
`513`	`513`	`this._normalizeEntityName(options.entity);`
`514`	`514`	`this._checkForPod(options.verbose);`
`515`	`515`	`this._checkInRepoAddonExists(options.inRepoAddon);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export function resolveModulePath(`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`function buildFullPath(project: any, relativeModulePath: string, appConfig: any, projectRoot: any) {`
`42`		`- const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig);`
	`42`	`+ const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig, false);`
`43`	`43`	`const fullModulePath = path.join(projectRoot, parsedPath.dir, parsedPath.base);`
`44`	`44`
`45`	`45`	`return fullModulePath;`