journal-cli 1.0.27 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e13de67e2b05c78b16ff3e4c98e151c5de7b3be51079749599c804d7ea984e
-  data.tar.gz: e4112cccece8944e08e0b83dcdf598c0469282062622d15d0e98063a5ff85ee9
+  metadata.gz: e8f83764338d653909b55685394ab55398913f1dfdf5a529bfe2d7e94857c586
+  data.tar.gz: c068e0799c4438f45aad8ac2e265d42324da686712a85c1709cd491ea1ca476f
 SHA512:
-  metadata.gz: 95667e40648e73f25146b6c321142ba1abba26cd9aeefc4b6209e8c86e1452e0b2dc27e066a0ef3af88ed8f46a9c4961a26de71428b3638193e233aecdda479c
-  data.tar.gz: 20bf7846052db8f466be5d45dde9e165d8c04a23cef87b53d304b68ce8dc7da621ac97644bda6c6944c8a99b0cec0471c8e6f4a78b4761d151c4942838d80192
+  metadata.gz: 8f35ef77c9762043790ee535e28a0892f78681f5895bd0db6cdb476e13524a35ccf0d80d31dff201a7307d630fc6f59729c9ba7b83698b7bbb428669cceafb96
+  data.tar.gz: 28fbd4e7ec6ac0ee506a8bed4413985a9424d6327025b571843bc0d28d17a17747808d33baa7d31d39d3e1e8b941c32a9dcf9883e5c5659af996261e7dc7f514

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.0.29
+
+2023-10-01 15:24
+
+#### IMPROVED
+
+- Config option `temp_in` can be set to `c` or `f` to control what scale temps are recorded in
+
+### 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

data/Gemfile.lock

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

data/README.md

@@ -56,6 +56,8 @@ If a question type is set to `weather.forecast`, only the predicted condition, h
 
 If the question type is `weather.current`, only the current condition and temperature will be recorded to the JSON, and a string containing "[TEMP] and [CONDITION]" (e.g. "64 and Sunny") will be recorded to Markdown/Day One for the question.
 
+If the question type is `weather.moon`, only the moon phase will be output. Moon phase is also included in `weather.forecast` JSON and Markdown output.
+
 ### Journal Configuration
 
 Edit the file at `~/.config/journal/journals.yaml` following this structure:
@@ -148,8 +150,9 @@ A question `type` can be one of:
 - `text` or `string` will request a single-line string, submitted on return
 - `multiline` for multiline strings (opens a readline editor, use ctrl-d to save)
 - `weather` will just insert current weather data with no prompt
-  * `weather.forecast` will insert just the forecast
-  * `weather.current` will insert just the current temperature and condition
+  * `weather.forecast` will insert just the forecast (using weather history for backdated entries)
+  * `weather.current` will insert just the current temperature and condition (using weather history for backdated entries)
+  * `weather.moon` will insert the current moon phase for the entry date
 - `number` or `float` will request numeric input, stored as a float (decimal)
 - `integer` will convert numeric input to the nearest integer
 - `date` will request a natural language date which will be parsed into a date object

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

@@ -41,7 +41,7 @@ module Journal
       when /^(text|string|line)/i
         read_line
       when /^(weather|forecast)/i
-        Weather.new(Journal.config['weather_api'], Journal.config['zip'])
+        Weather.new(Journal.config['weather_api'], Journal.config['zip'], Journal.config['temp_in'])
       when /^multi/i
         read_lines
       when /^(date|time)/i

data/lib/journal-cli/version.rb

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

data/lib/journal-cli/weather.rb

@@ -4,35 +4,52 @@ module Journal
   class Weather
     attr_reader :data
 
-    def initialize(api, zip)
-      res = `curl -SsL 'http://api.weatherapi.com/v1/forecast.json?key=#{api}&q=#{zip}&aqi=no'`
+    def initialize(api, zip, temp_in)
+      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']
+
+      temp_key = temp_in =~ /^c/ ? 'temp_c' : 'temp_f'
 
-      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_key]
+        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_key]
+        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']
+      high = temp_in =~ /^c/ ? forecast['day']['maxtemp_c'] : forecast['day']['maxtemp_f']
+      low = temp_in =~ /^c/ ? forecast['day']['mintemp_c'] : forecast['day']['mintemp_f']
       condition = forecast['day']['condition']['text']
 
       hours = forecast['hour']
       temps = [
-        { temp: hours[8]['temp_f'], condition: hours[8]['condition']['text'] },
-        { temp: hours[10]['temp_f'], condition: hours[10]['condition']['text'] },
-        { temp: hours[12]['temp_f'], condition: hours[12]['condition']['text'] },
-        { temp: hours[14]['temp_f'], condition: hours[14]['condition']['text'] },
-        { temp: hours[16]['temp_f'], condition: hours[16]['condition']['text'] },
-        { temp: hours[18]['temp_f'], condition: hours[18]['condition']['text'] },
-        { temp: hours[19]['temp_f'], condition: hours[20]['condition']['text'] }
+        { temp: hours[8][temp_key], condition: hours[8]['condition']['text'] },
+        { temp: hours[10][temp_key], condition: hours[10]['condition']['text'] },
+        { temp: hours[12][temp_key], condition: hours[12]['condition']['text'] },
+        { temp: hours[14][temp_key], condition: hours[14]['condition']['text'] },
+        { temp: hours[16][temp_key], condition: hours[16]['condition']['text'] },
+        { temp: hours[18][temp_key], condition: hours[18]['condition']['text'] },
+        { temp: hours[19][temp_key], condition: hours[20]['condition']['text'] }
       ]
 
       @data = {
@@ -42,18 +59,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 +93,8 @@ module Journal
       output = []
 
       output << "Forecast for #{@data[:day]}: #{forecast}  "
-      output << "Currently: #{current}"
+      output << "Currently: #{current}  "
+      output << "Moon Phase: #{moon}  "
       output << ''
 
       # Hours

data/src/_README.md

@@ -59,6 +59,8 @@ If a question type is set to `weather.forecast`, only the predicted condition, h
 
 If the question type is `weather.current`, only the current condition and temperature will be recorded to the JSON, and a string containing "[TEMP] and [CONDITION]" (e.g. "64 and Sunny") will be recorded to Markdown/Day One for the question.
 
+If the question type is `weather.moon`, only the moon phase will be output. Moon phase is also included in `weather.forecast` JSON and Markdown output.
+
 ### Journal Configuration
 
 Edit the file at `~/.config/journal/journals.yaml` following this structure:
@@ -151,8 +153,9 @@ A question `type` can be one of:
 - `text` or `string` will request a single-line string, submitted on return
 - `multiline` for multiline strings (opens a readline editor, use ctrl-d to save)
 - `weather` will just insert current weather data with no prompt
-  * `weather.forecast` will insert just the forecast
-  * `weather.current` will insert just the current temperature and condition
+  * `weather.forecast` will insert just the forecast (using weather history for backdated entries)
+  * `weather.current` will insert just the current temperature and condition (using weather history for backdated entries)
+  * `weather.moon` will insert the current moon phase for the entry date
 - `number` or `float` will request numeric input, stored as a float (decimal)
 - `integer` will convert numeric input to the nearest integer
 - `date` will request a natural language date which will be parsed into a date object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journal-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.29
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-23 00:00:00.000000000 Z
+date: 2023-10-01 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