Merge branch 'update-deps'

Finally some updates for the dependencies. We had a "dependency update
branch" already some weeks ago, but this branch has even more updates.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

bin/core/imag-edit/Cargo.toml

@@ -22,8 +22,8 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-log          =  "0.3"
+log          =  "0.4"
-version      =  "2.0.1"
+version      =  "3"
 toml         =  "0.4"
 toml-query   =  "0.7"
 

bin/core/imag-git/Cargo.toml

@@ -22,7 +22,7 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-log        = "0.3"
+log        = "0.4"
 toml       = "0.4"
 toml-query = "0.7"
 

bin/core/imag-grep/Cargo.toml

@@ -23,7 +23,7 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 log  = "0.4"
-regex = "0.2"
+regex = "1"
 
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
 libimagrt        = { version = "0.9.0", path = "../../../lib/core/libimagrt" }

bin/core/imag-link/Cargo.toml

@@ -26,7 +26,7 @@ log = "0.4.0"
 url = "1.5"
 toml = "0.4"
 toml-query = "0.7"
-prettytable-rs = "0.6"
+prettytable-rs = "0.8"
 
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
 libimagrt        = { version = "0.9.0", path = "../../../lib/core/libimagrt" }

bin/core/imag-view/Cargo.toml

@@ -26,7 +26,7 @@ log = "0.4.0"
 toml = "0.4"
 toml-query = "0.7"
 handlebars = "1.0"
-tempfile = "2.1"
+tempfile = "3"
 
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
 libimagrt        = { version = "0.9.0", path = "../../../lib/core/libimagrt" }

bin/core/imag/Cargo.toml

@@ -28,7 +28,7 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-walkdir = "1"
+walkdir = "2"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.7"

bin/domain/imag-contact/Cargo.toml

@@ -27,8 +27,8 @@ toml = "0.4"
 toml-query = "0.7"
 vobject    = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" }
 handlebars = "1.0"
-walkdir = "1"
+walkdir = "2"
-uuid = { version = "0.6", features = ["v4"] }
+uuid = { version = "0.7", features = ["v4"] }
 serde_json = "1"
 
 libimagrt          = { version = "0.9.0", path = "../../../lib/core/libimagrt" }

bin/domain/imag-contact/src/create.rs

@@ -93,7 +93,7 @@ pub fn create(rt: &Runtime) {
                 error!("File does exist, cannot create/override");
                 exit(1);
             } else if fl.is_dir() {
-                let uuid = Uuid::new_v4().hyphenated().to_string();
+                let uuid = Uuid::new_v4().to_hyphenated().to_string();
                 fl.push(uuid.clone());
                 fl.set_extension("vcf");
                 info!("Creating file: {:?}", fl);
@@ -144,7 +144,7 @@ pub fn create(rt: &Runtime) {
             (Box::new(file), Some(fl), uuid_string)
         } else {
             // We generate a random uuid for stdout
-            let uuid = Uuid::new_v4().hyphenated().to_string();
+            let uuid = Uuid::new_v4().to_hyphenated().to_string();
             (Box::new(rt.stdout()), None, uuid)
         }
     };

bin/domain/imag-habit/Cargo.toml

@@ -27,7 +27,7 @@ log = "0.4"
 toml = "0.4"
 toml-query = "0.7"
 kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" }
-prettytable-rs = "0.6"
+prettytable-rs = "0.8"
 
 libimagerror       = { version = "0.9.0", path = "../../../lib/core/libimagerror" }
 libimagstore       = { version = "0.9.0", path = "../../../lib/core/libimagstore" }

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

@@ -51,8 +51,8 @@ use std::io::Write;
 use std::process::exit;
 
 use prettytable::Table;
-use prettytable::cell::Cell;
+use prettytable::Cell;
-use prettytable::row::Row;
+use prettytable::Row;
 
 use libimagrt::runtime::Runtime;
 use libimagrt::setup::generate_runtime_setup;

bin/domain/imag-timetrack/Cargo.toml

@@ -26,7 +26,7 @@ log = "0.4.0"
 chrono = "0.4"
 filters = "0.3"
 itertools = "0.7"
-prettytable-rs = "0.6"
+prettytable-rs = "0.8"
 kairos = { git = "https://github.com/matthiasbeyer/kairos", branch = "master" }
 
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }

bin/domain/imag-timetrack/src/list.rs

@@ -20,8 +20,8 @@
 use chrono::NaiveDateTime;
 use filters::filter::Filter;
 use prettytable::Table;
-use prettytable::row::Row;
+use prettytable::Row;
-use prettytable::cell::Cell;
+use prettytable::Cell;
 use kairos::parser::Parsed;
 use kairos::parser::parse as kairos_parse;
 use clap::ArgMatches;

bin/domain/imag-wiki/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.4"
 toml = "0.4"
 toml-query = "0.7"
 is-match = "0.1"
-regex = "0.2"
+regex = "1"
 filters = "0.3"
 
 libimagentryedit     = { version = "0.9.0", path = "../../../lib/entry/libimagentryedit" }

lib/core/libimagerror/Cargo.toml

@@ -21,5 +21,5 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 log         = "0.4"
-ansi_term   = "0.10"
+ansi_term   = "0.11"
 error-chain = "0.12"

lib/core/libimagrt/Cargo.toml

@@ -24,11 +24,10 @@ env_logger = "0.5"
 toml = "0.4"
 xdg-basedir = "1.0"
 itertools = "0.7"
-ansi_term = "0.10"
+ansi_term = "0.11"
 is-match = "0.1"
 toml-query = "0.7"
 error-chain = "0.12"
-handlebars = "1.0"
 atty = "0.2"
 
 libimagstore       = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
@@ -46,6 +45,11 @@ version = "0.4"
 default-features = false
 features = ["std"]
 
+[dependencies.handlebars]
+version          = "^1.0.5"
+default-features = false
+features         = ["no_logging"]
+
 [features]
 default = []
 

lib/core/libimagrt/src/logger.rs

@@ -131,18 +131,6 @@ impl Log for ImagLogger {
     }
 
     fn log(&self, record: &Record) {
-        if record.module_path().map(|m| m.starts_with("handlebars")).unwrap_or(false) {
-            // This is a ugly, yet necessary hack. When logging, we use handlebars for templating.
-            // But as the handlebars library itselfs logs via a normal logging macro ("debug!()"),
-            // we have a recursion in our chain.
-            //
-            // To prevent this recursion, we return here.
-            //
-            // (As of handlebars 0.29.0 - please check whether you can update handlebars if you see
-            // this. Hopefully the next version has a compiletime flag to disable logging)
-            return;
-        }
-
         let mut data = BTreeMap::new();
 
         {

lib/core/libimagstore/Cargo.toml

@@ -22,10 +22,10 @@ maintenance                       = { status     = "actively-developed" }
 [dependencies]
 glob = "0.2.11"
 log = "0.4.0"
-regex = "0.2"
+regex = "1"
-semver = "0.8"
+semver = "0.9"
 toml = "0.4"
-walkdir = "1"
+walkdir = "2"
 is-match = "0.1"
 serde = "1"
 serde_json = "1"

lib/domain/libimagbookmark/Cargo.toml

@@ -21,7 +21,7 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 url = "1.5"
-regex = "0.2"
+regex = "1"
 error-chain = "0.12"
 
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }

lib/domain/libimagcontact/Cargo.toml

@@ -21,11 +21,11 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 error-chain  = "0.12"
-log          = "0.3"
+log          = "0.4"
 toml         = "0.4"
 toml-query   = "0.7"
 vobject      = { git = "https://github.com/matthiasbeyer/rust-vobject", branch = "update-errorchain" }
-uuid         = "0.6"
+uuid         = "0.7"
 serde        = "1"
 serde_derive = "1"
 

lib/domain/libimagcontact/src/error.rs

@@ -35,7 +35,7 @@ error_chain! {
         TomlDe(::toml::de::Error);
         TomlSer(::toml::ser::Error);
         TomlQueryError(::toml_query::error::Error);
-        UuidError(::uuid::ParseError);
+        UuidError(::uuid::parser::ParseError);
     }
 
     errors {

lib/domain/libimagmail/Cargo.toml

@@ -21,7 +21,7 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 log = "0.4.0"
-email = "0.0.17"
+email = "0.0.20"
 filters = "0.3"
 error-chain = "0.12"
 

lib/domain/libimagtodo/Cargo.toml

@@ -20,8 +20,8 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-task-hookrs = "0.5"
+task-hookrs = { git = "https://github.com/matthiasbeyer/task-hookrs", branch = "master" }
-uuid = "0.6"
+uuid = "0.7"
 toml = "0.4"
 toml-query = "0.7"
 log = "0.4.0"

lib/domain/libimagwiki/Cargo.toml

@@ -24,7 +24,7 @@ log         = "0.4"
 error-chain = "0.12"
 toml        = "0.4"
 toml-query  = "0.7"
-filters     = "0.2"
+filters     = "0.3"
 
 libimagstore         = { version = "0.9.0", path = "../../../lib/core/libimagstore" }
 libimagerror         = { version = "0.9.0", path = "../../../lib/core/libimagerror" }

lib/entry/libimagentryfilter/Cargo.toml

@@ -23,8 +23,8 @@ maintenance                       = { status     = "actively-developed" }
 filters = "0.3"
 itertools = "0.7"
 log = "0.4.0"
-regex = "0.2"
+regex = "1"
-semver = "0.8"
+semver = "0.9"
 toml = "0.4"
 toml-query = "0.7"
 error-chain = "0.12"

lib/entry/libimagentrytag/Cargo.toml

@@ -21,7 +21,7 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 log = "0.4.0"
-regex = "0.2"
+regex = "1"
 toml = "0.4"
 itertools = "0.7"
 is-match = "0.1"

lib/entry/libimagentryview/Cargo.toml

@@ -23,7 +23,7 @@ maintenance                       = { status     = "actively-developed" }
 log = "0.4.0"
 toml = "0.4"
 error-chain = "0.12"
-textwrap = "0.9"
+textwrap = "0.10"
 
 libimagrt        = { version = "0.9.0", path = "../../../lib/core/libimagrt" }
 libimagstore     = { version = "0.9.0", path = "../../../lib/core/libimagstore" }

lib/etc/libimaginteraction/Cargo.toml

@@ -20,11 +20,11 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-ansi_term = "0.10"
+ansi_term = "0.11"
 interactor = "0.1"
 lazy_static = "1"
 log = "0.4.0"
-regex = "0.2"
+regex = "1"
 toml = "0.4"
 error-chain = "0.12"
 handlebars = "1.0"

lib/etc/libimagtimeui/Cargo.toml

@@ -23,7 +23,7 @@ maintenance                       = { status     = "actively-developed" }
 lazy_static = "1"
 log = "0.4.0"
 chrono = "0.4"
-regex = "0.2"
+regex = "1"
 
 [dependencies.clap]
 version = "^2.29"

lib/etc/libimagutil/Cargo.toml

@@ -30,7 +30,7 @@ url = "1.5"
 boolinator = "2.4.0"
 lazy_static = "1"
 log = "0.4.0"
-regex = "0.2"
+regex = "1"
-tempfile = "2.1"
+tempfile = "3"
 chrono = "0.4"
 

lib/etc/libimagutil/src/edit.rs

@@ -31,7 +31,7 @@ pub fn edit_in_tmpfile_with_command(mut cmd: Command, s: &mut String) -> Result<
     let file_path = file.path();
 
     file.write_all(&s.clone().into_bytes()[..])?;
-    file.sync_data()?;
+    file.as_file().sync_data()?;
 
     debug!("Calling {:?} for {}", cmd, file_path.display());
 
@@ -39,7 +39,8 @@ pub fn edit_in_tmpfile_with_command(mut cmd: Command, s: &mut String) -> Result<
         .status()
         .and_then(|status| {
             if status.success() {
-                file.sync_data()
+                file.as_file()
+                    .sync_data()
                     .and_then(|_| file.seek(SeekFrom::Start(0)))
                     .and_then(|_| {
                         let mut new_s = String::new();