matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge branch 'update-deps'

Browse source 
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>
This commit is contained in:
Matthias Beyer 2018-10-06 12:50:57 +02:00
commit a101e777f3
30 changed files with 48 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/core/imag-edit/Cargo.toml
View file

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

2
bin/core/imag-git/Cargo.toml
View file

@ -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"

2
bin/core/imag-grep/Cargo.toml
View file

@ -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" }

2
bin/core/imag-link/Cargo.toml
View file

@ -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" }

2
bin/core/imag-view/Cargo.toml
View file

@ -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" }

2
bin/core/imag/Cargo.toml
View file

@ -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"

4
bin/domain/imag-contact/Cargo.toml
View file

@ -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"
uuid = { version = "0.6", features = ["v4"] }
walkdir = "2"
uuid = { version = "0.7", features = ["v4"] }
serde_json = "1"
libimagrt = { version = "0.9.0", path = "../../../lib/core/libimagrt" }

4
bin/domain/imag-contact/src/create.rs
View file

@ -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)
}
};

2
bin/domain/imag-habit/Cargo.toml
View file

@ -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" }

4
bin/domain/imag-habit/src/main.rs
View file

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

2
bin/domain/imag-timetrack/Cargo.toml
View file

@ -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" }

4
bin/domain/imag-timetrack/src/list.rs
View file

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

2
bin/domain/imag-wiki/Cargo.toml
View file

@ -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" }

2
lib/core/libimagerror/Cargo.toml
View file

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

8
lib/core/libimagrt/Cargo.toml
View file

@ -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 = []

12
lib/core/libimagrt/src/logger.rs
View file

@ -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();
{

6
lib/core/libimagstore/Cargo.toml
View file

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

2
lib/domain/libimagbookmark/Cargo.toml
View file

@ -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" }

4
lib/domain/libimagcontact/Cargo.toml
View file

@ -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"

2
lib/domain/libimagcontact/src/error.rs
View file

@ -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 {

2
lib/domain/libimagmail/Cargo.toml
View file

@ -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"

4
lib/domain/libimagtodo/Cargo.toml
View file

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

2
lib/domain/libimagwiki/Cargo.toml
View file

@ -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" }

4
lib/entry/libimagentryfilter/Cargo.toml
View file

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

2
lib/entry/libimagentrytag/Cargo.toml
View file

@ -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"

2
lib/entry/libimagentryview/Cargo.toml
View file

@ -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" }

4
lib/etc/libimaginteraction/Cargo.toml
View file

@ -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"

2
lib/etc/libimagtimeui/Cargo.toml
View file

@ -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"

4
lib/etc/libimagutil/Cargo.toml
View file

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

5
lib/etc/libimagutil/src/edit.rs
View file

@ -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();