Add VersionInfo to ProjectMetadata

Author: mkaput

scarb/src/metadata/mod.rs

@@ -16,6 +16,7 @@ use crate::core::manifest::{
 };
 use crate::core::{ManifestDependency, Package, PackageId, SourceId, Workspace};
 use crate::ops::resolve_workspace;
+use crate::version::VersionInfo;
 
 mod metadata_version;
 
@@ -34,6 +35,7 @@ pub enum Metadata {
 pub struct ProjectMetadata {
     pub version: MetadataVersionPin<1>,
     pub app_exe: Option<PathBuf>,
+    pub app_version_info: VersionInfo,
     pub target_dir: Option<Utf8PathBuf>,
     pub workspace: WorkspaceMetadata,
     pub packages: Vec<PackageMetadata>,
@@ -108,6 +110,7 @@ impl ProjectMetadata {
         Ok(Self {
             version: MetadataVersionPin::<1>,
             app_exe: ws.config().app_exe().ok().map(Into::into),
+            app_version_info: crate::version::get(),
             target_dir: Some(ws.target_dir().path_unchecked().to_path_buf()),
             workspace: WorkspaceMetadata::new(ws)?,
             packages,

scarb/src/version.rs

@@ -2,20 +2,25 @@
 
 use std::fmt;
 
+use serde::{Deserialize, Serialize};
+
 /// Scarb's version.
+#[derive(Serialize, Deserialize, Debug)]
 pub struct VersionInfo {
     pub version: String,
     pub commit_info: Option<CommitInfo>,
     pub cairo: CairoVersionInfo,
 }
 
 /// Cairo's version.
+#[derive(Serialize, Deserialize, Debug)]
 pub struct CairoVersionInfo {
     pub version: String,
     pub commit_info: Option<CommitInfo>,
 }
 
 /// Information about the Git repository where the crate was built from.
+#[derive(Serialize, Deserialize, Debug)]
 pub struct CommitInfo {
     pub short_commit_hash: String,
     pub commit_hash: String,

scarb/tests/e2e/metadata.rs

@@ -53,6 +53,22 @@ fn simple() {
             r#"{
   "version": 1,
   "app_exe": "[..]",
+  "app_version_info": {
+    "version": "[..]",
+    "commit_info": {
+      "short_commit_hash": "[..]",
+      "commit_hash": "[..]",
+      "commit_date": "[..]"
+    },
+    "cairo": {
+      "version": "[..]",
+      "commit_info": {
+        "short_commit_hash": "[..]",
+        "commit_hash": "[..]",
+        "commit_date": [..]
+      }
+    }
+  },
   "target_dir": "[..]/target",
   "workspace": {
     "root": "[..]",