journal-cli 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4984b6fe36150316fca655279b8bff861e006da77028b78327132e711798b7e3
-  data.tar.gz: 43d4b24bd3f27d92bf781496fad939037cf8258d34bd835b1d148010ad184806
+  metadata.gz: f0e13de67e2b05c78b16ff3e4c98e151c5de7b3be51079749599c804d7ea984e
+  data.tar.gz: e4112cccece8944e08e0b83dcdf598c0469282062622d15d0e98063a5ff85ee9
 SHA512:
-  metadata.gz: 8cbbd48551378617d527c661a7a022735766f4f09dee40ab903c1687d23967a69e250007d5ac2a0b0e4cb3d6209d2edcb43f18ef7fbe205a0abf2cb0c2a93c04
-  data.tar.gz: daec6aadef725293d2e4db82f69187a3230b18c31a71e8a45de28a00b47fc961f9f1020d6930cda8c374e16401cddd5fa3abcd12f8343879c645d86d476652d0
+  metadata.gz: 95667e40648e73f25146b6c321142ba1abba26cd9aeefc4b6209e8c86e1452e0b2dc27e066a0ef3af88ed8f46a9c4961a26de71428b3638193e233aecdda479c
+  data.tar.gz: 20bf7846052db8f466be5d45dde9e165d8c04a23cef87b53d304b68ce8dc7da621ac97644bda6c6944c8a99b0cec0471c8e6f4a78b4761d151c4942838d80192

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.0.27
+
+2023-09-23 08:03
+
+#### FIXED
+
+- Time comparisons for past entries failing when using a past date for entry
+
 ### 1.0.26
 
 2023-09-20 19:18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    journal-cli (1.0.25)
+    journal-cli (1.0.27)
       chronic (~> 0.10, >= 0.10.2)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-which (~> 0.5, >= 0.5.0)

data/lib/journal-cli/string.rb

@@ -10,17 +10,20 @@ class ::String
     now = Journal.date
     m = condition.match(time_rx)
     time = Chronic.parse(m['time'])
+    now.localtime
+    time.localtime
+    time_of_day = Time.parse("#{now.strftime('%Y-%m-%d')} #{time.strftime('%H:%M')}")
     Journal.notify("{br}Invalid time string in question (#{m['time']})", exit_code: 4) unless time
 
     case m['comp']
     when /^<=$/
-      now <= time
+      now <= time_of_day
     when /^(<|bef)/i
-      now < time
+      now < time_of_day
     when /^>=/
-      now >= time
+      now >= time_of_day
     when /^(>|aft)/i
-      now > time
+      now > time_of_day
     end
     # TODO: Other condition types
   end

data/lib/journal-cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Journal
-  VERSION = '1.0.26'
+  VERSION = '1.0.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journal-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-which