journal-cli 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125cde5de56092483eb664d0b34ee250fdd8d0f47681f2bcd9e47866b9493cf1
-  data.tar.gz: 99eb86fa5648dbca59ca0337e30324e6fbbab01ff4daeeca5e4421647e273fc6
+  metadata.gz: e8f83764338d653909b55685394ab55398913f1dfdf5a529bfe2d7e94857c586
+  data.tar.gz: c068e0799c4438f45aad8ac2e265d42324da686712a85c1709cd491ea1ca476f
 SHA512:
-  metadata.gz: c61d83d83236c28af72ada995ed0a06d579f9e1d7b8c9c6d6a694ffc6dadcf19c64f1eabd4ac3073adee75224ff4020980d5b9c1064801297dd6183673858b74
-  data.tar.gz: 816870f6d23c9648c699c8cdc02c802182486044798a3c1ad36981ccfee4c18d266ca29571ab625679bb1d3f737fc8f17d163f84a5e15c1d3142267192367e79
+  metadata.gz: 8f35ef77c9762043790ee535e28a0892f78681f5895bd0db6cdb476e13524a35ccf0d80d31dff201a7307d630fc6f59729c9ba7b83698b7bbb428669cceafb96
+  data.tar.gz: 28fbd4e7ec6ac0ee506a8bed4413985a9424d6327025b571843bc0d28d17a17747808d33baa7d31d39d3e1e8b941c32a9dcf9883e5c5659af996261e7dc7f514

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    journal-cli (1.0.28)
+    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/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.28'
+  VERSION = '1.0.29'
 end

data/lib/journal-cli/weather.rb

@@ -4,7 +4,7 @@ module Journal
   class Weather
     attr_reader :data
 
-    def initialize(api, zip)
+    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'`
@@ -18,15 +18,17 @@ module Journal
 
       raise StandardError, 'mising forecast' unless data['forecast']
 
+      temp_key = temp_in =~ /^c/ ? 'temp_c' : 'temp_f'
+
       if Journal.date.strftime('%Y-%m-%d') == Time.now.strftime('%Y-%m-%d')
         raise StandardError, 'missing conditions' unless data['current']
 
-        curr_temp = data['current']['temp_f']
+        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_f']
+        curr_temp = hour[temp_key]
         curr_condition = hour['condition']['text']
       end
 
@@ -35,19 +37,19 @@ module Journal
       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 = {

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.28
+  version: 1.0.29
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-which