tidy up

.gitlab-ci.yml

@@ -37,3 +37,18 @@ readme:
   script:
     - cargo readme -r gotham_restful -t ../README.tpl >README.md.new
     - diff README.md README.md.new
+
+publish:
+  stage: publish
+  image: msrd0/rust:alpine
+  before_script:
+    - cargo -V
+    - cargo login $CRATES_IO_TOKEN
+  script:
+    - cd gotham_restful_derive
+    - cargo publish
+    - cd ../gotham_restful
+    - cargo publish
+    - cd ..
+  only:
+    - tags

Cargo.toml

@@ -6,3 +6,7 @@ members = [
 	"gotham_restful_derive",
 	"example"
 ]
+
+[patch.crates-io]
+gotham_restful = { path = "./gotham_restful" }
+gotham_restful_derive = { path = "./gotham_restful_derive" }

example/Cargo.toml

@@ -17,7 +17,7 @@ gitlab = { repository = "msrd0/gotham-restful", branch = "master" }
 fake = "2.2"
 gotham = "0.4"
 gotham_derive = "0.4"
-gotham_restful = { path = "../gotham_restful", features = ["openapi"] }
+gotham_restful = { version = "0.0.1", features = ["openapi"] }
 hyper = "0.12"
 log = "0.4"
 log4rs = { version = "0.8", features = ["console_appender"], default-features = false }

gotham_restful/Cargo.toml

@@ -9,7 +9,6 @@ description = "RESTful additions for Gotham"
 keywords = ["gotham", "rest", "restful"]
 license = "EPL-2.0 OR Apache-2.0"
 readme = "../README.md"
-include = ["src/**/*", "Cargo.toml", "../LICENSE"]
 repository = "https://gitlab.com/msrd0/gotham-restful"
 
 [badges]
@@ -22,7 +21,7 @@ failure = "0.1"
 futures = "0.1"
 gotham = "0.4"
 gotham_derive = "0.4"
-gotham_restful_derive = { path = "../gotham_restful_derive" }
+gotham_restful_derive = { version = "0.0.1" }
 hyper = "0.12"
 indexmap = { version = "1.0", optional = true }
 log = { version = "0.4", optional = true }

gotham_restful/LICENSE-Apache

@@ -0,0 +1 @@
+../LICENSE-Apache

gotham_restful/LICENSE-EPL

@@ -0,0 +1 @@
+../LICENSE-EPL

gotham_restful/LICENSE.md

@@ -0,0 +1 @@
+../LICENSE.md

gotham_restful/src/types.rs

@@ -1,5 +1,6 @@
 #[cfg(feature = "openapi")]
-use crate::{OpenapiType, result::ResourceError};
+use crate::OpenapiType;
+use crate::result::ResourceError;
 
 use hyper::Chunk;
 use mime::{Mime, APPLICATION_JSON};

gotham_restful_derive/Cargo.toml

@@ -9,7 +9,6 @@ description = "RESTful additions for Gotham - Derive"
 keywords = ["gotham", "rest", "restful", "derive"]
 license = "EPL-2.0 OR Apache-2.0"
 readme = "../README.md"
-include = ["src/**/*", "Cargo.toml", "../LICENSE"]
 repository = "https://gitlab.com/msrd0/gotham-restful"
 
 [lib]

gotham_restful_derive/LICENSE-Apache

@@ -0,0 +1 @@
+../LICENSE-Apache

gotham_restful_derive/LICENSE-EPL

@@ -0,0 +1 @@
+../LICENSE-EPL

gotham_restful_derive/LICENSE.md

@@ -0,0 +1 @@
+../LICENSE.md