Merge pull request #1658 from NativeScript/milanov/change-warning-for-project-with-name-app

Change the warning when creating project with name app

Author: rosen-vladimirov

lib/commands/create-project.ts

@@ -3,33 +3,11 @@
 
 import * as constants from "../constants";
 
-export class ProjectCommandParameter implements ICommandParameter {
-	constructor(private $errors: IErrors,
-		private $logger: ILogger,
-		private $projectNameValidator: IProjectNameValidator) { }
-
-	mandatory = true;
-	validate(value: string): IFuture<boolean> {
-		return (() => {
-			if(!value) {
-				this.$errors.fail("You must specify <App name> when creating a new project.");
-			}
-
-			if (value.toUpperCase() === "APP") {
-				this.$logger.warn("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.");
-			}
-
-			return this.$projectNameValidator.validate(value);
-		}).future<boolean>()();
-	}
-}
-
 export class CreateProjectCommand implements ICommand {
 	constructor(private $projectService: IProjectService,
 		private $errors: IErrors,
-		private $logger: ILogger,
-		private $projectNameValidator: IProjectNameValidator,
-		private $options: IOptions) { }
+		private $options: IOptions,
+		private $stringParameterBuilder: IStringParameterBuilder) { }
 
 	public enableHooks = false;
 
@@ -45,6 +23,7 @@ export class CreateProjectCommand implements ICommand {
 		}).future<void>()();
 	}
 
-	allowedParameters = [new ProjectCommandParameter(this.$errors, this.$logger, this.$projectNameValidator) ];
+	public allowedParameters: ICommandParameter[] = [this.$stringParameterBuilder.createMandatoryParameter("Project name cannot be empty.")];
 }
+
 $injector.registerCommand("create", CreateProjectCommand);

lib/services/project-name-service.ts

@@ -15,16 +15,25 @@ export class ProjectNameService implements IProjectNameService {
 			}
 
 			if (!this.$projectNameValidator.validate(projectName)) {
-				return this.promptForNewName(projectName, validateOptions).wait();
+				return this.promptForNewName("The project name is invalid.", projectName, validateOptions).wait();
 			}
 
+			let userCanInteract = isInteractive();
+
 			if (!this.checkIfNameStartsWithLetter(projectName)) {
-				if (!isInteractive()) {
+				if (!userCanInteract) {
 					this.$errors.fail("The project name does not start with letter and will fail to build for Android. If You want to create project with this name add --force to the create command.");
-					return;
 				}
 
-				return this.promptForNewName(projectName, validateOptions).wait();
+				return this.promptForNewName("The project name does not start with letter and will fail to build for Android.", projectName, validateOptions).wait();
+			}
+
+			if (projectName.toUpperCase() === "APP") {
+				if (!userCanInteract) {
+					this.$errors.fail("You cannot build applications named 'app' in Xcode. Consider creating a project with different name. If You want to create project with this name add --force to the create command.");
+				}
+
+				return this.promptForNewName("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.", projectName, validateOptions).wait();
 			}
 
 			return projectName;
@@ -36,9 +45,9 @@ export class ProjectNameService implements IProjectNameService {
 		return startsWithLetterExpression.test(projectName);
 	}
 
-	private promptForNewName(projectName: string, validateOptions?: { force: boolean }): IFuture<string> {
+	private promptForNewName(warningMessage: string, projectName: string, validateOptions?: { force: boolean }): IFuture<string> {
 		return (() => {
-			if (this.promptForForceNameConfirm().wait()) {
+			if (this.promptForForceNameConfirm(warningMessage).wait()) {
 				return projectName;
 			}
 
@@ -47,9 +56,9 @@ export class ProjectNameService implements IProjectNameService {
 		}).future<string>()();
 	}
 
-	private promptForForceNameConfirm(): IFuture<boolean> {
+	private promptForForceNameConfirm(warningMessage: string): IFuture<boolean> {
 		return (() => {
-			this.$logger.warn("The project name does not start with letter and will fail to build for Android.");
+			this.$logger.warn(warningMessage);
 
 			return this.$prompter.confirm("Do you want to create the project with this name?").wait();
 		}).future<boolean>()();

test/project-commands.ts

@@ -4,6 +4,7 @@
 import { Yok } from "../lib/common/yok";
 import * as stubs from "./stubs";
 import { CreateProjectCommand } from "../lib/commands/create-project";
+import { StringParameterBuilder } from "../lib/common/command-params";
 import * as constants from "../lib/constants";
 import {assert} from "chai";
 
@@ -40,6 +41,7 @@ function createTestInjector() {
 		template: undefined
 	});
 	testInjector.register("createCommand", CreateProjectCommand);
+	testInjector.register("stringParameterBuilder", StringParameterBuilder);
 
 	return testInjector;
 }

test/project-name-service.ts

@@ -33,7 +33,7 @@ describe("Project Name Service Tests", () => {
 	let testInjector: IInjector;
 	let projectNameService: IProjectNameService;
 	let validProjectName = "valid";
-	let invalidProjectName = "1invalid";
+	let invalidProjectNames = ["1invalid", "app"];
 
 	beforeEach(() => {
 		testInjector = createTestInjector();
@@ -46,33 +46,35 @@ describe("Project Name Service Tests", () => {
 		assert.deepEqual(actualProjectName, validProjectName);
 	});
 
-	it("returns correct name when invalid name is entered several times and then valid name is entered", () => {
-		let prompter = testInjector.resolve("prompter");
-		prompter.confirm = (message: string): IFuture<boolean> => Future.fromResult(false);
+	_.each(invalidProjectNames, invalidProjectName => {
+		it(`returns correct name when "${invalidProjectName}" is entered several times and then valid name is entered`, () => {
+			let prompter = testInjector.resolve("prompter");
+			prompter.confirm = (message: string): IFuture<boolean> => Future.fromResult(false);
 
-		let incorrectInputsLimit = 5;
-		let incorrectInputsCount = 0;
+			let incorrectInputsLimit = 5;
+			let incorrectInputsCount = 0;
 
-		prompter.getString = (message: string): IFuture<string> => {
-			return (() => {
-				if (incorrectInputsCount < incorrectInputsLimit) {
-					incorrectInputsCount++;
+			prompter.getString = (message: string): IFuture<string> => {
+				return (() => {
+					if (incorrectInputsCount < incorrectInputsLimit) {
+						incorrectInputsCount++;
 
-					return invalidProjectName;
-				} else {
-					return validProjectName;
-				}
-			}).future<string>()();
-		};
+						return invalidProjectName;
+					} else {
+						return validProjectName;
+					}
+				}).future<string>()();
+			};
 
-		let actualProjectName = projectNameService.ensureValidName(invalidProjectName).wait();
+			let actualProjectName = projectNameService.ensureValidName(invalidProjectName).wait();
 
-		assert.deepEqual(actualProjectName, validProjectName);
-	});
+			assert.deepEqual(actualProjectName, validProjectName);
+		});
 
-	it("returns the invalid name when invalid name is entered and --force flag is present", () => {
-		let actualProjectName = projectNameService.ensureValidName(validProjectName, { force: true }).wait();
+		it(`returns the invalid name when "${invalidProjectName}" is entered and --force flag is present`, () => {
+			let actualProjectName = projectNameService.ensureValidName(validProjectName, { force: true }).wait();
 
-		assert.deepEqual(actualProjectName, validProjectName);
+			assert.deepEqual(actualProjectName, validProjectName);
+		});
 	});
 });