imag-habit: implement ImagApplication

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

bin/domain/imag-habit/Cargo.toml

@@ -42,3 +42,10 @@ version = "2.33.0"
 default-features = false
 features = ["color", "suggestions", "wrap_help"]
 
+[lib]
+name = "libimaghabitfrontend"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-habit"
+path = "src/bin.rs"

bin/domain/imag-habit/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!(libimaghabitfrontend, ImagHabit);

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

@@ -45,7 +45,7 @@ extern crate prettytable;
 
 extern crate libimaghabit;
 extern crate libimagstore;
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagerror;
 extern crate libimagutil;
 extern crate libimaginteraction;
@@ -57,9 +57,11 @@ use prettytable::Table;
 use prettytable::Cell;
 use prettytable::Row;
 use failure::Error;
+use failure::Fallible as Result;
+use clap::App;
 
 use libimagrt::runtime::Runtime;
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
 use libimagerror::trace::{MapErrTrace, trace_error};
 use libimagerror::iter::TraceIterator;
 use libimagerror::exit::ExitUnwrap;
@@ -75,37 +77,55 @@ use libimagutil::debug_result::DebugResult;
 
 mod ui;
 
-fn main() {
+/// Marker enum for implementing ImagApplication on
-    let version = make_imag_version!();
+///
-    let rt = generate_runtime_setup("imag-habit",
+/// This is used by binaries crates to execute business logic
-                                    &version,
+/// or to build a CLI completion.
-                                    "Habit tracking tool",
+pub enum ImagHabit {}
-                                    ui::build_ui);
+impl ImagApplication for ImagHabit {
+    fn run(rt: Runtime) -> Result<()> {
+        rt
+            .cli()
+            .subcommand_name()
+            .map(|name| {
+                debug!("Call {}", name);
+                match name {
+                    "create" => create(&rt),
+                    "delete" => delete(&rt),
+                    "list"   => list(&rt),
+                    "today"  => today(&rt, false),
+                    "status" => today(&rt, true),
+                    "show"   => show(&rt),
+                    "done"   => done(&rt),
+                    other    => {
+                        debug!("Unknown command");
+                        let _ = rt.handle_unknown_subcommand("imag-habit", other, rt.cli())
+                            .map_err_trace_exit_unwrap()
+                            .code()
+                            .map(::std::process::exit);
+                    },
+                }
+            })
+            .unwrap_or_else(|| today(&rt, true));
 
+        Ok(())
+    }
 
-    rt
+    fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
-        .cli()
+        ui::build_ui(app)
-        .subcommand_name()
+    }
-        .map(|name| {
+
-            debug!("Call {}", name);
+    fn name() -> &'static str {
-            match name {
+        env!("CARGO_PKG_NAME")
-                "create" => create(&rt),
+    }
-                "delete" => delete(&rt),
+
-                "list"   => list(&rt),
+    fn description() -> &'static str {
-                "today"  => today(&rt, false),
+        "Habit tracking tool"
-                "status" => today(&rt, true),
+    }
-                "show"   => show(&rt),
+
-                "done"   => done(&rt),
+    fn version() -> &'static str {
-                other    => {
+        env!("CARGO_PKG_VERSION")
-                    debug!("Unknown command");
+    }
-                    let _ = rt.handle_unknown_subcommand("imag-habit", other, rt.cli())
-                        .map_err_trace_exit_unwrap()
-                        .code()
-                        .map(::std::process::exit);
-                },
-            }
-        })
-        .unwrap_or_else(|| today(&rt, true));
 }
 
 fn create(rt: &Runtime) {