journal-cli 1.0.25 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e9a187c0f58c60df7d7c7a6cf7f4faabe29e5c2040f4f48f3d2628e56822e03
-  data.tar.gz: 37d3d6fc4833471f46b80ccbe5c26a549c0e8697a19bb791666b6a5101372737
+  metadata.gz: f0e13de67e2b05c78b16ff3e4c98e151c5de7b3be51079749599c804d7ea984e
+  data.tar.gz: e4112cccece8944e08e0b83dcdf598c0469282062622d15d0e98063a5ff85ee9
 SHA512:
-  metadata.gz: 62a78f5c21b9159e661a89c2e5e1bc244b4dbd8553cea02ccb1c904e969ddf6211dfaf8e8cda327b92f070ffc09ae97f7c40cf2b09e7e5a761bb3497c61091f8
-  data.tar.gz: 1fd3695119b3c5a18cb137ae85296036acca5673124507cecd25b3f2abb8e4e7c9de07d59ab1a15fc8719a688f1147b5ef628bc6862ebb0f3142699705602358
+  metadata.gz: 95667e40648e73f25146b6c321142ba1abba26cd9aeefc4b6209e8c86e1452e0b2dc27e066a0ef3af88ed8f46a9c4961a26de71428b3638193e233aecdda479c
+  data.tar.gz: 20bf7846052db8f466be5d45dde9e165d8c04a23cef87b53d304b68ce8dc7da621ac97644bda6c6944c8a99b0cec0471c8e6f4a78b4761d151c4942838d80192

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 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
+
+#### FIXED
+
+- Nil entry error on conditional questions
+
 ### 1.0.25
 
 2023-09-20 09:40

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/checkin.rb

@@ -133,7 +133,7 @@ module Journal
     end
 
     def print_answer(prompt, type, key, data)
-      return if data.nil? || !data.key?(key)
+      return if data.nil? || !data.key?(key) || data[key].nil?
 
       case type
       when /^(weather|forecast)/

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.25'
+  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.25
+  version: 1.0.27
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-which