Specify optional --manifest-path for build and generate-metadata

src/cmd/build.rs

@@ -291,7 +291,7 @@ pub(crate) fn execute_with_metadata(
 #[cfg(feature = "test-ci-only")]
 #[cfg(test)]
 mod tests {
-    use crate::{cmd, util::tests::with_tmp_dir, workspace::ManifestPath, UnstableFlags};
+    use crate::{cmd, util::tests::with_tmp_dir, ManifestPath, UnstableFlags};
 
     #[test]
     fn build_template() {

src/cmd/metadata.rs

@@ -192,8 +192,7 @@ pub(crate) fn execute(
 #[cfg(test)]
 mod tests {
     use crate::{
-        cmd, crate_metadata::CrateMetadata, util::tests::with_tmp_dir, workspace::ManifestPath,
-        UnstableFlags,
+        cmd, crate_metadata::CrateMetadata, util::tests::with_tmp_dir, ManifestPath, UnstableFlags,
     };
     use blake2::digest::{Update as _, VariableOutput as _};
     use contract_metadata::*;

src/crate_metadata.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with cargo-contract.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::workspace::ManifestPath;
+use crate::ManifestPath;
 use anyhow::{Context, Result};
 use cargo_metadata::{Metadata as CargoMetadata, MetadataCommand, Package};
 use semver::Version;

src/main.rs

@@ -19,6 +19,8 @@ mod crate_metadata;
 mod util;
 mod workspace;
 
+use self::workspace::ManifestPath;
+
 #[cfg(feature = "extrinsics")]
 use sp_core::{crypto::Pair, sr25519, H256};
 use std::{
@@ -163,6 +165,9 @@ enum Command {
     /// Compiles the smart contract
     #[structopt(name = "build")]
     Build {
+        /// Path to the Cargo.toml of the contract to build
+        #[structopt(long, parse(from_os_str))]
+        manifest_path: Option<PathBuf>,
         #[structopt(flatten)]
         verbosity: VerbosityFlags,
         #[structopt(flatten)]
@@ -171,6 +176,9 @@ enum Command {
     /// Generate contract metadata artifacts
     #[structopt(name = "generate-metadata")]
     GenerateMetadata {
+        /// Path to the Cargo.toml of the contract for which to generate metadata
+        #[structopt(long, parse(from_os_str))]
+        manifest_path: Option<PathBuf>,
         #[structopt(flatten)]
         verbosity: VerbosityFlags,
         #[structopt(flatten)]
@@ -239,10 +247,11 @@ fn exec(cmd: Command) -> Result<String> {
     match &cmd {
         Command::New { name, target_dir } => cmd::new::execute(name, target_dir.as_ref()),
         Command::Build {
+            manifest_path,
             verbosity,
             unstable_options,
         } => {
-            let manifest_path = Default::default();
+            let manifest_path = ManifestPath::try_from(manifest_path.as_ref())?;
             let dest_wasm = cmd::build::execute(
                 &manifest_path,
                 verbosity.try_into()?,
@@ -254,11 +263,13 @@ fn exec(cmd: Command) -> Result<String> {
             ))
         }
         Command::GenerateMetadata {
+            manifest_path,
             verbosity,
             unstable_options,
         } => {
+            let manifest_path = ManifestPath::try_from(manifest_path.as_ref())?;
             let metadata_file = cmd::metadata::execute(
-                Default::default(),
+                manifest_path,
                 verbosity.try_into()?,
                 unstable_options.try_into()?,
             )?;

src/workspace/manifest.rs

@@ -76,6 +76,17 @@ impl TryFrom<&PathBuf> for ManifestPath {
     }
 }
 
+impl<P> TryFrom<Option<P>> for ManifestPath
+where
+    P: AsRef<Path>,
+{
+    type Error = anyhow::Error;
+
+    fn try_from(value: Option<P>) -> Result<Self, Self::Error> {
+        value.map_or(Ok(Default::default()), ManifestPath::new)
+    }
+}
+
 impl Default for ManifestPath {
     fn default() -> ManifestPath {
         ManifestPath::new(MANIFEST_FILE).expect("it's a valid manifest file")