From afcccb78c13e899f7c87b1dbdbc06bb34409e247 Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Wed, 17 Sep 2014 08:35:39 -0700 Subject: [PATCH 1/5] Fix docs typo --- docs/encryption.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/encryption.rst b/docs/encryption.rst index 37d341a8..e4a10368 100644 --- a/docs/encryption.rst +++ b/docs/encryption.rst @@ -30,7 +30,7 @@ A note on security While jrnl follows best practises, true security is an illusion. Specifically, jrnl will leave traces in your memory and your shell history -- it's meant to keep journals secure in transit, for example when storing it on an `untrusted `_ services such as Dropbox. If you're concerned about security, disable history logging for journal in your ``.bashrc`` :: - HISTINGNORE="jrnl *" + HISTIGNORE="jrnl *" Manual decryption ----------------- From c81f0e0c1dd9f40fe1f286d77a3aba0565713993 Mon Sep 17 00:00:00 2001 From: Pablo Carranza Date: Mon, 22 Sep 2014 07:42:00 -0400 Subject: [PATCH 2/5] Added how to ignore history appending for zsh --- docs/encryption.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/encryption.rst b/docs/encryption.rst index e4a10368..8ca1faba 100644 --- a/docs/encryption.rst +++ b/docs/encryption.rst @@ -32,6 +32,11 @@ While jrnl follows best practises, true security is an illusion. Specifically, j HISTIGNORE="jrnl *" +If you are using zsh instead of bash, you can get the same behaviour adding this to your ``zshrc`` :: + + setopt HIST_IGNORE_SPACE + alias jrnl=" jrnl" + Manual decryption ----------------- From e9f691e3997fde872435a101f348990013c82b9c Mon Sep 17 00:00:00 2001 From: Pablo Carranza Date: Thu, 25 Sep 2014 10:04:17 -0400 Subject: [PATCH 3/5] Fixed -on today option parsing --- jrnl/time.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jrnl/time.py b/jrnl/time.py index 531293de..378d4c92 100644 --- a/jrnl/time.py +++ b/jrnl/time.py @@ -48,7 +48,10 @@ def parse(date_str, inclusive=False, default_hour=None, default_minute=None): return None if flag is 1: # Date found, but no time. Use the default time. - date = datetime(*date[:3], hour=default_hour or 0, minute=default_minute or 0) + date = datetime(*date[:3], + hour=23 if inclusive else default_hour or 0, + minute=59 if inclusive else default_minute or 0, + second=59 if inclusive else 0) else: date = datetime(*date[:6]) From c8e5d1ff3415aaeee9a09b3ef9258cfb38f5c03b Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Tue, 30 Sep 2014 10:16:50 -0700 Subject: [PATCH 4/5] util fixes --- jrnl/util.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jrnl/util.py b/jrnl/util.py index b06113c2..946fdb90 100644 --- a/jrnl/util.py +++ b/jrnl/util.py @@ -71,15 +71,18 @@ def py2encode(s): def prompt(msg): """Prints a message to the std err stream defined in util.""" + if not msg: + return if not msg.endswith("\n"): msg += "\n" STDERR.write(u(msg)) def py23_input(msg=""): - STDERR.write(u(msg)) + prompt(msg) return STDIN.readline().strip() def py23_read(msg=""): + prompt(msg) return STDIN.read() def yesno(prompt, default=True): @@ -93,7 +96,7 @@ def load_and_fix_json(json_path): """ with open(json_path) as f: json_str = f.read() - config = fixed = None + config = None try: return json.loads(json_str) except ValueError as e: From 17b439eba49ea155b3aff27b8ce205f87c19259b Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Tue, 30 Sep 2014 10:17:07 -0700 Subject: [PATCH 5/5] version bump --- CHANGELOG.md | 1 + jrnl/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 402ca773..d513a596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changelog ### 1.9 (July 21, 2014) +* __1.9.6__ Fuzzy time parsing improvements (thanks to @pcarranza) * __1.9.5__ Multi-word tags for DayOne Journals * __1.9.4__ Fixed: Order of journal entries in file correct after --edit'ing * __1.9.3__ Fixed: Tags at the beginning of lines diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 030a9d4b..062ca255 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -8,7 +8,7 @@ jrnl is a simple journal application for your command line. from __future__ import absolute_import __title__ = 'jrnl' -__version__ = '1.9.5' +__version__ = '1.9.6' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'