Auto merge of #27 - MrJohz:master, r=killercup

Initial attempt to add integration tests for cargo-add

N.B: Adds a new dev-dependency on the rust-lang [`tempdir`](https://crates.io/crates/tempdir) crate.

Currently it just does the things that the old [shell tests](https://github.com/killercup/cargo-edit/blob/4660a5578a243cf36057e7e1eb3976bb8e885def/tests/cargo_add.sh) did + a couple of other minor tests.  Basically, as far as issue #17 goes, it checks the manifest is updated properly and nothing else.  All the tests here pass, at least on my machine!  :P

I'm going to have a go at the error messages and TOML structure tests next.  I can either make a new pull request with those in, or add them to this pull request - whichever is easiest for you.

Cargo.toml

@@ -28,3 +28,4 @@ clippy = {version = "0.0.19", optional = true}
 
 [dev-dependencies]
 assert_cli = "0.1.0"
+tempdir = "0.3"

src/bin/add/main.rs

@@ -68,7 +68,7 @@ fn main() {
     }
 
     if let Err(err) = handle_add(&args) {
-        println!("{}", err);
+        println!("Command failed due to unhandled error: {}", err);
         process::exit(1);
     }
 }

tests/cargo-add.rs

@@ -0,0 +1,193 @@
+extern crate tempdir;
+extern crate toml;
+
+use std::{fs, process};
+use std::io::prelude::*;
+use std::ffi::OsStr;
+
+fn clone_out_test(source: &str) -> (tempdir::TempDir, String) {
+    let tmpdir = tempdir::TempDir::new("cargo-add-test")
+        .ok().expect("failed to construct temporary directory");
+    fs::copy(source, tmpdir.path().join("Cargo.toml"))
+        .unwrap_or_else(|err| panic!("could not copy test manifest: {}", err));
+    let path = tmpdir.path().join("Cargo.toml").to_str().unwrap().to_string().clone();
+
+    (tmpdir, path)
+}
+
+fn execute_command<S>(command: &[S], manifest: &str) where S: AsRef<OsStr> {
+    let call = process::Command::new("target/debug/cargo-add")
+        .args(command)
+        .arg(format!("--manifest-path={}", manifest))
+        .output().unwrap();
+
+    if !call.status.success() {
+        println!("Status code: {:?}", call.status);
+        println!("STDOUT: {}", String::from_utf8_lossy(&call.stdout));
+        println!("STDERR: {}", String::from_utf8_lossy(&call.stderr));
+        panic!("cargo-add failed to execute")
+    }
+}
+
+fn get_toml(manifest_path: &str) -> toml::Value {
+    let mut f = fs::File::open(manifest_path).unwrap();
+    let mut s = String::new();
+    f.read_to_string(&mut s).unwrap();
+    toml::Value::Table(toml::Parser::new(&s).parse().unwrap())
+}
+
+#[test]
+fn adds_dependencies() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    // dependency not present beforehand
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.my-package").is_none());
+
+    execute_command(&["add", "my-package"], &manifest);
+
+    // dependency present afterwards
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dependencies.my-package").unwrap();
+    assert_eq!(val.as_str().unwrap(), "*");
+}
+
+#[test]
+fn adds_dev_build_dependencies() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    // dependency not present beforehand
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dev-dependencies.my-dev-package").is_none());
+    assert!(toml.lookup("build-dependencies.my-build-package").is_none());
+
+    execute_command(&["add", "my-dev-package", "--dev"], &manifest);
+    execute_command(&["add", "my-build-package", "--build"], &manifest);
+
+    // dependency present afterwards
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dev-dependencies.my-dev-package").unwrap();
+    assert_eq!(val.as_str().unwrap(), "*");
+    let val = toml.lookup("build-dependencies.my-build-package").unwrap();
+    assert_eq!(val.as_str().unwrap(), "*");
+
+    // cannot run with both --dev and --build at the same time
+    let call = process::Command::new("target/debug/cargo-add")
+        .args(&["add", "failure", "--dev", "--build"])
+        .arg(format!("--manifest-path={}", &manifest))
+        .output().unwrap();
+    assert!(!call.status.success());
+
+    // 'failure' dep not present
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.failure").is_none());
+    assert!(toml.lookup("dev-dependencies.failure").is_none());
+    assert!(toml.lookup("build-dependencies.failure").is_none());
+}
+
+#[test]
+fn adds_fixed_version() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    // dependency not present beforehand
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.versioned-package").is_none());
+
+    execute_command(&["add", "versioned-package", "--ver", ">=0.1.1"], &manifest);
+
+    // dependency present afterwards
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dependencies.versioned-package").expect("not added");
+    assert_eq!(val.as_str().expect("not string"), ">=0.1.1");
+
+    // cannot run with both --dev and --build at the same time
+    let call = process::Command::new("target/debug/cargo-add")
+        .args(&["add", "failure", "--ver", "invalid version string"])
+        .arg(format!("--manifest-path={}", &manifest))
+        .output().unwrap();
+    assert!(!call.status.success());
+
+    // 'failure' dep not present
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.failure").is_none());
+    assert!(toml.lookup("dev-dependencies.failure").is_none());
+    assert!(toml.lookup("build-dependencies.failure").is_none());
+}
+
+#[test]
+fn adds_git_source() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    // dependency not present beforehand
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.git-package").is_none());
+
+    execute_command(
+        &["add", "git-package", "--git", "http://localhost/git-package.git"],
+        &manifest);
+
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dependencies.git-package").unwrap();
+    assert_eq!(val.as_table().unwrap().get("git").unwrap().as_str().unwrap(),
+        "http://localhost/git-package.git");
+
+    // check this works with other flags (e.g. --dev) as well
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dev-dependencies.git-dev-pkg").is_none());
+
+    execute_command(
+        &["add", "git-dev-pkg", "--git", "http://site/gp.git", "--dev"],
+        &manifest);
+
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dev-dependencies.git-dev-pkg").unwrap();
+    assert_eq!(val.as_table().unwrap().get("git").unwrap().as_str().unwrap(),
+        "http://site/gp.git");
+}
+
+#[test]
+fn adds_local_source() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    // dependency not present beforehand
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.local").is_none());
+
+    execute_command(&["add", "local", "--path", "/path/to/pkg"], &manifest);
+
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dependencies.local").unwrap();
+    assert_eq!(val.as_table().unwrap().get("path").unwrap().as_str().unwrap(),
+        "/path/to/pkg");
+
+    // check this works with other flags (e.g. --dev) as well
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dev-dependencies.local-dev").is_none());
+
+    execute_command(&["add", "local-dev", "--path", "/path/to/pkg-dev", "--dev"], &manifest);
+
+    let toml = get_toml(&manifest);
+    let val = toml.lookup("dev-dependencies.local-dev").unwrap();
+    assert_eq!(val.as_table().unwrap().get("path").unwrap().as_str().unwrap(),
+        "/path/to/pkg-dev");
+}
+
+#[test]
+fn package_kinds_are_mutually_exclusive() {
+    let (tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample");
+
+    let call = process::Command::new("target/debug/cargo-add")
+        .args(&["add", "failure"])
+        .args(&["--ver", "0.4.3"])
+        .args(&["--git", "git://git.git"])
+        .args(&["--path", "/path/here"])
+        .arg(format!("--manifest-path={}", &manifest))
+        .output().unwrap();
+    assert!(!call.status.success());
+
+    // 'failure' dep not present
+    let toml = get_toml(&manifest);
+    assert!(toml.lookup("dependencies.failure").is_none());
+    assert!(toml.lookup("dev-dependencies.failure").is_none());
+    assert!(toml.lookup("build-dependencies.failure").is_none());
+}

tests/fixtures/add/Cargo.toml.sample

@@ -0,0 +1,3 @@
+[package]
+name = "cargo-list-test-fixture"
+version = "0.0.0"