Redo 'lime setup' to wrap 'lime config'

lime/tools/helpers/ConfigHelper.hx

@@ -0,0 +1,384 @@
+package lime.tools.helpers;
+
+
+import haxe.io.Path;
+import lime.project.HXProject;
+import lime.project.Platform;
+import lime.project.ProjectXMLParser;
+import sys.io.File;
+import sys.FileSystem;
+
+
+class ConfigHelper {
+	
+	
+	private static var backedUpConfig:Bool = false;
+	private static var configPath:String = null;
+	
+	
+	public static function getConfig ():HXProject {
+		
+		var config = getConfigPath ();
+		
+		if (FileSystem.exists (config)) {
+			
+			LogHelper.info ("", LogHelper.accentColor + "Reading Lime config: " + config + LogHelper.resetColor);
+			
+			return new ProjectXMLParser (config);
+			
+		} else {
+			
+			LogHelper.warn ("", "Could not read Lime config: " + config);
+			
+		}
+		
+		return null;
+		
+	}
+	
+	
+	public static function getConfigPath ():String {
+		
+		if (configPath == null) {
+			
+			var environment = Sys.environment ();
+			
+			if (environment.exists ("LIME_CONFIG")) {
+				
+				configPath = environment.get ("LIME_CONFIG");
+				
+			} else {
+				
+				var home = "";
+				
+				if (environment.exists ("HOME")) {
+					
+					home = environment.get ("HOME");
+					
+				} else if (environment.exists ("USERPROFILE")) {
+					
+					home = environment.get ("USERPROFILE");
+					
+				} else {
+					
+					LogHelper.warn ("Lime config might be missing (Environment has no \"HOME\" variable)");
+					
+					return null;
+					
+				}
+				
+				configPath = home + "/.lime/config.xml";
+				
+				if (PlatformHelper.hostPlatform == Platform.WINDOWS) {
+					
+					configPath = configPath.split ("/").join ("\\");
+					
+				}
+				
+				if (!FileSystem.exists (configPath)) {
+					
+					PathHelper.mkdir (Path.directory (configPath));
+					
+					var hxcppConfig = null;
+					
+					if (environment.exists ("HXCPP_CONFIG")) {
+						
+						hxcppConfig = environment.get ("HXCPP_CONFIG");
+						
+					} else {
+						
+						hxcppConfig = home + "/.hxcpp_config.xml";
+						
+					}
+					
+					if (FileSystem.exists (hxcppConfig)) {
+						
+						var vars = new ProjectXMLParser (hxcppConfig);
+						
+						for (key in vars.defines.keys ()) {
+							
+							if (key != key.toUpperCase ()) {
+								
+								vars.defines.remove (key);
+								
+							}
+							
+						}
+						
+						writeConfig (configPath, vars.defines);
+						
+					} else {
+						
+						writeConfig (configPath, new Map ());
+						
+					}
+					
+				}
+				
+				Sys.putEnv ("LIME_CONFIG", configPath);
+				
+			}
+			
+		}
+		
+		return configPath;
+		
+	}
+	
+	
+	public static function getConfigValue (name:String):String {
+		
+		var config = getConfig ();
+		
+		if (config.defines.exists (name)) {
+			
+			return config.defines.get (name);
+			
+		}
+		
+		return null;
+		
+	}
+	
+	
+	public static function removeConfigValue (name:String):Void {
+		
+		var path = Sys.getEnv ("LIME_CONFIG");
+		
+		if (FileSystem.exists (path)) {
+			
+			var configText = File.getContent (path);
+			var lines = configText.split ("\n");
+			
+			var findSet = "<set name=\"" + name + "\"";
+			var findSetenv = "<setenv name=\"" + name + "\"";
+			var findDefine = "<define name=\"" + name + "\"";
+			var line, i = 0, index = 0, found = false;
+			
+			while (i < lines.length) {
+				
+				line = lines[i];
+				
+				if ((index = line.indexOf (findSet)) > -1) {
+					
+					found = true;
+					lines.splice (i, 1);
+					continue;
+					
+				}
+				
+				if ((index = line.indexOf (findSetenv)) > -1) {
+					
+					found = true;
+					lines.splice (i, 1);
+					continue;
+					
+				}
+				
+				if ((index = line.indexOf (findDefine)) > -1) {
+					
+					found = true;
+					lines.splice (i, 1);
+					continue;
+					
+				}
+				
+				i++;
+				
+			}
+			
+			var content = lines.join ("\n");
+			File.saveContent (path, content);
+			
+			if (found) {
+				
+				LogHelper.info ("Removed define \"" + name + "\"");
+				
+			} else {
+				
+				LogHelper.info ("There is no define \"" + name + "\"");
+				
+			}
+			
+		} else {
+			
+			LogHelper.error ("Cannot find \"" + path + "\"");
+			
+		}
+		
+	}
+	
+	
+	private static function stripQuotes (path:String):String {
+		
+		if (path != null) {
+			
+			return path.split ("\"").join ("");
+			
+		}
+		
+		return path;
+		
+	}
+	
+	
+	public static function writeConfig (path:String, defines:Map<String, Dynamic>):Void {
+		
+		var newContent = "";
+		var definesText = "";
+		var env = Sys.environment ();
+		
+		for (key in defines.keys ()) {
+			
+			if (key != "LIME_CONFIG" && key != "LIME_CONFIG" && (!env.exists (key) || env.get (key) != defines.get (key))) {
+				
+				definesText += "\t\t<set name=\"" + key + "\" value=\"" + stripQuotes (Std.string (defines.get (key))) + "\" />\n";
+				
+			}
+			
+		}
+		
+		if (FileSystem.exists (path)) {
+			
+			var input = File.read (path, false);
+			var bytes = input.readAll ();
+			input.close ();
+			
+			if (!backedUpConfig) {
+				
+				try {
+					
+					var backup = File.write (path + ".bak", false);
+					backup.writeBytes (bytes, 0, bytes.length);
+					backup.close ();
+					
+				} catch (e:Dynamic) { }
+				
+				backedUpConfig = true;
+				
+			}
+			
+			var content = bytes.getString (0, bytes.length);
+			
+			var startIndex = content.indexOf ("<section id=\"defines\">");
+			var endIndex = content.indexOf ("</section>", startIndex);
+			
+			newContent += content.substr (0, startIndex) + "<section id=\"defines\">\n\t\t\n";
+			newContent += definesText;
+			newContent += "\t\t\n\t" + content.substr (endIndex);
+			
+		} else {
+			
+			newContent += "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+			newContent += "<config>\n\t\n";
+			newContent += "\t<section id=\"defines\">\n\t\t\n";
+			newContent += definesText;
+			newContent += "\t\t\n\t</section>\n\t\n</config>";
+			
+		}
+		
+		var output = File.write (path, false);
+		output.writeString (newContent);
+		output.close ();
+		
+		if (backedUpConfig) {
+			
+			try {
+				
+				FileSystem.deleteFile (path + ".bak");
+				
+			} catch (e:Dynamic) {}
+			
+		}
+		
+	}
+	
+	
+	public static function writeConfigValue (name:String, value:String):Void {
+		
+		var path = Sys.getEnv ("LIME_CONFIG");
+		
+		try {
+			
+			if (!FileSystem.exists (value) && FileSystem.exists (PathHelper.expand (value))) {
+				
+				value = PathHelper.expand (value);
+				
+			}
+			
+		} catch (e:Dynamic) {}
+		
+		if (FileSystem.exists (path)) {
+			
+			var configText = File.getContent (path);
+			var lines = configText.split ("\n");
+			
+			var findSet = "<set name=\"" + name + "\"";
+			var findSetenv = "<setenv name=\"" + name + "\"";
+			var findDefine = "<define name=\"" + name + "\"";
+			var line, i = 0, index = 0, found = false;
+			
+			while (i < lines.length) {
+				
+				line = lines[i];
+				
+				if ((index = line.indexOf (findSet)) > -1) {
+					
+					found = true;
+					lines[i] = line.substr (0, index) + "<set name=\"" + name + "\" value=\"" + value + "\" />";
+					
+				}
+				
+				if ((index = line.indexOf (findSetenv)) > -1) {
+					
+					found = true;
+					lines[i] = line.substr (0, index) + "<setenv name=\"" + name + "\" value=\"" + value + "\" />";
+					
+				}
+				
+				if ((index = line.indexOf (findDefine)) > -1) {
+					
+					found = true;
+					lines[i] = line.substr (0, index) + "<define name=\"" + name + "\" value=\"" + value + "\" />";
+					
+				}
+				
+				i++;
+				
+			}
+			
+			if (!found && lines.length > 2) {
+				
+				var insertPoint = lines.length - 3;
+				
+				if (StringTools.trim (lines[lines.length - 1]) == "") {
+					
+					insertPoint--;
+					
+				}
+				
+				if (StringTools.trim (lines[insertPoint + 1]) != "") {
+					
+					lines.insert (insertPoint + 1, "\t");
+					
+				}
+				
+				lines.insert (insertPoint + 1, "\t<define name=\"" + name + "\" value=\"" + value + "\" />");
+				
+			}
+			
+			var content = lines.join ("\n");
+			File.saveContent (path, content);
+			
+			LogHelper.info ("Set " + LogHelper.accentColor + name + "\x1b[0m to \x1b[1m" + value + "\x1b[0m");
+			
+		} else {
+			
+			LogHelper.error ("Cannot find \"" + path + "\"");
+			
+		}
+		
+	}
+	
+	
+}

tools/CommandLineTools.hx

@@ -857,17 +857,17 @@ class CommandLineTools {
 	
 	private function displayConfig ():Void {
 		
-		var config = getLimeConfig ();
-		
 		if (words.length == 0) {
 			
-			LogHelper.println (File.getContent (Sys.getEnv ("LIME_CONFIG")));
+			LogHelper.println (File.getContent (ConfigHelper.getConfigPath ()));
 			
 		} else if (words.length == 1) {
 			
-			if (config.defines.exists (words[0])) {
+			var value = ConfigHelper.getConfigValue (words[0]);
 			
-				LogHelper.println (config.defines.get (words[0]));
+			if (value != null) {
+				
+				LogHelper.println (value);
 				
 			} else {
 				
@@ -877,138 +877,16 @@ class CommandLineTools {
 			
 		} else {
 			
-			// TODO: Cleanup
-			
-			var path = Sys.getEnv ("LIME_CONFIG");
-			
 			var name = words.shift ();
 			var value = words.join (" ");
 			
-			try {
+			if (name == "remove") {
 				
-				if (!FileSystem.exists (value) && FileSystem.exists (PathHelper.expand (value))) {
-					
-					value = PathHelper.expand (value);
-					
-				}
-				
-			} catch (e:Dynamic) {}
-			
-			if (FileSystem.exists (path)) {
-				
-				var doRemove = (name == "remove");
-				
-				if (doRemove) {
-					
-					name = value;
-					
-				}
-				
-				var configText = File.getContent (path);
-				var lines = configText.split ("\n");
-				
-				var findSet = "<set name=\"" + name + "\"";
-				var findSetenv = "<setenv name=\"" + name + "\"";
-				var findDefine = "<define name=\"" + name + "\"";
-				var line, i = 0, index = 0, found = false;
-				
-				while (i < lines.length) {
-					
-					line = lines[i];
-					
-					if ((index = line.indexOf (findSet)) > -1) {
-						
-						found = true;
-						
-						if (doRemove) {
-							
-							lines.splice (i, 1);
-							continue;
-							
-						}
-						
-						lines[i] = line.substr (0, index) + "<set name=\"" + name + "\" value=\"" + value + "\" />";
-						
-					}
-					
-					if ((index = line.indexOf (findSetenv)) > -1) {
-						
-						found = true;
-						
-						if (doRemove) {
-							
-							lines.splice (i, 1);
-							continue;
-							
-						}
-						
-						lines[i] = line.substr (0, index) + "<setenv name=\"" + name + "\" value=\"" + value + "\" />";
-						
-					}
-					
-					if ((index = line.indexOf (findDefine)) > -1) {
-						
-						found = true;
-						
-						if (doRemove) {
-							
-							lines.splice (i, 1);
-							continue;
-							
-						}
-						
-						lines[i] = line.substr (0, index) + "<define name=\"" + name + "\" value=\"" + value + "\" />";
-						
-					}
-					
-					i++;
-					
-				}
-				
-				if (!found && !doRemove && lines.length > 2) {
-					
-					var insertPoint = lines.length - 3;
-					
-					if (StringTools.trim (lines[lines.length - 1]) == "") {
-						
-						insertPoint--;
-						
-					}
-					
-					if (StringTools.trim (lines[insertPoint + 1]) != "") {
-						
-						lines.insert (insertPoint + 1, "\t");
-						
-					}
-					
-					lines.insert (insertPoint + 1, "\t<define name=\"" + name + "\" value=\"" + value + "\" />");
-					
-				}
-				
-				var content = lines.join ("\n");
-				File.saveContent (path, content);
-				
-				if (doRemove) {
-					
-					if (found) {
-						
-						LogHelper.info ("Removed define \"" + name + "\"");
+				ConfigHelper.removeConfigValue (value);
 				
 			} else {
 				
-						LogHelper.info ("There is no define \"" + name + "\"");
-						
-					}
-					
-				} else {
-					
-					LogHelper.info ("Set \"" + name + "\" to \"" + value + "\"");
-					
-				}
-				
-			} else {
-				
-				LogHelper.error ("Cannot find \"" + path + "\"");
+				ConfigHelper.writeConfigValue (name, value);
 				
 			}
 			
@@ -1462,7 +1340,7 @@ class CommandLineTools {
 			
 		} else if (targetFlags.exists ("java-externs")) {
 			
-			var config = getLimeConfig ();
+			var config = ConfigHelper.getConfig ();
 			var sourcePath = words[0];
 			var targetPath = words[1];
 			
@@ -1624,104 +1502,6 @@ class CommandLineTools {
 	}
 	
 	
-	public static function getLimeConfig ():HXProject {
-		
-		var environment = Sys.environment ();
-		var config = "";
-		
-		if (environment.exists ("LIME_CONFIG")) {
-			
-			config = environment.get ("LIME_CONFIG");
-			
-		} else {
-			
-			var home = "";
-			
-			if (environment.exists ("HOME")) {
-				
-				home = environment.get ("HOME");
-				
-			} else if (environment.exists ("USERPROFILE")) {
-				
-				home = environment.get ("USERPROFILE");
-				
-			} else {
-				
-				LogHelper.warn ("Lime config might be missing (Environment has no \"HOME\" variable)");
-				
-				return null;
-				
-			}
-			
-			config = home + "/.lime/config.xml";
-			
-			if (PlatformHelper.hostPlatform == Platform.WINDOWS) {
-				
-				config = config.split ("/").join ("\\");
-				
-			}
-			
-			if (!FileSystem.exists (config)) {
-				
-				PathHelper.mkdir (Path.directory (config));
-				
-				var hxcppConfig = null;
-				
-				if (environment.exists ("HXCPP_CONFIG")) {
-					
-					hxcppConfig = environment.get ("HXCPP_CONFIG");
-					
-				} else {
-					
-					hxcppConfig = home + "/.hxcpp_config.xml";
-					
-				}
-				
-				if (FileSystem.exists (hxcppConfig)) {
-					
-					var vars = new ProjectXMLParser (hxcppConfig);
-					
-					for (key in vars.defines.keys ()) {
-						
-						if (key != key.toUpperCase ()) {
-							
-							vars.defines.remove (key);
-							
-						}
-						
-					}
-					
-					PlatformSetup.writeConfig (config, vars.defines);
-					
-				} else {
-					
-					PlatformSetup.writeConfig (config, new Map ());
-					
-				}
-				
-			}
-			
-			Sys.putEnv ("LIME_CONFIG", config);
-			
-		}
-		
-		if (FileSystem.exists (config)) {
-			
-			LogHelper.info ("", LogHelper.accentColor + "Reading Lime config: " + config + LogHelper.resetColor);
-			
-			return new ProjectXMLParser (config);
-			
-		} else {
-			
-			LogHelper.warn ("", "Could not read Lime config: " + config);
-			
-		}
-		
-		return null;
-		
-	}
-	
-	
 	private function getToolsVersion (version:String = null):String {
 		
 		if (version == null) version = this.version;
@@ -1947,7 +1727,7 @@ class CommandLineTools {
 		HXProject._targetFlags = targetFlags;
 		HXProject._userDefines = userDefines;
 		
-		var config = getLimeConfig ();
+		var config = ConfigHelper.getConfig ();
 		
 		if (config != null) {