test task refactoring

Author: eliasku

.travis.yml

@@ -10,4 +10,5 @@ install:
 
 script:
   - haxelib run hxmake _
+  - hxmake _
   - hxmake haxe

appveyor.yml

@@ -15,4 +15,5 @@ build: off
 test_script:
   - haxelib dev hxmake .
   - haxelib run hxmake _
+  - hxmake _
   - hxmake haxe

run.n

@@ -7,7 +7,10 @@ class Task {
 	public var description:String = "";
 	public var enabled:Bool = true;
 	public var module(default, null):Module;
-	public var chain(default, null):Array<Task> = [];
+
+	public var chainBefore(default, null):Array<Task> = [];
+	public var chainAfter(default, null):Array<Task> = [];
+
 	public var parent(default, null):Task;
 
 	var __after:Map<String, String> = new Map();
@@ -17,14 +20,20 @@ class Task {
 
 	function _configure() {
 		configure();
-		for(chained in chain) {
+		for(chained in chainBefore) {
+			chained._configure();
+		}
+		for(chained in chainAfter) {
 			chained._configure();
 		}
 	}
 
 	function _run() {
+		for(chained in chainBefore) {
+			chained._run();
+		}
 		run();
-		for(chained in chain) {
+		for(chained in chainAfter) {
 			chained._run();
 		}
 	}
@@ -54,9 +63,25 @@ class Task {
 	public function run() {}
 
 	public function then<T:Task>(task:T):T {
-		chain.push(task);
+		chainAfter.push(task);
 		task.parent = this;
 		task.module = module;
 		return task;
 	}
+
+	public function prepend<T:Task>(task:T):T {
+		chainBefore.push(task);
+		task.parent = this;
+		task.module = module;
+		return task;
+	}
+
+	function fail(description:String = "") {
+		if(parent != null) {
+			throw 'Sub-task $name of task ${parent.name} failed: \n$description';
+		}
+		else {
+			throw 'Task $name failed: \n$description';
+		}
+	}
 }

src/hxmake/Task.hx

@@ -10,6 +10,13 @@ class WorkingDirectory {
 		_stack = [Sys.getCwd()];
 	}
 
+	public function with<T>(path:String, func:Void->T):T {
+		push(path);
+		var result = func();
+		pop();
+		return result;
+	}
+
 	public function push(path:String):String {
 		var prev = current;
 		if (path == null) {

src/hxmake/cli/WorkingDirectory.hx

@@ -1,10 +1,10 @@
 package hxmake.test;
 
 // todo final
-import hxmake.utils.Haxelib;
 import hxmake.cli.Platform;
 import hxmake.cli.CL;
 
+@:final
 class CiTools {
 
     public static function installPackage(pckge:String, ?additionalArgs:Array<String>):Bool {

src/hxmake/test/CiTools.hx

@@ -0,0 +1,46 @@
+package hxmake.test;
+
+import hxmake.cli.CL;
+import hxmake.utils.Haxe;
+import hxmake.utils.Hxml;
+
+class HaxeTask extends Task {
+
+    // Meta information for keeping wide target key: mac, win, node, etc...
+    public var targetName:String;
+
+    public var hxml(default, null):Hxml = new Hxml();
+
+    public function new() {}
+
+    override public function run() {
+        if(!Haxe.compile(hxml)) {
+            fail("Compilation failed");
+        }
+    }
+
+    public function createSetupTask():SetupTask {
+        var pct = new SetupTask();
+        switch(hxml.target) {
+            case Cpp:
+                if(CL.platform.isLinux) {
+                    pct.packages = pct.packages.concat(['gcc-multilib', 'g++-multilib']);
+                }
+                pct.libraries.push("hxcpp");
+            case Cs:
+                if(Sys.command("mono", ["--version"]) != 0) {
+                    if(CL.platform.isLinux) {
+                        pct.packages = pct.packages.concat(['mono-devel', 'mono-mcs']);
+                    }
+                    else if(CL.platform.isMac) {
+                        pct.packages.push('mono');
+                    }
+                }
+                pct.libraries.push("hxcs");
+            case Java:
+                pct.libraries.push("hxjava");
+            default:
+        }
+        return pct;
+    }
+}