1 files changed, 7 insertions, 45 deletions

diff --git a/src/bin/riki.rs b/src/bin/riki.rs
index 20990f5..c1f9e4b 100644
--- a/src/bin/riki.rs
+++ b/src/bin/riki.rs
@@ -1,5 +1,5 @@
 use clap::{CommandFactory, FromArgMatches, Parser};
-use git_testament::{git_testament, render_testament, GitModification};
+use git_testament::git_testament;
 use log::{debug, error, info};
 use riki::error::RikiError;
 use riki::git::{git_dirty, git_whatchanged};
@@ -8,6 +8,7 @@ use riki::pagespec;
 use riki::site::Site;
 use riki::time::parse_timestamp;
 use riki::util::{canonicalize, copy_file_from_source, get_mtime, mkdir, set_mtime};
+use riki::version::Version;
 use std::error::Error;
 use std::path::{Path, PathBuf};
 
@@ -34,13 +35,14 @@ fn real_main() -> Result<(), RikiError> {
 
     info!("riki starts");
 
-    let version = version().map_err(RikiError::Format)?;
-    let long_version = long_version().map_err(RikiError::Format)?;
+    let version = Version::new(&VERSION);
+    let short = version.version()?;
+    let long = version.long_version()?;
 
     {
         let argparser = Args::command();
-        let argparser = argparser.version(version.as_str());
-        let argparser = argparser.long_version(long_version.as_str());
+        let argparser = argparser.version(short.as_str());
+        let argparser = argparser.long_version(long.as_str());
 
         let args = argparser.get_matches();
         let args = Args::from_arg_matches(&args).unwrap();
@@ -57,46 +59,6 @@ fn real_main() -> Result<(), RikiError> {
     Ok(())
 }
 
-fn version() -> Result<String, std::fmt::Error> {
-    use std::fmt::Write as _;
-    let mut ret = String::new();
-    writeln!(ret, "{}", render_testament!(VERSION))?;
-    writeln!(
-        ret,
-        "{} {}",
-        env!("CARGO_PKG_NAME"),
-        env!("CARGO_PKG_VERSION")
-    )?;
-    Ok(ret)
-}
-
-fn long_version() -> Result<String, std::fmt::Error> {
-    use std::fmt::Write as _;
-    let mut ret = String::new();
-    writeln!(ret, "{}", render_testament!(VERSION))?;
-    writeln!(ret, "Crate version: {}", env!("CARGO_PKG_VERSION"))?;
-    if let Some(branch) = VERSION.branch_name {
-        writeln!(ret, "Built from branch: {}", branch)?;
-    } else {
-        writeln!(ret, "Branch information is missing.")?;
-    }
-    writeln!(ret, "Commit info: {}", VERSION.commit)?;
-    if VERSION.modifications.is_empty() {
-        writeln!(ret, "Working tree is clean")?;
-    } else {
-        use GitModification::*;
-        for fmod in VERSION.modifications {
-            match fmod {
-                Added(f) => writeln!(ret, "Added: {}", String::from_utf8_lossy(f))?,
-                Removed(f) => writeln!(ret, "Removed: {}", String::from_utf8_lossy(f))?,
-                Modified(f) => writeln!(ret, "Modified: {}", String::from_utf8_lossy(f))?,
-                Untracked(f) => writeln!(ret, "Untracked: {}", String::from_utf8_lossy(f))?,
-            }
-        }
-    }
-    Ok(ret)
-}
-
 /// Static site generator.
 ///
 /// Riki generates a static web site from markdown files. It mostly