Merge pull request diesel-rs#413 from Bobo1239/master

Use a cargo workspace

Author: sgrif

.travis.yml

@@ -14,7 +14,6 @@ before_script:
   - psql -c 'create database diesel_schema;' -U postgres
 script:
 - |
-  (cd diesel && travis-cargo doc -- --features "postgres sqlite chrono uuid" && echo "docs.diesel.rs" > target/doc/CNAME) &&
   if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
     (cd diesel && travis-cargo test -- --no-default-features --features "unstable chrono $BACKEND")
   else
@@ -48,7 +47,12 @@ env:
     - TRAVIS_CARGO_NIGHTLY_FEATURE=""
     - secure: NmCM1VNEzid6bROA7tXV1R63n9S9KvY1etXsDzd1608cvjRnG3ZDAWXISbY1BxqrvleElreUJOvz/3TSQCHivpT2ezeyk2sntYtZpw0TWbz1SQMAPNWPTjP3bNQzpmNwfU4p6ui6qIOnQza4JxOu3SZSveNlehDBPkkS+52R7Zw/EPdwi9jTYJArV2+8pnEsQECAdRLttbtA2JBl3hZ4VHfGpHRZyeULn63UzyVbQVzQ3NVhqyQUKTPdpUciQTI3fZEkfaWuLV8QPPa5026/yJEEi2Fsl3r7fyY8ia67k4Zo9THlPVD0YOUlkWuZWwvkxNA8RQSVPv4FidEpwbxG8y6nAra4CjwiEChcpFhZJtrH7ZrXO/tJk7vtc5CFVWUsQtNX92QY1QFdPxwYNBSICLyUN+A+BQURwvQgxdcJsJyQmh5Ed7yuavcAinVq7fPeOyBWcPL5mt17no16aG1rzvXSUnD0aH7F3S3DHkoM9P9iHgJMLk+2YNmJtFescBxCeG8bA7t5bw0kQNH5KUWAD1uYpC9ikB3NVdlc+q17dKTAe4rcYA+sIO+UGudvpmLWT0lXtEMqDfxfCmyICDESs9bNfueCGJEAnfTBNunsJqR7rMUvjNndS2/Ssok6c/0Yfb9X8cM9nI4QLAj/+hClqdYphmpCjuC34bWxFSt/KJI=
 after_success:
-  - "(cd diesel && travis-cargo --only stable doc-upload)"
+- |
+  if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
+    (cd diesel && travis-cargo doc -- --features "postgres sqlite chrono uuid")
+    (echo "docs.diesel.rs" > diesel/target/doc/CNAME)
+    (cd diesel && travis-cargo doc-upload)
+  fi
 branches:
   only:
     - master

Cargo.toml

@@ -0,0 +1,15 @@
+[workspace]
+members = [
+    "diesel",
+    "diesel_cli",
+    "diesel_codegen",
+    "diesel_codegen_shared",
+    "diesel_codegen_syntex",
+    # FIXME: getting "multiple matching crates for `diesel`" because of the shared build directory
+    # "diesel_compile_tests",
+    "diesel_tests",
+    "examples/getting_started_step_1",
+    "examples/getting_started_step_2",
+    "examples/getting_started_step_3",
+    "examples/getting_started_step_4",
+]

bin/test

@@ -9,12 +9,11 @@ elif [ "$1" == "compile" ]; then
   (cd diesel_compile_tests && cargo test)
 else
   (cd diesel && cargo test --features "unstable chrono sqlite")
+  (cd diesel_cli && cargo test --features "sqlite" --no-default-features)
+  (cd diesel_tests && DATABASE_URL=/tmp/test.db cargo test --features "unstable_sqlite" --no-default-features)
   (cd examples && ./test_nightly)
   (cd diesel_cli && cargo test --features "postgres" --no-default-features)
-  (cd diesel_cli && cargo test --features "sqlite" --no-default-features)
-  (cd diesel_codegen_shared && cargo test --features "postgres dotenv")
   (cd diesel_codegen_syntex && cargo test --no-default-features --features "postgres")
   (cd diesel_tests && cargo test --features "unstable_postgres" --no-default-features)
-  (cd diesel_tests && DATABASE_URL=/tmp/test.db cargo test --features "unstable_sqlite" --no-default-features)
   (cd diesel_compile_tests && cargo test)
 fi;

diesel_cli/tests/completion_generation.rs

@@ -7,9 +7,5 @@ fn can_generate_bash_completion() {
 
     let result = p.command("bash-completion").run();
 
-    let expected_last_line = "complete -F _diesel diesel";
-
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
-    assert!(result.stdout().contains(expected_last_line),
-        "Unexpected stdout {}", result.stdout());
 }

diesel_cli/tests/support/command.rs

@@ -70,6 +70,7 @@ impl CommandResult {
 
 fn path_to_diesel_cli() -> PathBuf {
     Path::new(&env::var_os("CARGO_MANIFEST_DIR").unwrap())
+        .parent().unwrap()
         .join("target")
         .join("debug")
         .join("diesel")

diesel_compile_tests/Cargo.toml

@@ -3,6 +3,8 @@ name = "diesel_compile_tests"
 version = "0.1.0"
 authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
 
+[workspace]
+
 [dependencies]
 diesel = { version = "0.8.1", features = ["sqlite", "postgres"] }
 diesel_codegen = { version = "0.8.1" }

diesel_compile_tests/tests/compile_tests.rs

@@ -9,7 +9,7 @@ fn run_mode(mode: &'static str) {
 
     let cfg_mode = mode.parse().expect("Invalid mode");
 
-    config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
+    config.target_rustcflags = Some("-L target/debug/deps/".to_owned());
     if let Ok(name) = var::<&str>("TESTNAME") {
         let s : String = name.to_owned();
         config.filter = Some(s)

examples/getting_started_step_1/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "diesel_demo"
+name = "diesel_demo_step_1"
 version = "0.1.0"
 authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
 

examples/getting_started_step_1/src/bin/show_posts.rs

@@ -1,12 +1,12 @@
-extern crate diesel_demo;
+extern crate diesel_demo_step_1;
 extern crate diesel;
 
-use diesel_demo::*;
-use diesel_demo::models::*;
+use diesel_demo_step_1::*;
+use diesel_demo_step_1::models::*;
 use diesel::prelude::*;
 
 fn main() {
-    use diesel_demo::schema::posts::dsl::*;
+    use diesel_demo_step_1::schema::posts::dsl::*;
 
     let connection = establish_connection();
     let results = posts.filter(published.eq(true))

examples/getting_started_step_2/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "diesel_demo"
+name = "diesel_demo_step_2"
 version = "0.1.0"
 authors = ["Sean Griffin <sean@seantheprogrammer.com>"]