imag-gps: implement ImagApplication

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

bin/core/imag-gps/Cargo.toml

@@ -43,3 +43,10 @@ path = "../../../lib/etc/libimagutil"
 default-features = false
 features         = ["testing"]
 
+[lib]
+name = "libimaggpscmd"
+path = "src/lib.rs"
+
+[[bin]]
+name = "imag-gps"
+path = "src/bin.rs"

bin/core/imag-gps/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!(libimaggpscmd, ImagGps);

bin/core/imag-gps/src/lib.rs

@@ -39,7 +39,7 @@ extern crate clap;
 #[macro_use] extern crate failure;
 
 extern crate libimagentrygps;
-#[macro_use] extern crate libimagrt;
+extern crate libimagrt;
 extern crate libimagutil;
 extern crate libimagerror;
 extern crate libimagstore;
@@ -50,11 +50,13 @@ use std::str::FromStr;
 
 
 use failure::err_msg;
+use failure::Fallible as Result;
+use clap::App;
 
 use libimagstore::storeid::StoreId;
 use libimagentrygps::types::*;
 use libimagentrygps::entry::*;
-use libimagrt::setup::generate_runtime_setup;
+use libimagrt::application::ImagApplication;
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::MapErrTrace;
 use libimagerror::exit::ExitUnwrap;
@@ -62,13 +64,13 @@ use libimagerror::io::ToExitCode;
 
 mod ui;
 
-fn main() {
+/// Marker enum for implementing ImagApplication on
-    let version = make_imag_version!();
+///
-    let rt = generate_runtime_setup("imag-gps",
+/// This is used by binaries crates to execute business logic
-                                    &version,
+/// or to build a CLI completion.
-                                    "Add GPS coordinates to entries",
+pub enum ImagGps {}
-                                    ui::build_ui);
+impl ImagApplication for ImagGps {
-
+    fn run(rt: Runtime) -> Result<()> {
         if let Some(name) = rt.cli().subcommand_name() {
             match name {
                 "add"    => add(&rt),
@@ -83,6 +85,25 @@ fn main() {
                 }
             }
         }
+
+        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 {
+        "Add GPS coordinates to entries"
+    }
+
+    fn version() -> &'static str {
+        env!("CARGO_PKG_VERSION")
+    }
 }
 
 fn rt_get_ids(rt: &Runtime) -> Vec<StoreId> {