Merge pull request #779 from cassaundra/merge-rm-package

Add tests for `--package`

.github/workflows/build.yml

@@ -22,10 +22,10 @@ jobs:
  run: cargo build --verbose
  continue-on-error: ${{ matrix.toolchain != 'stable' }}
  - name: Run tests
- run: cargo test --verbose
+ run: cargo test --all --verbose
  continue-on-error: ${{ matrix.toolchain != 'stable' }}
  - name: Run tests (vendored-openssl)
- run: cargo test --features vendored-openssl --verbose
+ run: cargo test --all --features vendored-openssl --verbose
  continue-on-error: ${{ matrix.toolchain != 'stable' }}
 
  clippy:
@@ -42,7 +42,7 @@ jobs:
  uses: actions/checkout@v2
  - uses: Swatinem/rust-cache@v1
  - name: Cargo Clippy
- run: cargo clippy -- -D warnings -A deprecated
+ run: cargo clippy --all -- -D warnings -A deprecated
 
  fmt:
  name: fmt (ubuntu-latest, stable)

crates/cargo-remove/src/bin/cargo/commands/remove.rs

@@ -52,15 +52,15 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
  let spec = match packages.len() {
  0 => {
  return Err(CliError::new(
- anyhow::format_err!("no packages selected. Please specify one with `-p <PKGID>`"),
+ anyhow::format_err!("no packages selected. Please specify one with `-p <PKG_ID>`"),
  101,
  ));
  }
  1 => packages[0],
  len => {
  return Err(CliError::new(
  anyhow::format_err!(
- "{len} packages selected. Please specify one with `-p <PKGID>`",
+ "{len} packages selected. Please specify one with `-p <PKG_ID>`",
  ),
  101,
  ));

crates/cargo-remove/src/cargo/ops/cargo_remove/dependency.rs

@@ -1,3 +1,7 @@
+#![allow(clippy::all)]
+#![allow(missing_docs)]
+#![allow(warnings)]
+
 use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
 use std::path::{Path, PathBuf};

crates/cargo-remove/src/cargo/ops/cargo_remove/manifest.rs

@@ -1,3 +1,7 @@
+#![allow(clippy::all)]
+#![allow(missing_docs)]
+#![allow(warnings)]
+
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
 use std::str;

crates/cargo-remove/src/cargo/ops/cargo_remove/metadata.rs

@@ -1,3 +1,7 @@
+#![allow(clippy::all)]
+#![allow(missing_docs)]
+#![allow(warnings)]
+
 use std::convert::TryInto;
 use std::path::Path;
 

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = [
+ "dep-a",
+ "dep-b"
+]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-a"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-b"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/mod.rs

@@ -0,0 +1,25 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::Project;
+
+use crate::cargo_remove::init_registry;
+use crate::cargo_remove::CargoCommand;
+use crate::curr_dir;
+
+#[cargo_test]
+fn case() {
+ init_registry();
+ let project = Project::from_template(curr_dir!().join("in"));
+ let project_root = project.root();
+ let cwd = &project_root;
+
+ snapbox::cmd::Command::cargo_ui()
+ .arg("remove")
+ .args(["docopt", "--package", "dep-c"])
+ .current_dir(cwd)
+ .assert()
+ .code(101)
+ .stdout_matches_path(curr_dir!().join("stdout.log"))
+ .stderr_matches_path(curr_dir!().join("stderr.log"));
+
+ assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+}

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = [
+ "dep-a",
+ "dep-b"
+]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-a"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-b"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stderr.log

@@ -0,0 +1 @@
+error: package(s) `dep-c` not found in workspace `[ROOT]/case`

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = [
+ "dep-a",
+ "dep-b"
+]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-a"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-b"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/mod.rs

@@ -0,0 +1,25 @@
+use cargo_test_support::compare::assert_ui;
+use cargo_test_support::Project;
+
+use crate::cargo_remove::init_registry;
+use crate::cargo_remove::CargoCommand;
+use crate::curr_dir;
+
+#[cargo_test]
+fn case() {
+ init_registry();
+ let project = Project::from_template(curr_dir!().join("in"));
+ let project_root = project.root();
+ let cwd = &project_root;
+
+ snapbox::cmd::Command::cargo_ui()
+ .arg("remove")
+ .args(["docopt"])
+ .current_dir(cwd)
+ .assert()
+ .code(101)
+ .stdout_matches_path(curr_dir!().join("stdout.log"))
+ .stderr_matches_path(curr_dir!().join("stderr.log"));
+
+ assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+}

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = [
+ "dep-a",
+ "dep-b"
+]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-a"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "dep-b"
+version = "0.1.0"
+
+[[bin]]
+name = "main"
+path = "src/main.rs"
+
+[build-dependencies]
+semver = "0.1.0"
+
+[dependencies]
+docopt = "0.6"
+pad = "0.1"
+rustc-serialize = "0.3"
+semver = "0.1"
+toml = "0.1"
+clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
+
+[dev-dependencies]
+regex = "0.1.41"
+serde = "1.0.90"
+
+[features]
+std = ["serde/std", "semver/std"]
+annoy = ["clippy"]

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stderr.log

@@ -0,0 +1 @@
+error: 2 packages selected. Please specify one with `-p <PKG_ID>`

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/stderr.log

@@ -1,2 +1,2 @@
  Removing dbus from dependencies for target `powerpc-unknown-linux-gnu`
-error: The table `powerpc-unknown-linux-gnu` could not be found.
+error: The dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`.

crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/stderr.log

@@ -1,2 +1,2 @@
  Removing semver from build-dependencies
-error: The table `build-dependencies` could not be found.
+error: The dependency `semver` could not be found in `build-dependencies`.

crates/cargo-remove/tests/testsuite/cargo_remove/mod.rs

@@ -5,6 +5,8 @@
 mod dry_run;
 mod invalid_arg;
 mod invalid_dep;
+mod invalid_remove_package;
+mod invalid_remove_package_multiple;
 mod invalid_remove_target;
 mod invalid_remove_target_dep;
 mod invalid_section;
@@ -18,6 +20,7 @@ mod remove_multiple_deps;
 mod remove_multiple_dev;
 mod remove_optional_dep_feature;
 mod remove_optional_feature;
+mod remove_package;
 mod remove_target;
 mod remove_target_build;
 mod remove_target_dev;

crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/Cargo.toml

@@ -0,0 +1,5 @@
+[workspace]
+members = [
+ "dep-a",
+ "dep-b"
+]