Merge pull request tidev#666 from feons/ALOY-1238

[ALOY-1238] Can't re-create index controller after renaming original one

Author: skypanther

Alloy/commands/generate/generateUtils.js

@@ -27,7 +27,7 @@ exports.generateMigrationFileName = function(t) {
 exports.generate = function(name, type, program, args) {
 	args = args || {};
 	var ext = '.'+CONST.FILE_EXT[type];
-	var paths = U.getAndValidateProjectPaths(program.outputPath);
+	var paths = U.getAndValidateProjectPaths(program.outputPath, {command : CONST.COMMANDS.GENERATE});
 	var templatePath = path.join(alloyRoot,'template',type.toLowerCase()+ext);
 	// ALOY-372 - Support 'alloy generate' command for widget components
 	var widgetPath = (program.widgetname) ? CONST.DIR['WIDGET']+path.sep+program.widgetname : '';

Alloy/commands/generate/index.js

@@ -22,7 +22,10 @@ function generate(args, program) {
 	}
 
 	// make sure we have a valid project path
-	var paths = U.getAndValidateProjectPaths(program.projectDir || program.outputPath || process.cwd());
+	var paths = U.getAndValidateProjectPaths(
+		program.projectDir || program.outputPath || process.cwd(),
+		{command : CONST.COMMANDS.GENERATE}
+	);
 	program.projectDir = program.outputPath = paths.project;
 
 	// grab the name
@@ -43,4 +46,4 @@ function generate(args, program) {
 	(require('./targets/' + target))(name, args.slice(2), program);
 }
 
-module.exports = generate;
+module.exports = generate;

Alloy/common/constants.js

@@ -235,3 +235,7 @@ exports.SPECIAL_PROPERTY_NAMES = [
 	'onCreateOptionsMenu',
 	'onPrepareOptionsMenu'
 ];
+
+exports.COMMANDS = {
+	GENERATE: 'generate'
+};

Alloy/utils.js

@@ -110,8 +110,9 @@ exports.evaluateTemplate = function(name, o) {
 	return _.template(exports.readTemplate(name), o);
 };
 
-exports.getAndValidateProjectPaths = function(argPath) {
-	var projectPath = path.resolve(argPath);
+exports.getAndValidateProjectPaths = function(argPath, opts) {
+	var projectPath = path.resolve(argPath),
+		opts = opts || {};
 
 	// See if we got the "app" path or the project path as an argument
 	projectPath = fs.existsSync(path.join(projectPath,'..','tiapp.xml')) ?
@@ -135,7 +136,7 @@ exports.getAndValidateProjectPaths = function(argPath) {
 		exports.die('Invalid Titanium project path (no tiapp.xml) at "' + paths.project + '"');
 	} else if (!fs.existsSync(paths.app)) {
 		exports.die('Alloy "app" directory does not exist at "' + paths.app + '"');
-	} else if (!fs.existsSync(paths.index)) {
+	} else if (!fs.existsSync(paths.index) && (opts.command !== CONST.COMMANDS.GENERATE)) {
 		exports.die('Alloy "app" directory has no "' + paths.indexBase + '" file at "' + paths.index + '".');
 	}