Return HttpResult<Listening> from serve()

This can be used to stop the server again, by calling the `close()`
method on the `Listening` instance.

Because Iron doesn't re-publish the `Listening` type, we need to add
Hyper as a dependency. See iron/iron#406.

This change allows us to add integration tests that test the server
output.

Author: dbrgn

CHANGELOG.md

@@ -15,6 +15,7 @@ Possible log types:
 ### UNRELEASED
 
 - [changed] Removed datastore module, use Redis directly (#10)
+- [changed] SpaceapiServer.serve() now returns a HttpResult<Listening> (#16)
 - [added] Support status modifiers (#8)
 
 ### v0.1.1 (2015-11-16)

Cargo.toml

@@ -23,6 +23,7 @@ include = [
 redis = "^0.5"
 rustc-serialize = "^0.3"
 iron = "^0.2"
+hyper = "^0.7"
 log = "^0.3"
 urlencoded = "^0.2"
 router = "^0.0.15"

src/lib.rs

@@ -6,12 +6,15 @@
 #[macro_use] extern crate error_type;
 extern crate rustc_serialize;
 extern crate iron;
+extern crate hyper;
 #[macro_use] extern crate router;
 extern crate urlencoded;
 extern crate redis;
 extern crate spaceapi;
 
 pub use spaceapi as api;
+pub use iron::error::HttpResult;
+pub use hyper::server::Listening;
 
 mod server;
 mod errors;

src/server/mod.rs

@@ -61,15 +61,17 @@ impl SpaceapiServer {
 
     /// Start a HTTP server listening on ``self.host:self.port``.
     ///
-    /// This call is blocking. It can be interrupted with SIGINT (Ctrl+C).
-    pub fn serve(self) {
+    /// The call returns an `HttpResult<Listening>` object, see
+    /// http://ironframework.io/doc/hyper/server/struct.Listening.html
+    /// for more information.
+    pub fn serve(self) -> ::HttpResult<::Listening> {
         let host = self.host;
         let port = self.port;
 
         let router = self.route();
 
         println!("Starting HTTP server on http://{}:{}...", host, port);
-        Iron::new(router).http((host, port)).unwrap();
+        Iron::new(router).http((host, port))
     }
 
     /// Register a new sensor.