Merge pull request #552 from Geod24/add-test-travis

Add examples to Travis
vibe-d · Feb 26, 2014 · 660c8c7 · 660c8c7
2 parents 9f79ce2 + bc1b57c
commit 660c8c7
Show file tree

Hide file tree

Showing 36 changed files with 71 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,34 @@
 # Unittest binaries
 vibe-d
 tests/*/tests
+
+# Examples
+examples/app_skeleton/__test__library__
+examples/bench-http-request/bench-http-request
+examples/bench-http-server/bench-http-server
+examples/daytime/daytime-example
+examples/diet/diet-example
+examples/download/download-example
+examples/echoserver/echoserver-example
+examples/form_interface/form-interface-example
+examples/http_info/http-info-example
+examples/http_request/http-request-example
+examples/http_reverse_proxy/http-reverse-proxy-example
+examples/http_server/http-server-example
+examples/http_static_server/http-static-server-example
+examples/https_server/https-server-example
+examples/json/json-example
+examples/message/message-example
+examples/mongodb/mongodb-example
+examples/app_skeleton/app-skeleton
+examples/redis-pubsub/redis-pubsub-example
+examples/redis/redis-example
+examples/rest/rest-example
+examples/sendmail/sendmail-example
+examples/serialization/serialization-example
+examples/task_control/task-control-example
+examples/tcp_separate/tcp-separate-example
+examples/udp/udp-example
+examples/uploader/uploader-example
+examples/web/web-framework-example
+examples/websocket/websocket-example
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,11 @@ language: d
 install:
   # dmd
   # dub
-  - DMD_VER=2.064.2
+  - DMD_VER=2.065.0
   - DMD=dmd_${DMD_VER}-0_amd64.deb
-  - DUB_VER=0.9.21-rc.2
+  - DUB_VER=0.9.21
   - DUB=dub-${DUB_VER}-linux-x86_64
-  - wget http://downloads.dlang.org/releases/2013/${DMD}
+  - wget http://downloads.dlang.org/releases/2014/${DMD}
   - sudo dpkg -i ${DMD} || true
   - sudo apt-get -y update
   - sudo apt-get -fy install
@@ -20,3 +20,5 @@ install:
 
 script:
   - dub --config=unittest --build=unittest
+  - for ex in `\ls -1 examples/`; do (echo "[INFO] Building example $ex"; cd examples/$ex && dub build) || break; done
+  - for ex in `cat examples/.travis.run`; do (echo "[INFO] Running example $ex"; cd examples/$ex && dub test) || break; done
diff --git a/package.json → dub.json b/package.json → dub.json
diff --git a/examples/.travis.run b/examples/.travis.run
@@ -0,0 +1,23 @@
+app_skeleton
+bench-http-request
+bench-http-server
+diet
+download
+echoserver
+form_interface
+http_info
+http_request
+http_reverse_proxy
+http_server
+https_server
+http_static_server
+json
+message
+rest
+serialization
+task_control
+tcp_separate
+udp
+uploader
+web
+websocket
diff --git a/examples/app_skeleton/package.json → examples/app_skeleton/dub.json b/examples/app_skeleton/package.json → examples/app_skeleton/dub.json
@@ -7,7 +7,7 @@
 		"Toni Tester"
 	],
 	"dependencies": {
-		"vibe-d": ">=0.7.12"
+		"vibe-d": {"version": "~master", "path": "../../"}
 	},
 	"versions": ["VibeDefaultMain"]
-}
+}
diff --git a/examples/bench-http-request/package.json → examples/bench-http-request/dub.json b/examples/bench-http-request/package.json → examples/bench-http-request/dub.json
diff --git a/examples/bench-http-request/source/app.d b/examples/bench-http-request/source/app.d
@@ -44,7 +44,7 @@ void request(bool disconnect)
 void distTask()
 {
 	static shared int s_threadCount = 0;
-	static shared int s_token = 0;
+	static shared long s_token = 0;
 	auto id = atomicOp!"+="(s_threadCount, 1) - 1;
 
 	while (true) {
@@ -86,6 +86,7 @@ void benchmark()
 		bool disconnect = ++keep_alives >= g_maxKeepAliveRequests;
 		request(disconnect);
 		if (disconnect) keep_alives = 0;
+                if (nreq >= 5000) exitEventLoop(true);
 	}
 }
 

diff --git a/examples/bench-http-server/package.json → examples/bench-http-server/dub.json b/examples/bench-http-server/package.json → examples/bench-http-server/dub.json
diff --git a/examples/daytime/package.json → examples/daytime/dub.json b/examples/daytime/package.json → examples/daytime/dub.json
diff --git a/examples/diet/package.json → examples/diet/dub.json b/examples/diet/package.json → examples/diet/dub.json
diff --git a/examples/download/package.json → examples/download/dub.json b/examples/download/package.json → examples/download/dub.json
diff --git a/examples/echoserver/package.json → examples/echoserver/dub.json b/examples/echoserver/package.json → examples/echoserver/dub.json
diff --git a/examples/echoserver/source/app.d b/examples/echoserver/source/app.d
@@ -3,5 +3,5 @@ import vibe.core.net;
 
 shared static this()
 {
-	listenTCP(7, conn => conn.write(conn));
+	listenTCP(2000, conn => conn.write(conn));
 }
diff --git a/examples/form_interface/package.json → examples/form_interface/dub.json b/examples/form_interface/package.json → examples/form_interface/dub.json
diff --git a/examples/http_info/package.json → examples/http_info/dub.json b/examples/http_info/package.json → examples/http_info/dub.json
diff --git a/examples/http_info/views/info.dt b/examples/http_info/views/info.dt
@@ -3,7 +3,7 @@ html(lang="en")
 	head
 		title Info
 	body
-		h1 #{req.method} #{req.url}
+		h1 #{req.method} #{req.requestURL}
 
 		h2 Headers
 		dl

diff --git a/examples/http_request/package.json → examples/http_request/dub.json b/examples/http_request/package.json → examples/http_request/dub.json
diff --git a/examples/http_reverse_proxy/package.json → examples/http_reverse_proxy/dub.json b/examples/http_reverse_proxy/package.json → examples/http_reverse_proxy/dub.json
diff --git a/examples/http_server/package.json → examples/http_server/dub.json b/examples/http_server/package.json → examples/http_server/dub.json
diff --git a/examples/http_static_server/package.json → examples/http_static_server/dub.json b/examples/http_static_server/package.json → examples/http_static_server/dub.json
diff --git a/examples/https_server/package.json → examples/https_server/dub.json b/examples/https_server/package.json → examples/https_server/dub.json
diff --git a/examples/json/package.json → examples/json/dub.json b/examples/json/package.json → examples/json/dub.json
diff --git a/examples/message/package.json → examples/message/dub.json b/examples/message/package.json → examples/message/dub.json
diff --git a/examples/mongodb/package.json → examples/mongodb/dub.json b/examples/mongodb/package.json → examples/mongodb/dub.json
diff --git a/examples/redis-pubsub/package.json → examples/redis-pubsub/dub.json b/examples/redis-pubsub/package.json → examples/redis-pubsub/dub.json
diff --git a/examples/redis/package.json → examples/redis/dub.json b/examples/redis/package.json → examples/redis/dub.json
diff --git a/examples/rest/package.json → examples/rest/dub.json b/examples/rest/package.json → examples/rest/dub.json
diff --git a/examples/sendmail/package.json → examples/sendmail/dub.json b/examples/sendmail/package.json → examples/sendmail/dub.json
diff --git a/examples/serialization/package.json → examples/serialization/dub.json b/examples/serialization/package.json → examples/serialization/dub.json
diff --git a/examples/task_control/package.json → examples/task_control/dub.json b/examples/task_control/package.json → examples/task_control/dub.json
diff --git a/examples/tcp_separate/package.json → examples/tcp_separate/dub.json b/examples/tcp_separate/package.json → examples/tcp_separate/dub.json
diff --git a/examples/udp/package.json → examples/udp/dub.json b/examples/udp/package.json → examples/udp/dub.json
diff --git a/examples/uploader/package.json → examples/uploader/dub.json b/examples/uploader/package.json → examples/uploader/dub.json
diff --git a/examples/web/package.json → examples/web/dub.json b/examples/web/package.json → examples/web/dub.json
diff --git a/examples/websocket/package.json → examples/websocket/dub.json b/examples/websocket/package.json → examples/websocket/dub.json
diff --git a/source/vibe/http/form.d b/source/vibe/http/form.d
@@ -220,7 +220,7 @@ private HTTPServerRequestDelegate formMethodHandler(T, string method)(T inst, Fl
 	void handler(HTTPServerRequest req, HTTPServerResponse res)
 	{
 		import std.traits;
-		string[string] form = req.method == HTTPMethod.GET ? req.query : req.form;
+		auto form = (req.method == HTTPMethod.GET ? req.query : req.form);
 //		alias MemberFunctionsTuple!(T, method) overloads;
 		string errors;
 		foreach(func; __traits(getOverloads, T, method)) {
@@ -291,8 +291,8 @@ private bool applyParametersFromAssociativeArray(Func)(HTTPServerRequest req, HT
 private bool applyParametersFromAssociativeArray(alias Overload, Func)(HTTPServerRequest req, HTTPServerResponse res, Func func, out string error, Flag!"strict" strict) {
 	alias ParameterTypeTuple!Overload ParameterTypes;
 	ParameterTypes args;
-	string[string] form = req.method == HTTPMethod.GET ? req.query : req.form;
-	int count=0;
+	auto form = (req.method == HTTPMethod.GET ? req.query : req.form);
+	int count = 0;
 	Error e;
 	foreach(i, item; ParameterIdentifierTuple!Overload) {
 		static if(is(ParameterTypes[i] : HTTPServerRequest)) {
@@ -308,7 +308,9 @@ private bool applyParametersFromAssociativeArray(alias Overload, Func)(HTTPServe
 	error=e.message;
 	if(e.missing_parameters.length) {
 		error~="The following parameters have not been found in the form data: "~to!string(e.missing_parameters)~"\n";
-		error~="Provided form data was: "~to!string(form.keys)~"\n";
+		error~="Provided form data was: ";
+                foreach(k, v; form)
+                    error ~= "[" ~ k ~ ":" ~ v ~ "] ";
 	}
 	if(count!=form.length) {
 		error~="The form had "~to!string(form.length)~" element(s), of which "~to!string(count)~" element(s) were applicable.\n";