journal-cli 1.0.26 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4984b6fe36150316fca655279b8bff861e006da77028b78327132e711798b7e3
-  data.tar.gz: 43d4b24bd3f27d92bf781496fad939037cf8258d34bd835b1d148010ad184806
+  metadata.gz: 125cde5de56092483eb664d0b34ee250fdd8d0f47681f2bcd9e47866b9493cf1
+  data.tar.gz: 99eb86fa5648dbca59ca0337e30324e6fbbab01ff4daeeca5e4421647e273fc6
 SHA512:
-  metadata.gz: 8cbbd48551378617d527c661a7a022735766f4f09dee40ab903c1687d23967a69e250007d5ac2a0b0e4cb3d6209d2edcb43f18ef7fbe205a0abf2cb0c2a93c04
-  data.tar.gz: daec6aadef725293d2e4db82f69187a3230b18c31a71e8a45de28a00b47fc961f9f1020d6930cda8c374e16401cddd5fa3abcd12f8343879c645d86d476652d0
+  metadata.gz: c61d83d83236c28af72ada995ed0a06d579f9e1d7b8c9c6d6a694ffc6dadcf19c64f1eabd4ac3073adee75224ff4020980d5b9c1064801297dd6183673858b74
+  data.tar.gz: 816870f6d23c9648c699c8cdc02c802182486044798a3c1ad36981ccfee4c18d266ca29571ab625679bb1d3f737fc8f17d163f84a5e15c1d3142267192367e79

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.0.28
+
+2023-09-30 11:01
+
+#### IMPROVED
+
+- If creating an entry for a past date, get the historical weather for that date
+- Add weather.moon type for getting moon phase, and include moon_phase in general weather data
+
+### 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.28)
       chronic (~> 0.10, >= 0.10.2)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-which (~> 0.5, >= 0.5.0)

data/lib/journal-cli/array.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ::Array
+  def shortest
+    inject { |memo, word| memo.length < word.length ? memo : word }
+  end
+
+  def longest
+    inject { |memo, word| memo.length > word.length ? memo : word }
+  end
+end

data/lib/journal-cli/checkin.rb

@@ -136,11 +136,13 @@ module Journal
       return if data.nil? || !data.key?(key) || data[key].nil?
 
       case type
-      when /^(weather|forecast)/
+      when /^(weather|forecast|moon)/
         header prompt
         @output << case type
                    when /current$/
                      data[key].current
+                   when /moon$/
+                     "Moon phase: #{data[key].moon}"
                    else
                      data[key].to_markdown
                    end
@@ -174,6 +176,8 @@ module Journal
                       v.current
                     when /forecast$/
                       data[k] = v.forecast
+                    when /moon(_?phase)?$/
+                      data[k] = v.moon
                     else
                       data[k] = v.to_s
                     end
@@ -258,17 +262,23 @@ module Journal
             v.each do |key, value|
               result = case value.class.to_s
                        when /Weather/
-                         if key =~ /current$/
-                           {
-                             'temp' => value.data[:temp],
-                             'condition' => value.data[:current_condition]
-                           }
-                         else
-                           {
-                             'high' => value.data[:high],
-                             'low' => value.data[:low],
-                             'condition' => value.data[:condition]
-                           }
+                        case key
+                        when /current$/
+                          {
+                            'temp' => value.data[:temp],
+                            'condition' => value.data[:current_condition]
+                          }
+                        when /moon(_?phase)?$/
+                          {
+                            'phase' => value.data[:moon_phase]
+                          }
+                        else
+                          {
+                            'high' => value.data[:high],
+                            'low' => value.data[:low],
+                            'condition' => value.data[:condition],
+                            'moon_phase' => value.data[:moon_phase]
+                          }
                          end
                        else
                          value

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.28'
 end

data/lib/journal-cli/weather.rb

@@ -5,20 +5,35 @@ module Journal
     attr_reader :data
 
     def initialize(api, zip)
-      res = `curl -SsL 'http://api.weatherapi.com/v1/forecast.json?key=#{api}&q=#{zip}&aqi=no'`
+      Journal.date.localtime
+      if Journal.date.strftime('%Y-%m-%d') == Time.now.strftime('%Y-%m-%d')
+        res = `curl -SsL 'http://api.weatherapi.com/v1/forecast.json?key=#{api}&q=#{zip}&aqi=no'`
+      else
+        res = `curl -SsL 'http://api.weatherapi.com/v1/history.json?key=#{api}&q=#{zip}&aqi=no&dt=#{Journal.date.strftime('%Y-%m-%d')}'`
+      end
+
       data = JSON.parse(res)
 
       raise StandardError, 'invalid JSON response' if data.nil?
 
-      raise StandardError, 'missing conditions' unless data['current']
+      raise StandardError, 'mising forecast' unless data['forecast']
 
-      curr_temp = data['current']['temp_f']
-      curr_condition = data['current']['condition']['text']
+      if Journal.date.strftime('%Y-%m-%d') == Time.now.strftime('%Y-%m-%d')
+        raise StandardError, 'missing conditions' unless data['current']
 
-      raise StandardError, 'mising forecast' unless data['forecast']
+        curr_temp = data['current']['temp_f']
+        curr_condition = data['current']['condition']['text']
+      else
+        time = Journal.date.strftime('%Y-%m-%d %H:00')
+        hour = data['forecast']['forecastday'][0]['hour'].filter { |h| h['time'].to_s =~ /#{time}/ }.first
+        curr_temp = hour['temp_f']
+        curr_condition = hour['condition']['text']
+      end
 
       forecast = data['forecast']['forecastday'][0]
 
+      moon_phase = forecast['astro']['moon_phase']
+
       day = forecast['date']
       high = forecast['day']['maxtemp_f']
       low = forecast['day']['mintemp_f']
@@ -42,18 +57,24 @@ module Journal
         temp: curr_temp,
         condition: condition,
         current_condition: curr_condition,
-        temps: temps
+        temps: temps,
+        moon_phase: moon_phase
       }
     end
 
     def to_data
       {
-        high: high,
-        low: low,
-        condition: curr_condition
+        high: @data[:high],
+        low: @data[:low],
+        condition: @data[:current_condition],
+        moon_phase: @data[:moon_phase]
       }
     end
 
+    def moon
+      @data[:moon_phase]
+    end
+
     def current
       "#{@data[:temp]} and #{@data[:current_condition]}"
     end
@@ -70,7 +91,8 @@ module Journal
       output = []
 
       output << "Forecast for #{@data[:day]}: #{forecast}  "
-      output << "Currently: #{current}"
+      output << "Currently: #{current}  "
+      output << "Moon Phase: #{moon}  "
       output << ''
 
       # Hours

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journal-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.28
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-which
@@ -232,6 +232,7 @@ files:
 - bin/journal
 - journal-cli.gemspec
 - lib/journal-cli.rb
+- lib/journal-cli/array.rb
 - lib/journal-cli/checkin.rb
 - lib/journal-cli/color.rb
 - lib/journal-cli/data.rb