Refactoring to use cargo workspace

Author: cwaldren-ld

.gitignore

@@ -2,4 +2,4 @@
 **/*.rs.bk
 Cargo.lock
 .idea
-.DS_Store
+.DS_Store

Cargo.toml

@@ -1,48 +1,6 @@
-[package]
-name = "eventsource-client"
-version = "0.8.2"
-description = "Client for the Server-Sent Events protocol (aka EventSource)"
-repository = "https://github.com/launchdarkly/rust-eventsource-client"
-authors = ["LaunchDarkly"]
-edition = "2018"
-license = "Apache-2.0"
-keywords = ["launchdarkly", "feature-flags", "feature-toggles", "eventsource", "server-sent-events"]
-exclude = [
-  ".circleci",
-  ".ldrelease"
-]
-
-[dependencies]
-futures = "0.3.12"
-hyper = { version = "0.14.4", features = ["client", "http1", "tcp"] }
-hyper-rustls = { version = "0.22.1", optional = true }
-log = "0.4.6"
-pin-project = "1.0.5"
-tokio = { version = "1.2.0", features = ["time"] }
-serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0.39", optional = true }
-actix = { version = "0.12.0", optional = true }
-actix-web = { version = "4.0.0-beta.10", optional = true }
-reqwest = { version = "0.11.6", features = ["json"], optional = true }
-env_logger = { version = "0.7.1", optional = true }
-hyper-timeout = "0.4.1"
-
-[dev-dependencies]
-env_logger = "0.7.1"
-maplit = "1.0.1"
-simplelog = "0.5.3"
-tokio = { version = "1.2.0", features = ["macros", "rt-multi-thread"] }
-
-[features]
-default = ["rustls"]
-rustls = ["hyper-rustls", "hyper/http2"]
-build-binary = ["serde", "serde_json", "actix", "actix-web", "reqwest", "env_logger"]
+[workspace]
 
-
-[[bin]]
-name = "sse-test-api"
-required-features = ["build-binary", "rustls"]
-
-[[example]]
-name = "tail"
-required-features = ["rustls"]
+members = [
+  "contract-tests",
+  "eventsource-client"
+]

contract-tests/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "contract-tests"
+version = "0.1.0"
+edition = "2018"
+license = "Apache-2.0"
+
+[dependencies]
+futures = { version = "0.3.21" }
+serde = { version = "1.0", features = ["derive"] }
+eventsource-client = { path = "../eventsource-client" }
+serde_json = { version = "1.0.39"}
+actix = { version = "0.12.0"}
+actix-web = { version = "4.0.0-beta.10"}
+reqwest = { version = "0.11.6", features = ["json"] }
+env_logger = { version = "0.7.1" }
+hyper = { version = "0.14.4", features = ["client", "http1", "tcp"] }
+log = "0.4.6"
+
+[[bin]]
+name = "sse-test-api"
+

src/bin/sse-test-api/main.rs renamed to contract-tests/src/bin/sse-test-api/main.rs

@@ -70,7 +70,6 @@ async fn status() -> impl Responder {
     web::Json(Status {
         capabilities: vec![
             "comments".to_string(),
-            "retry".to_string(),
             "post".to_string(),
             "report".to_string(),
             "read-timeout".to_string(),
@@ -100,10 +99,6 @@ async fn stream(
         Err(_) => return HttpResponse::InternalServerError().body("Unable to retrieve handles"),
     };
 
-    *counter += 1;
-    stream_entity.start();
-    entities.insert(*counter, stream_entity);
-
     let stream_resource = match req.url_for("stop_stream", &[counter.to_string()]) {
         Ok(sr) => sr,
         Err(_) => {
@@ -112,6 +107,10 @@ async fn stream(
         }
     };
 
+    *counter += 1;
+    stream_entity.start();
+    entities.insert(*counter, stream_entity);
+
     let mut response = HttpResponse::Ok();
     response.insert_header(("Location", stream_resource.to_string()));
     response.finish()

src/bin/sse-test-api/stream_entity.rs renamed to contract-tests/src/bin/sse-test-api/stream_entity.rs

@@ -0,0 +1,36 @@
+[package]
+name = "eventsource-client"
+version = "0.8.2"
+description = "Client for the Server-Sent Events protocol (aka EventSource)"
+repository = "https://github.com/launchdarkly/rust-eventsource-client"
+authors = ["LaunchDarkly"]
+edition = "2018"
+license = "Apache-2.0"
+keywords = ["launchdarkly", "feature-flags", "feature-toggles", "eventsource", "server-sent-events"]
+exclude = [
+    ".circleci",
+    ".ldrelease"
+]
+
+[dependencies]
+futures = "0.3.12"
+hyper = { version = "0.14.4", features = ["client", "http1", "tcp"] }
+hyper-rustls = { version = "0.22.1", optional = true }
+log = "0.4.6"
+pin-project = "1.0.5"
+tokio = { version = "1.2.0", features = ["time"] }
+hyper-timeout = "0.4.1"
+
+[dev-dependencies]
+env_logger = "0.7.1"
+maplit = "1.0.1"
+simplelog = "0.5.3"
+tokio = { version = "1.2.0", features = ["macros", "rt-multi-thread"] }
+
+[features]
+default = ["rustls"]
+rustls = ["hyper-rustls", "hyper/http2"]
+
+[[example]]
+name = "tail"
+required-features = ["rustls"]