Add --package <pkgid> to all commands

src/bin/add/args.rs

@@ -83,9 +83,18 @@ pub struct Args {
     pub optional: bool,
 
     /// Path to the manifest to add a dependency to.
-    #[structopt(long = "manifest-path", value_name = "path")]
+    #[structopt(long = "manifest-path", value_name = "path", conflicts_with = "pkgid")]
     pub manifest_path: Option<PathBuf>,
 
+    /// Package id of the crate to add this dependency to.
+    #[structopt(
+        long = "package",
+        short = "p",
+        value_name = "pkgid",
+        conflicts_with = "path"
+    )]
+    pub pkgid: Option<String>,
+
     /// Choose method of semantic version upgrade.  Must be one of "none" (exact version, `=`
     /// modifier), "patch" (`~` modifier), "minor" (`^` modifier), "all" (`>=`), or "default" (no
     /// modifier).
@@ -276,6 +285,7 @@ impl Default for Args {
             target: None,
             optional: false,
             manifest_path: None,
+            pkgid: None,
             upgrade: "minor".to_string(),
             allow_prerelease: false,
             no_default_features: false,

src/bin/add/main.rs

@@ -15,7 +15,10 @@
 extern crate error_chain;
 
 use crate::args::{Args, Command};
-use cargo_edit::{find, registry_url, update_registry_index, Dependency, Manifest};
+use cargo_edit::{
+    find, manifest_from_pkgid, registry_url, update_registry_index, Dependency, Manifest,
+};
+use std::borrow::Cow;
 use std::io::Write;
 use std::process;
 use structopt::StructOpt;
@@ -83,8 +86,12 @@ fn print_msg(dep: &Dependency, section: &[String], optional: bool) -> Result<()>
 }
 
 fn handle_add(args: &Args) -> Result<()> {
-    let manifest_path = &args.manifest_path;
-    let mut manifest = Manifest::open(manifest_path)?;
+    let manifest_path = if let Some(ref pkgid) = args.pkgid {
+        Cow::Owned(manifest_from_pkgid(pkgid)?)
+    } else {
+        Cow::Borrowed(&args.manifest_path)
+    };
+    let mut manifest = Manifest::open(&manifest_path)?;
     let deps = &args.parse_dependencies()?;
 
     if !args.offline && std::env::var("CARGO_IS_TEST").is_err() {
@@ -122,7 +129,7 @@ fn handle_add(args: &Args) -> Result<()> {
             err
         })?;
 
-    let mut file = Manifest::find_file(manifest_path)?;
+    let mut file = Manifest::find_file(&manifest_path)?;
     manifest.write_to_file(&mut file)?;
 
     Ok(())

src/bin/rm/main.rs

@@ -14,7 +14,8 @@
 #[macro_use]
 extern crate error_chain;
 
-use cargo_edit::Manifest;
+use cargo_edit::{manifest_from_pkgid, Manifest};
+use std::borrow::Cow;
 use std::io::Write;
 use std::path::PathBuf;
 use std::process;
@@ -56,9 +57,18 @@ struct Args {
     build: bool,
 
     /// Path to the manifest to remove a dependency from.
-    #[structopt(long = "manifest-path", value_name = "path")]
+    #[structopt(long = "manifest-path", value_name = "path", conflicts_with = "pkgid")]
     manifest_path: Option<PathBuf>,
 
+    /// Package id of the crate to add this dependency to.
+    #[structopt(
+        long = "package",
+        short = "p",
+        value_name = "pkgid",
+        conflicts_with = "path"
+    )]
+    pkgid: Option<String>,
+
     /// Do not print any output in case of success.
     #[structopt(long = "quiet", short = "q")]
     quiet: bool,
@@ -92,8 +102,12 @@ fn print_msg(name: &str, section: &str) -> Result<()> {
 }
 
 fn handle_rm(args: &Args) -> Result<()> {
-    let manifest_path = &args.manifest_path;
-    let mut manifest = Manifest::open(manifest_path)?;
+    let manifest_path = if let Some(ref pkgid) = args.pkgid {
+        Cow::Owned(manifest_from_pkgid(pkgid)?)
+    } else {
+        Cow::Borrowed(&args.manifest_path)
+    };
+    let mut manifest = Manifest::open(&manifest_path)?;
     let deps = &args.crates;
 
     deps.iter()
@@ -111,7 +125,7 @@ fn handle_rm(args: &Args) -> Result<()> {
             err
         })?;
 
-    let mut file = Manifest::find_file(manifest_path)?;
+    let mut file = Manifest::find_file(&manifest_path)?;
     manifest.write_to_file(&mut file)?;
 
     Ok(())

src/bin/upgrade/main.rs

@@ -71,9 +71,18 @@ struct Args {
     dependency: Vec<String>,
 
     /// Path to the manifest to upgrade
-    #[structopt(long = "manifest-path", value_name = "path")]
+    #[structopt(long = "manifest-path", value_name = "path", conflicts_with = "pkgid")]
     manifest_path: Option<PathBuf>,
 
+    /// Package id of the crate to add this dependency to.
+    #[structopt(
+        long = "package",
+        short = "p",
+        value_name = "pkgid",
+        conflicts_with = "path"
+    )]
+    pkgid: Option<String>,
+
     /// Upgrade all packages in the workspace.
     #[structopt(long = "all")]
     all: bool,
@@ -153,6 +162,24 @@ impl Manifests {
             .map(Manifests)
     }
 
+    fn get_pkgid(pkgid: &str) -> Result<Self> {
+        let mut cmd = cargo_metadata::MetadataCommand::new();
+        cmd.no_deps();
+        let result = cmd
+            .exec()
+            .map_err(|e| Error::from(e.compat()).chain_err(|| "Invalid manifest"))?;
+        let packages = result.packages;
+        let package = packages
+            .into_iter()
+            .find(|pkg| &pkg.name == pkgid)
+            .chain_err(|| {
+                "Found virtual manifest, but this command requires running against an \
+                 actual package in this workspace. Try adding `--all`."
+            })?;
+        let manifest = LocalManifest::try_new(Path::new(&package.manifest_path))?;
+        Ok(Manifests(vec![(manifest, package.to_owned())]))
+    }
+
     /// Get the manifest specified by the manifest path. Try to make an educated guess if no path is
     /// provided.
     fn get_local_one(manifest_path: &Option<PathBuf>) -> Result<Self> {
@@ -401,6 +428,7 @@ fn process(args: Args) -> Result<()> {
     let Args {
         dependency,
         manifest_path,
+        pkgid,
         all,
         allow_prerelease,
         dry_run,
@@ -416,6 +444,8 @@ fn process(args: Args) -> Result<()> {
 
     let manifests = if all {
         Manifests::get_all(&manifest_path)
+    } else if let Some(ref pkgid) = pkgid {
+        Manifests::get_pkgid(pkgid)
     } else {
         Manifests::get_local_one(&manifest_path)
     }?;

src/errors.rs

@@ -2,6 +2,7 @@ error_chain! {
     foreign_links {
         Io(::std::io::Error) #[doc = "An error from the std::io module"];
         Git(::git2::Error)#[doc = "An error from the git2 crate"];
+        CargoMetadata(::failure::Compat<::cargo_metadata::Error>)#[doc = "An error from the cargo_metadata crate"];
     }
 
     errors {

src/lib.rs

@@ -23,6 +23,7 @@ mod dependency;
 mod errors;
 mod fetch;
 mod manifest;
+mod metadata;
 mod registry;
 
 pub use crate::crate_name::CrateName;
@@ -33,4 +34,5 @@ pub use crate::fetch::{
     get_latest_dependency, update_registry_index,
 };
 pub use crate::manifest::{find, LocalManifest, Manifest};
+pub use crate::metadata::manifest_from_pkgid;
 pub use crate::registry::registry_url;

src/metadata.rs

@@ -0,0 +1,21 @@
+use crate::errors::*;
+use failure::Fail;
+use std::path::PathBuf;
+
+/// Takes a pkgid and attempts to find the path to it's `Cargo.toml`, using `cargo`'s metadata
+pub fn manifest_from_pkgid(pkgid: &str) -> Result<Option<PathBuf>> {
+    let mut cmd = cargo_metadata::MetadataCommand::new();
+    cmd.no_deps();
+    let result = cmd
+        .exec()
+        .map_err(|e| Error::from(e.compat()).chain_err(|| "Invalid manifest"))?;
+    let packages = result.packages;
+    let package = packages
+        .into_iter()
+        .find(|pkg| &pkg.name == pkgid)
+        .chain_err(|| {
+            "Found virtual manifest, but this command requires running against an \
+             actual package in this workspace. Try adding `--all`."
+        })?;
+    Ok(Some(PathBuf::from(&package.manifest_path)))
+}