doing 1.0.41 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5f05e62d0f437134960c918fba1c4031ab826dd83a6a976883cc9321d90a20
-  data.tar.gz: 33656713df024f8229897fc76083b115473ddc693afb16edc8bcd1beed1429f1
+  metadata.gz: f715c083c72c609fb2e2fc8c730cca68b8391dccbc4ca2168333dd9b30df0887
+  data.tar.gz: 3d7df2ec9624ae8d2b6822ccceed402c42f82f2a5b2e010c639880c9cd95580f
 SHA512:
-  metadata.gz: 65b55315b30066d8364818aa153cea3723398696e1695a4843d36bd0e7e71d0bd2c4ab89217f8266a39d42a7f4e54d9c03e38f135649110ed1f657ac320a5907
-  data.tar.gz: 677350fc0b33333d17be84b4ee69f85235123f0b16f20372aa9dcc485804152d8cab7e9948f58fc416662a9695052f0e46a21027166cfa17fcf5b23e2e961956
+  metadata.gz: 4287daf5a4821ff6e295c36275d2101ecebefdc0adc962faefe82c460bd52f2e9a1a69e767e3ad59f7d68074a86807496e3e1669dd7f6f68688da903fb370309
+  data.tar.gz: 4a62305048b02bac186c63f951a6e3a7985663dc826070801c3a333b8e9388147435639910ac0f1fe24b0ad5a90e15b61510c0799ce94cf84060ca8fad097f0b

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.41'
+  VERSION = '1.0.42'
 end

data/lib/doing/wwid.rb

@@ -1125,7 +1125,6 @@ class WWID
       }
       out = output.join("")
     elsif opt[:output] == "json" || opt[:output] == "timeline"
-
       items_out = []
       max = items[-1]['date'].strftime('%F')
       min = items[0]['date'].strftime('%F')
@@ -1137,7 +1136,6 @@ class WWID
           title = i['title']
           note = i['note'].map { |line| line.strip } if i['note']
         end
-
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
           end_date = Time.parse($1)
           interval = get_interval(i,false)
@@ -1152,14 +1150,16 @@ class WWID
           tags.push(tag[0]) unless skip_tags.include?(tag[0])
         }
         if opt[:output] == "json"
+
           items_out << {
             :date => i['date'],
             :end_date => end_date,
             :title => title.strip, #+ " #{note}"
-            :note => note.class == Array ? note.join("\n") : note,
+            :note => note.class == Array ? note.map(&:strip).join("\n") : note,
             :time => "%02d:%02d:%02d" % fmt_time(interval),
             :tags => tags
           }
+
         elsif opt[:output] == "timeline"
           new_item = {
             'id' => index + 1,
@@ -1280,7 +1280,7 @@ EOTEMPLATE
         end
 
         if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
-          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t" + line.sub(/^\t*/,'') + "  " }
+          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t*/,'').sub(/^-/, '—') + "  " }
           if opt[:wrap_width] && opt[:wrap_width] > 0
             width = opt[:wrap_width]
             note_lines.map! {|line|
@@ -1607,7 +1607,6 @@ EOTEMPLATE
   ## @param      format  (String) return format (html, json, or text)
   ##
   def tag_times(format="text", sort_by_name = false)
-
     return "" if @timers.empty?
 
     max = @timers.keys.sort_by {|k| k.length }.reverse[0].length + 1
@@ -1799,6 +1798,10 @@ EOS
     if seconds.nil?
       return [0, 0, 0]
     end
+    if seconds =~ /(\d+):(\d+):(\d+)/
+      h, m, s = [$1, $2, $3]
+      seconds = (h.to_i * 60 * 60) + (m.to_i * 60) + s.to_i
+    end
     minutes =  (seconds / 60).to_i
     hours = (minutes / 60).to_i
     days = (hours / 24).to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake