[ALOY-1652] CLI: Improve handling of missing directories and files in alloy new (#925)

https://jira.appcelerator.org/browse/ALOY-1652

Author: Sajoha

Alloy/commands/new/index.js

@@ -138,10 +138,12 @@ function getPaths(project, templateName, testapp) {
 	var template = path.join(alloy, 'template');
 	var projectTemplates = path.join(alloy, '..', 'templates');
 	var customTemplateDir;
+	var customAppDir;
 	var readMeFile;
 
 	if (fs.existsSync(templateName) && !testapp) {
 		customTemplateDir = templateName;
+		customAppDir = path.join(templateName, 'app');
 		readMeFile = path.join(customTemplateDir, 'README');
 	}
 
@@ -150,6 +152,7 @@ function getPaths(project, templateName, testapp) {
 		alloy: alloy,
 		template: path.join(alloy, 'template'),
 		readme: fs.existsSync(readMeFile) ? readMeFile : path.join(template, 'README'),
+		appTemplate: (!testapp) ? customAppDir || path.join(projectTemplates, templateName, 'app') : path.join(sampleAppsDir, testapp),
 		projectTemplate: (!testapp) ? customTemplateDir || path.join(projectTemplates, templateName) : path.join(sampleAppsDir, testapp),
 
 		// project paths
@@ -167,8 +170,12 @@ function getPaths(project, templateName, testapp) {
 					// skip
 					return;
 				case 'projectTemplate':
-					var error = (!testapp) ? 'Project template "' + templateName : 'Test app "' + testapp;
-					errs.push(error + '" not found at "' + v + '"');
+					var projError = (!testapp) ? 'Project template "' + templateName : 'Test app "' + testapp;
+					errs.push(projError + '" not found at "' + v + '"');
+					break;
+				case 'appTemplate':
+					var appError = (!testapp) ? 'Application template "' + v : 'Test app "' + testapp;
+					errs.push(appError + '" not found');
 					break;
 				case 'project':
 					errs.push('Project path not found at "' + v + '"');