Auto merge of #40 - killercup:feature/no-optional-dev-deps, r=killercup

There Can't Be Optional Dev Deps
killercup · Oct 18, 2015 · 541524e · 541524e
2 parents bc1e40d + 7c68e57
commit 541524e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/bin/add/args.rs b/src/bin/add/args.rs
@@ -15,17 +15,6 @@ macro_rules! toml_table {
     }
 }
 
-/// Errors when parsing CLI arguments
-quick_error! {
-    #[derive(Debug)]
-    pub enum ArgParseError {
-        /// Internal error parsing args to TOML
-        BuildingDependency {
-            description("Error build a dependency description from arguments")
-        }
-    }
-}
-
 #[derive(Debug, RustcDecodable)]
 /// Docopts input args.
 pub struct Args {

diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs
@@ -26,7 +26,7 @@ use args::Args;
 
 static USAGE: &'static str = r"
 Usage:
-    cargo add <crate> [--dev|--build] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
+    cargo add <crate> [--dev|--build|--optional] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
     cargo add (-h|--help)
     cargo add --version
 

diff --git a/tests/cargo-add.rs b/tests/cargo-add.rs
@@ -185,13 +185,27 @@ fn adds_optional_dep() {
     assert_eq!(val.as_bool().expect("optional not a bool"), true);
 }
 
+#[test]
+#[should_panic]
+fn failt_to_add_optional_dev_dep() {
+    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());
+
+    // Fails because optional dependencies must be in `dependencies` table.
+    execute_command(&["add", "versioned-package", "--ver", ">=0.1.1", "--dev", "--optional"],
+                    &manifest);
+}
+
 #[test]
 fn no_argument() {
     assert_cli!("target/debug/cargo-add", &["add"] => Error 1,
                 r"Invalid arguments.
 
 Usage:
-    cargo add <crate> [--dev|--build] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
+    cargo add <crate> [--dev|--build|--optional] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
     cargo add (-h|--help)
     cargo add --version")
         .unwrap();
@@ -203,7 +217,7 @@ fn unknown_flags() {
                 r"Unknown flag: '--flag'
 
 Usage:
-    cargo add <crate> [--dev|--build] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
+    cargo add <crate> [--dev|--build|--optional] [--ver=<semver>|--git=<uri>|--path=<uri>] [options]
     cargo add (-h|--help)
     cargo add --version")
         .unwrap();