Show git semver in bannder

Author: 123vivekr

server/src/banner.rs

@@ -18,6 +18,7 @@
  */
 
 use crossterm::style::Stylize;
+use std::fmt;
 use sysinfo::{System, SystemExt};
 
 pub fn system_info() {
@@ -44,56 +45,104 @@ pub fn warning_line() {
     );
 }
 
+pub enum ParseableVersion {
+    Version(semver::Version),
+    Prerelease(semver::Prerelease),
+}
+
+impl fmt::Display for ParseableVersion {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ParseableVersion::Version(v) => write!(f, "{}", v),
+            ParseableVersion::Prerelease(p) => write!(f, "{}", p),
+        }
+    }
+}
+
 pub mod version {
     use chrono::Duration;
     use chrono_humanize::{Accuracy, Tense};
     use crossterm::style::Stylize;
-    use semver::Version;
+    use semver::{Prerelease, Version};
 
     use crate::utils::update;
 
+    use super::ParseableVersion;
+
     pub fn print() {
         // print current version
         let current = current();
-        // not eprintln because if it is old release then time passed with be displayed beside it
-        eprint!(
-            "
+
+        match current {
+            ParseableVersion::Version(current_version) => {
+                // not eprintln because if it is old release then time passed with be displayed beside it
+                eprint!(
+                    "
     {} {} ",
-            "Current Version:".to_string().blue().bold(),
-            current
-        );
-
-        // check for latest release, if it cannot be fetched then print error as warn and return
-        let latest_release = match update::get_latest() {
-            Ok(latest_release) => latest_release,
-            Err(e) => {
-                log::warn!("{}", e);
-                return;
-            }
-        };
+                    "Current Version:".to_string().blue().bold(),
+                    current_version
+                );
+
+                // check for latest release, if it cannot be fetched then print error as warn and return
+                let latest_release = match update::get_latest() {
+                    Ok(latest_release) => latest_release,
+                    Err(e) => {
+                        log::warn!("{}", e);
+                        return;
+                    }
+                };
 
-        if latest_release.version > current {
-            let time_since_latest_release = chrono::Utc::now() - latest_release.date;
-            let time_since_latest_release = humanize_time(time_since_latest_release);
+                if latest_release.version > current_version {
+                    let time_since_latest_release = chrono::Utc::now() - latest_release.date;
+                    let time_since_latest_release = humanize_time(time_since_latest_release);
 
-            let fmt_latest_version = format!(
-                "( v{} released {} ago )",
-                latest_release.version, time_since_latest_release
-            );
+                    let fmt_latest_version = format!(
+                        "( v{} released {} ago )",
+                        latest_release.version, time_since_latest_release
+                    );
 
-            eprint!("{}", fmt_latest_version.yellow().bold());
-            eprintln!(
-                "
+                    eprint!("{}", fmt_latest_version.yellow().bold());
+                    eprintln!(
+                        "
     Download latest version from https://github.com/parseablehq/parseable/releases/latest"
-            );
-        } else {
-            eprintln!();
+                    );
+                } else {
+                    eprintln!();
+                }
+            }
+            ParseableVersion::Prerelease(current_prerelease) => {
+                eprint!(
+                    "
+    {} {} ",
+                    "Current Version:".to_string().blue().bold(),
+                    current_prerelease
+                );
+            }
         }
     }
 
-    pub fn current() -> Version {
-        let current = env!("VERGEN_BUILD_SEMVER");
-        semver::Version::parse(current).expect("VERGEN_BUILD_SEMVER is always valid semver")
+    pub fn current() -> ParseableVersion {
+        let build_semver = env!("VERGEN_BUILD_SEMVER");
+
+        let mut git_semver = env!("VERGEN_GIT_SEMVER");
+
+        if git_semver.chars().nth(0).unwrap() == 'v' {
+            let mut git_semver_chars = git_semver.chars();
+            git_semver_chars.next();
+            git_semver = git_semver_chars.as_str();
+        }
+
+        if build_semver == git_semver {
+            ParseableVersion::Version(
+                semver::Version::parse(build_semver)
+                    .expect("VERGEN_BUILD_SEMVER is always valid semver"),
+            )
+        } else {
+            ParseableVersion::Prerelease(
+                semver::Prerelease::new(git_semver)
+                    .expect("VERGEN_GIT_SEMVER is always valid semver"),
+            )
+        }
     }
 
     fn humanize_time(time_passed: Duration) -> String {