Add verbosity flags to metadata command

src/cmd/metadata.rs

@@ -17,6 +17,7 @@
 use crate::{
     util,
     workspace::{ManifestPath, Workspace},
+    Verbosity,
 };
 use anyhow::Result;
 
@@ -25,7 +26,7 @@ const METADATA_FILE: &str = "metadata.json";
 /// Executes build of the smart-contract which produces a wasm binary that is ready for deploying.
 ///
 /// It does so by invoking build by cargo and then post processing the final binary.
-pub(crate) fn execute_generate_metadata(manifest_path: ManifestPath) -> Result<String> {
+pub(crate) fn execute_generate_metadata(manifest_path: ManifestPath, verbosity: Option<Verbosity>) -> Result<String> {
     util::assert_channel()?;
     println!("  Generating metadata");
 
@@ -50,6 +51,7 @@ pub(crate) fn execute_generate_metadata(manifest_path: ManifestPath) -> Result<S
                 // "--no-default-features", // Breaks builds for MacOS (linker errors), we should investigate this issue asap!
             ],
             working_dir,
+            verbosity,
         )
     };
 

src/main.rs

@@ -134,7 +134,10 @@ enum Command {
     },
     /// Generate contract metadata artifacts
     #[structopt(name = "generate-metadata")]
-    GenerateMetadata {},
+    GenerateMetadata {
+        #[structopt(flatten)]
+        verbosity: VerbosityFlags
+    },
     /// Test the smart contract off-chain
     #[structopt(name = "test")]
     Test {},
@@ -195,7 +198,7 @@ fn exec(cmd: Command) -> Result<String> {
     match &cmd {
         Command::New { name, target_dir } => cmd::execute_new(name, target_dir.as_ref()),
         Command::Build { verbosity} => cmd::execute_build(Default::default(), verbosity.try_into()?),
-        Command::GenerateMetadata {} => cmd::execute_generate_metadata(Default::default()),
+        Command::GenerateMetadata { verbosity } => cmd::execute_generate_metadata(Default::default(), verbosity.try_into()?),
         Command::Test {} => Err(anyhow::anyhow!("Command unimplemented")),
         #[cfg(feature = "extrinsics")]
         Command::Deploy {

src/util.rs

@@ -14,7 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with ink!.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::workspace::ManifestPath;
+use crate::{
+    workspace::ManifestPath,
+    Verbosity,
+};
 use anyhow::{Context, Result};
 use cargo_metadata::{Metadata as CargoMetadata, MetadataCommand, PackageId};
 use rustc_version::Channel;
@@ -53,7 +56,7 @@ pub fn assert_channel() -> Result<()> {
 }
 
 /// Run cargo with the supplied args
-pub(crate) fn invoke_cargo<I, S, P>(command: &str, args: I, working_dir: Option<P>) -> Result<()>
+pub(crate) fn invoke_cargo<I, S, P>(command: &str, args: I, working_dir: Option<P>, verbosity: Option<Verbosity>) -> Result<()>
 where
     I: IntoIterator<Item = S> + std::fmt::Debug,
     S: AsRef<OsStr>,
@@ -64,8 +67,14 @@ where
     if let Some(path) = working_dir {
         cmd.current_dir(path);
     }
+
     cmd.arg(command);
     cmd.args(args);
+    match verbosity {
+        Some(Verbosity::Quiet) => cmd.arg("--quiet"),
+        Some(Verbosity::Verbose) => cmd.arg("--verbose"),
+        None => { &mut cmd },
+    };
 
     let status = cmd
         .status()