.travis.yml

@@ -7,9 +7,16 @@ dist:
 
 language: rust
 
+rust:
+  - stable
+  - beta
+  - nightly
+
 matrix:
   include:
     - rust: 1.15.0
+  allow_failures:
+    - rust: nightly
 
 cache:
   cargo: true

Cargo.toml

@@ -17,6 +17,7 @@ members = [
     "libimagbookmark",
     "libimagcounter",
     "libimagdiary",
+    "libimagentrycategory",
     "libimagentrydatetime",
     "libimagentryedit",
     "libimagentryfilter",

imag-diary/src/main.rs

@@ -40,12 +40,12 @@ extern crate chrono;
 extern crate libimagdiary;
 extern crate libimagentryedit;
 extern crate libimagentrylist;
+extern crate libimagerror;
 extern crate libimaginteraction;
 extern crate libimagrt;
 extern crate libimagstore;
-extern crate libimagutil;
 extern crate libimagtimeui;
-#[macro_use] extern crate libimagerror;
+extern crate libimagutil;
 
 use std::process::exit;
 

imag-store/src/dump.rs

@@ -0,0 +1,51 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015, 2016 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
+//
+
+use std::process::exit;
+
+use libimagrt::runtime::Runtime;
+use libimagerror::trace::*;
+
+pub fn dump(rt: &mut Runtime) {
+    let cachingres = rt
+        .store()
+        .entries()
+        .map_err_trace()
+        .map(|iter| {
+            for elem in iter {
+                debug!("Working on {:?}", elem);
+                if let Ok(_) = rt.store().get(elem.clone()).map_err_dbg_trace() {
+                    info!("Loading entry at {:?} succeeded", elem);
+                } else {
+                    error!("Loading entry at {:?} failed", elem);
+                }
+            }
+        });
+
+    if let Ok(_) = cachingres {
+        if let Err(_) = rt.store_backend_to_stdout().map_err_trace() {
+            error!("Loading Store IO backend failed");
+            exit(1);
+        }
+    } else {
+        error!("Loading entries failed");
+        exit(1);
+    }
+}
+

imag-store/src/main.rs

@@ -47,6 +47,7 @@ use libimagrt::setup::generate_runtime_setup;
 
 mod create;
 mod delete;
+mod dump;
 mod error;
 mod get;
 mod retrieve;
@@ -55,8 +56,11 @@ mod update;
 mod verify;
 mod util;
 
+use std::ops::Deref;
+
 use create::create;
 use delete::delete;
+use dump::dump;
 use get::get;
 use retrieve::retrieve;
 use ui::build_ui;
@@ -64,33 +68,30 @@ use update::update;
 use verify::verify;
 
 fn main() {
-    let rt = generate_runtime_setup("imag-store",
-                                    &version!()[..],
-                                    "Direct interface to the store. Use with great care!",
-                                    build_ui);
+    let mut rt = generate_runtime_setup("imag-store",
+                                        &version!()[..],
+                                        "Direct interface to the store. Use with great care!",
+                                        build_ui);
+
+    let command = rt.cli().subcommand_name().map(String::from);
 
-    rt.cli()
-        .subcommand_name()
-        .map_or_else(
-            || {
-                debug!("No command");
+    if let Some(command) = command {
+        debug!("Call: {}", command);
+        match command.deref() {
+            "create"   => create(&rt),
+            "delete"   => delete(&rt),
+            "get"      => get(&rt),
+            "retrieve" => retrieve(&rt),
+            "update"   => update(&rt),
+            "verify"   => verify(&rt),
+            "dump"     => dump(&mut rt),
+            _ => {
+                debug!("Unknown command");
                 // More error handling
             },
-            |name| {
-                debug!("Call: {}", name);
-                match name {
-                    "create"   => create(&rt),
-                    "delete"   => delete(&rt),
-                    "get"      => get(&rt),
-                    "retrieve" => retrieve(&rt),
-                    "update"   => update(&rt),
-                    "verify"   => verify(&rt),
-                    _ => {
-                        debug!("Unknown command");
-                        // More error handling
-                    },
-                };
-            }
-        )
+        };
+    } else {
+        debug!("No command");
+    }
 }
 

imag-store/src/ui.rs

@@ -205,4 +205,9 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
                    .about("Verify the store")
                    .version("0.1")
                    )
+
+       .subcommand(SubCommand::with_name("dump")
+                   .about("Dump the complete store to stdout. Currently does only support JSON")
+                   .version("0.1")
+                   )
 }

libimagbookmark/Cargo.toml

@@ -14,11 +14,9 @@ repository    = "https://github.com/matthiasbeyer/imag"
 homepage      = "http://imag-pim.org"
 
 [dependencies]
-log = "0.3"
 semver = "0.5"
 url = "1.2"
 regex = "0.1"
-is-match = "0.1"
 
 [dependencies.libimagstore]
 path = "../libimagstore"

libimagbookmark/src/lib.rs

@@ -31,8 +31,6 @@
     while_true,
 )]
 
-#[macro_use] extern crate log;
-#[macro_use] extern crate is_match;
 extern crate semver;
 extern crate url;
 extern crate regex;

libimagcounter/src/lib.rs

@@ -34,7 +34,7 @@
 extern crate toml;
 extern crate toml_query;
 #[macro_use] extern crate log;
-#[macro_use] extern crate semver;
+extern crate semver;
 
 #[macro_use] extern crate libimagstore;
 #[macro_use] extern crate libimagerror;