imag-mail: implement ImagApplication

Signed-off-by: Leon Schuermann <leon@is.currently.online>

bin/domain/imag-mail/Cargo.toml

@@ -41,3 +41,10 @@ version = "0.9.2"
 default-features = false
 features = ["typed"]
 
+[lib]
+name = "libimagmailfrontend"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-mail"
+path = "src/bin.rs"

bin/domain/imag-mail/src/bin.rs

@@ -0,0 +1,39 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; version
+// 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+#![forbid(unsafe_code)]
+
+#![deny(
+    non_camel_case_types,
+    non_snake_case,
+    path_statements,
+    trivial_numeric_casts,
+    unstable_features,
+    unused_allocation,
+    unused_import_braces,
+    unused_imports,
+    unused_must_use,
+    unused_mut,
+    unused_qualifications,
+    while_true,
+)]
+
+#[macro_use] extern crate libimagrt;
+
+simple_imag_application_binary!(libimagmailfrontend, ImagMail);

bin/domain/imag-mail/src/lib.rs

@@ -40,7 +40,7 @@ extern crate clap;
 extern crate toml_query;
 #[macro_use] extern crate indoc;
 
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagmail;
 extern crate libimagerror;
 extern crate libimagstore;
@@ -52,6 +52,7 @@ use std::path::PathBuf;
 
 use failure::Fallible as Result;
 use toml_query::read::TomlValueReadTypeExt;
+use clap::App;
 
 use libimagerror::trace::{MapErrTrace, trace_error};
 use libimagerror::iter::TraceIterator;
@@ -63,7 +64,7 @@ use libimagmail::util;
 use libimagentryref::reference::{Ref, RefFassade};
 use libimagentryref::util::get_ref_config;
 use libimagrt::runtime::Runtime;
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
 use libimagutil::info_result::*;
 use libimagstore::store::FileLockEntry;
 use libimagstore::storeid::StoreIdIterator;
@@ -71,32 +72,52 @@ use libimagstore::iter::get::StoreIdGetIteratorExtension;
 
 mod ui;
 
-use crate::ui::build_ui;
+/// Marker enum for implementing ImagApplication on
+///
+/// This is used by binaries crates to execute business logic
+/// or to build a CLI completion.
+pub enum ImagMail {}
+impl ImagApplication for ImagMail {
+    fn run(rt: Runtime) -> Result<()> {
 
-fn main() {
-    let version = make_imag_version!();
-    let rt = generate_runtime_setup("imag-mail",
-                                    &version,
-                                    "Mail collection tool",
-                                    build_ui);
+                    if let Some(name) = rt.cli().subcommand_name() {
 
-    if let Some(name) = rt.cli().subcommand_name() {
-        debug!("Call {}", name);
-        match name {
-            "import-mail" => import_mail(&rt),
-            "list"        => list(&rt),
-            "mail-store"  => mail_store(&rt),
-            other         => {
-                debug!("Unknown command");
-                let _ = rt.handle_unknown_subcommand("imag-mail", other, rt.cli())
-                    .map_err_trace_exit_unwrap()
-                    .code()
-                    .map(::std::process::exit);
+                debug!("Call {}", name);
+                match name {
+                    "import-mail" => import_mail(&rt),
+                    "list"        => list(&rt),
+                    "mail-store"  => mail_store(&rt),
+                    other         => {
+                        debug!("Unknown command");
+                        let _ = rt.handle_unknown_subcommand("imag-mail", other, rt.cli())
+                            .map_err_trace_exit_unwrap()
+                            .code()
+                            .map(::std::process::exit);
+                    }
+                }
             }
-        }
+
+        Ok(())
+    }
+
+    fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
+        ui::build_ui(app)
+    }
+
+    fn name() -> &'static str {
+        env!("CARGO_PKG_NAME")
+    }
+
+    fn description() -> &'static str {
+        "Mail collection tool"
+    }
+
+    fn version() -> &'static str {
+        env!("CARGO_PKG_VERSION")
     }
 }
 
+
 fn import_mail(rt: &Runtime) {
     let collection_name = get_ref_collection_name(rt).map_err_trace_exit_unwrap();
     let refconfig       = get_ref_config(rt, "imag-mail").map_err_trace_exit_unwrap();