journal-cli 1.0.34 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a2bf23b86563b74a924d299a9abcced78ee4ea461dbbd537e49682ccbe0d75
-  data.tar.gz: 9790b487cce722f84c8b8e052d3cc558a84684ea37df3b33091b80f871b5a9b6
+  metadata.gz: 1db983c29a889c30481070cdc131691b66b787ef29a8095499af105f5e4997a4
+  data.tar.gz: a44873884efad1c464a98789fd9ea067eeb16be407829b23585f8122d410c8aa
 SHA512:
-  metadata.gz: e8f3ae5b2feec8f3083fdbe9842b8ca0dcb0790419b12b748157e36919125f0533108cc23abd5ae9cf7f1eaed1ca960c332a3f8acaa6c46262daf9bf1bd534f4
-  data.tar.gz: 8bec17925e1c96320d31d6f71085d8e17996323c5d923fd3b71372096d28bbfda997b3699f909776f5c58729aa927741cb1e5ab2308e5a576a84b952b527605b
+  metadata.gz: fd42f6389075da4f2d2376ace587885a50359e00e025e26bcb5987e55c690aa75bd340c4e7c811b102d52ce0d176f4d8a84c3f850fdc4a7578acd5816f650164
+  data.tar.gz: a8656911b379f17fe0b738f04b5e40971ba3a504b2964eeee406abb353359537b57ee04bd4e63488907037612a09b61781c4986b2d539b6763dbe45b072b23d6

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 1.0.36
+
+2024-07-03 11:31
+
+#### FIXED
+
+- Give Day One time to launch and update db when adding entry
+
+### 1.0.35
+
+2024-06-22 11:45
+
+#### IMPROVED
+
+- Display answers to prompt when filling out entry
+- Launch Day One before trying to add entry. Day One's database frequently gets updated and the command line tool will throw an error if Day One hasn't been launched. So launch it hidden in the background, and then quit if it wasn't running to begin with. This will cause the database to update.
+- Method documentation
+
 ### 1.0.34
 
 2024-06-22 11:01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    journal-cli (1.0.34)
+    journal-cli (1.0.36)
       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

@@ -1,10 +1,23 @@
 # frozen_string_literal: true
 
+##
+## Array helpers
+##
 class ::Array
+  ##
+  ## Find the shortest element in an array of strings
+  ##
+  ## @return     [String] shortest element
+  ##
   def shortest
     inject { |memo, word| (memo.length < word.length) ? memo : word }
   end
 
+  ##
+  ## Find the longest element in an array of strings
+  ##
+  ## @return     [String] longest element
+  ##
   def longest
     inject { |memo, word| (memo.length > word.length) ? memo : word }
   end

data/lib/journal-cli/checkin.rb

@@ -3,6 +3,11 @@ module Journal
   class Checkin
     attr_reader :key, :date, :data, :config, :journal, :sections, :title, :output
 
+    ##
+    ## Initialize a new checkin using a configured journal
+    ##
+    ## @param      journal  [Journal] The journal
+    ##
     def initialize(journal)
       @key = journal
       @output = []
@@ -19,26 +24,51 @@ module Journal
       @title = @journal["title"].sub(/%M/, meridian)
     end
 
+    ##
+    ## Add a title (Markdown) to the output
+    ##
+    ## @param      string  [String] The string
+    ##
     def add_title(string)
       @output << "\n## #{string}\n" unless string.nil?
     end
 
+    ##
+    ## Add a question header (Markdown) to the output
+    ##
+    ## @param      string  [String] The string
+    ##
     def header(string)
       @output << "\n##### #{string}\n" unless string.nil?
     end
 
+    ##
+    ## Add a section header (Markdown) to the output
+    ##
+    ## @param      string  [String] The string
+    ##
     def section(string)
       @output << "\n###### #{string}\n" unless string.nil?
     end
 
+    ##
+    ## Add a newline to the output
+    ##
     def newline
       @output << "\n"
     end
 
+    ##
+    ## Add a horizontal rule (Markdown) to the output
+    ##
     def hr
       @output << "\n* * * * * *\n"
     end
 
+    ##
+    ## Finalize the checkin, saving data to JSON, Day One,
+    ## and Markdown as configured
+    ##
     def go
       @sections.each { |key, section| @data[key] = section }
 
@@ -57,11 +87,30 @@ module Journal
       end
     end
 
+    ##
+    ## Launch Day One and quit if it wasn't running
+    ##
+    def launch_day_one
+      # Launch Day One to ensure database is up-to-date
+      # test if Day One is open
+      @running = !`ps ax | grep "/MacOS/Day One" | grep -v grep`.strip.empty?
+      # -g do not bring app to foreground
+      # -j launch hidden
+      `/usr/bin/open -gj -a "Day One"`
+      sleep 3
+    end
+
+    ##
+    ## Save journal entry to Day One using the command line tool
+    ##
     def save_day_one_entry
       unless TTY::Which.exist?("dayone2")
         Journal.notify("{br}Day One CLI not installed, no Day One entry created")
         return
       end
+
+      launch_day_one
+
       @date.localtime
       cmd = ["dayone2"]
       cmd << %(-j "#{@journal["journal"]}") if @journal.key?("journal")
@@ -69,8 +118,14 @@ module Journal
       cmd << %(-date "#{@date.strftime("%Y-%m-%d %I:%M %p")}")
       `echo #{Shellwords.escape(to_markdown(yaml: false, title: true))} | #{cmd.join(" ")} -- new`
       Journal.notify("{bg}Entered one entry into Day One")
+
+      # quit if it wasn't running
+      `osascript -e 'tell app "Day One" to quit'` if !@running
     end
 
+    ##
+    ## Save entry to an existing Markdown file
+    ##
     def save_single_markdown
       dir = if @journal.key?("entries_folder")
         File.join(File.expand_path(@journal["entries_folder"]), "entries")
@@ -93,6 +148,9 @@ module Journal
       Journal.notify "{bg}Added new entry to {bw}#{target}"
     end
 
+    ##
+    ## Save journal entry to daily Markdown file
+    ##
     def save_daily_markdown
       dir = if @journal.key?("entries_folder")
         File.join(File.expand_path(@journal["entries_folder"]), "entries")
@@ -114,6 +172,9 @@ module Journal
       Journal.notify "{bg}Saved daily Markdown to {bw}#{target}"
     end
 
+    ##
+    ## Save journal entry to an new individual Markdown file
+    ##
     def save_individual_markdown
       dir = if @journal.key?("entries_folder")
         File.join(File.expand_path(@journal["entries_folder"]), "entries")

data/lib/journal-cli/data.rb

@@ -10,6 +10,11 @@ module Journal
       super
     end
 
+    ##
+    ## Convert Data object to a hash
+    ##
+    ## @return     [Hash] Data representation of the object.
+    ##
     def to_data
       output = {}
       @questions.each do |q|

data/lib/journal-cli/question.rb

@@ -33,20 +33,22 @@ module Journal
 
       return nil unless @condition && condition
 
-      case @type
-      when /^int/i
-        read_number(integer: true)
-      when /^(float|num)/i
-        read_number
-      when /^(text|string|line)/i
-        read_line
-      when /^(weather|forecast)/i
-        Weather.new(Journal.config["weather_api"], Journal.config["zip"], Journal.config["temp_in"])
-      when /^multi/i
-        read_lines
-      when /^(date|time)/i
-        read_date
-      end
+      res = case @type
+            when /^int/i
+              read_number(integer: true)
+            when /^(float|num)/i
+              read_number
+            when /^(text|string|line)/i
+              read_line
+            when /^(weather|forecast)/i
+              Weather.new(Journal.config["weather_api"], Journal.config["zip"], Journal.config["temp_in"])
+            when /^multi/i
+              read_lines
+            when /^(date|time)/i
+              read_date
+            end
+      Journal.notify("{dw}#{prompt}: {dy}#{res}{x}".x)
+      res
     end
 
     private

data/lib/journal-cli/string.rb

@@ -2,6 +2,12 @@
 
 # String helpers
 class ::String
+
+  ##
+  ## Parse and test a condition
+  ##
+  ## @return     [Boolean] whether test passed
+  ##
   def parse_condition
     condition = dup
     time_rx = /(?<comp>[<>=]{1,2}|before|after) +(?<time>(?:noon|midnight|[0-9]+) *(?:am|pm)?)$/i

data/lib/journal-cli/version.rb

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

data/lib/journal-cli/weather.rb

@@ -4,6 +4,13 @@ module Journal
   class Weather
     attr_reader :data
 
+    ##
+    ## Initialize the weather object, contacting API and parsing out conditions and forecast
+    ##
+    ## @param      api      [String] The api key
+    ## @param      zip      [String] The zip code
+    ## @param      temp_in  [String] F or C
+    ##
     def initialize(api, zip, temp_in)
       Journal.date.localtime
       res = if Journal.date.strftime("%Y-%m-%d") == Time.now.strftime("%Y-%m-%d")
@@ -43,13 +50,13 @@ module Journal
 
       hours = forecast["hour"]
       temps = [
-        {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"]}
+        { 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 = {
@@ -64,6 +71,11 @@ module Journal
       }
     end
 
+    ##
+    ## Convert weather object to hash
+    ##
+    ## @return     [Hash] Data representation of the object.
+    ##
     def to_data
       {
         high: @data[:high],
@@ -73,22 +85,52 @@ module Journal
       }
     end
 
+    ##
+    ## Get moon phase
+    ##
+    ## @return     [String] moon phase
+    ##
     def moon
       @data[:moon_phase]
     end
 
+    ##
+    ## Get current conditon
+    ##
+    ## @return     [String] condition as string (54 and
+    ##             Sunny)
+    ##
     def current
       "#{@data[:temp]} and #{@data[:current_condition]}"
     end
 
+    ##
+    ## Get daily forecast
+    ##
+    ## @return     [String] daily forecast as string (Sunny
+    ##             65/80)
+    ##
     def forecast
       "#{@data[:condition]} #{@data[:high]}/#{@data[:low]}"
     end
 
+    ##
+    ## Weather condition and forecast
+    ##
+    ## @return     [String] string representation of the
+    ##             weather object.
+    ##
     def to_s
       "#{@data[:temp].round} and #{@data[:current_condition]} (#{@data[:high].round}/#{@data[:low].round})"
     end
 
+    ##
+    ## Markdown representation of data, including hourly
+    ## forecast and conditions
+    ##
+    ## @return     [String] Markdown representation of the
+    ##             weather object.
+    ##
     def to_markdown
       output = []
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journal-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.0.36
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-which