doing 2.1.14 → 2.1.15

data/docs/doc/top-level-namespace.html

@@ -86,7 +86,7 @@
     
   
     
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span>, <span class='object_link'><a href="Hash.html" title="Hash (class)">Hash</a></span>, <span class='object_link'><a href="String.html" title="String (class)">String</a></span>, <span class='object_link'><a href="Symbol.html" title="Symbol (class)">Symbol</a></span>, <span class='object_link'><a href="Time.html" title="Time (class)">Time</a></span>
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span>, <span class='object_link'><a href="Hash.html" title="Hash (class)">Hash</a></span>, <span class='object_link'><a href="Numeric.html" title="Numeric (class)">Numeric</a></span>, <span class='object_link'><a href="String.html" title="String (class)">String</a></span>, <span class='object_link'><a href="Symbol.html" title="Symbol (class)">Symbol</a></span>, <span class='object_link'><a href="Time.html" title="Time (class)">Time</a></span>
     
   
 </p>
@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Mon Jan 17 08:01:48 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/index.md

@@ -1,53 +1,90 @@
 # doing
 
-**A command line tool for remembering what you were doing and tracking what you've done.**
+**A command line tool for remembering what you were doing and tracking what
+you've done.**
 
-_If you're one of the rare people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate/)._
+_If you're one of the rare people like me who find this useful, feel free to
+[buy me some coffee][donate]._
 
 
 
-The current version of `doing` is 2.1.12.
+The current version of `doing` is 2.1.13.
 
-Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
+Find all of the documentation in the [doing wiki][wiki].
 
-See [what's new in Doing 2.0](https://brettterpstra.com/2021/11/20/doing-2-dot-0/).
+See [what's new in Doing 2.0][doing 2].
 
-Check out some craziness with Doing in the [iTerm status bar](https://brettterpstra.com/2021/10/15/see-what-youre-doing-in-the-iterm-status-bar/) and the [Mac Touch Bar/menu bar](https://brettterpstra.com/2021/07/21/crazy-bettertouchtool-touch-bar-simulator/).
+Check out some craziness with Doing in the [iTerm status bar][status bar] and
+the [Mac Touch Bar/menu bar][touch bar].
 
 ## What and why
 
-`doing` is a basic CLI for adding and listing "what was I doing" reminders in a [TaskPaper-formatted](https://www.taskpaper.com) text file. It allows for multiple sections/categories and flexible output formatting.
+`doing` is a basic CLI for adding and listing "what was I doing" reminders in a
+[TaskPaper-formatted](https://www.taskpaper.com) text file. It allows for
+multiple sections/categories and flexible output formatting.
 
-While I'm working, I have hourly reminders to record what I'm working on, and I try to remember to punch in quick notes if I'm unexpectedly called away from a project. I can do this just by typing `doing now tracking down the CG bug`. 
+While I'm working, I have hourly reminders to record what I'm working on, and I
+try to remember to punch in quick notes if I'm unexpectedly called away from a
+project. I can do this just by typing `doing now tracking down the CG bug`.
 
-If there's something I want to look at later but doesn't need to be added to a task list or tracker, I can type `doing later check out the pinboard bookmarks from macdrifter`. When I get back to my computer --- or just need a refresher after a distraction --- I can type `doing last` to see what the last thing on my plate was. I can also type `doing recent` (or just `doing`) to get a list of the last few entries. `doing today` gives me everything since midnight for the current day, making it easy to see what I've accomplished over a sleepless night. 
+If there's something I want to look at later but doesn't need to be added to a
+task list or tracker, I can type `doing later check out the pinboard bookmarks
+from macdrifter`. When I get back to my computer --- or just need a refresher
+after a distraction --- I can type `doing last` to see what the last thing on
+my plate was. I can also type `doing recent` (or just `doing`) to get a list of
+the last few entries. `doing today` gives me everything since midnight for the
+current day, making it easy to see what I've accomplished over a sleepless
+night.
 
-Doing has over 30 commands for tracking your status, recording your time, and analyzing the results.
+Doing has over 30 commands for tracking your status, recording your time, and
+analyzing the results.
 
-See [the wiki](https://github.com/ttscoff/doing/wiki) for installation and usage instructions.
+See [the wiki][wiki] for installation and usage instructions.
 
 ## Launchbar/Alfred
 
-The LaunchBar action requires that `doing` be available in `/usr/local/bin/doing`. If it's not (because you're using RVM or similar), you'll need to symlink it there. Running the action with Return will show the latest 9 items from Currently, along with any time intervals recorded, and includes a submenu of Timers for each tag.
+The LaunchBar action requires that `doing` be available in
+`/usr/local/bin/doing`. If it's not (because you're using RVM or similar),
+you'll need to symlink it there. Running the action with Return will show the
+latest 9 items from Currently, along with any time intervals recorded, and
+includes a submenu of Timers for each tag.
 
-Pressing Spacebar and typing allows you to add a new entry to currently. You an also trigger a custom show command by typing "show [section/tag]" and hitting return. Include any command line flags at the end of the string, and if you add text in parenthesis, it will be processed as a note on the entry.
+Pressing Spacebar and typing allows you to add a new entry to currently. You an
+also trigger a custom show command by typing "show [section/tag]" and hitting
+return. Include any command line flags at the end of the string, and if you add
+text in parenthesis, it will be processed as a note on the entry.
 
-Point of interest, the LaunchBar Action makes use of the `-o json` flag for outputting JSON to the action's script for parsing.
+Point of interest, the LaunchBar Action makes use of the `-o json` flag for
+outputting JSON to the action's script for parsing.
 
 
 
-See the [doing project on BrettTerpstra.com](https://brettterpstra.com/projects/doing/) for the download.
+See the [doing project on BrettTerpstra.com][bt doing] for the download.
 
 
 
 
-Evan Lovely has [created an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
+Evan Lovely has created an [Alfred workflow][] as well.
 
 ## Contributing
 
-If you [create a plugin](https://github.com/ttscoff/doing/wiki/Creating-Plugins), custom command, or hook you can share, please [let me know](https://brettterpstra.com/contact/). If I get a few plugin contributions, I'll set up a second repository for them.
-
-Feel free to fork [the repository](https://github.com/ttscoff/doing/) on GitHub and make pull requests with changes. Please target the `develop` branch with pull requests.
+If you [create a plugin][], custom command, or hook you can share, please
+[let me know][contact]. If I get a few plugin contributions, I'll set up a
+second repository for them.
+
+Feel free to fork [the repository][github] on GitHub and make pull requests
+with changes. Please target the `develop` branch with pull requests.
+
+[bt doing]: https://brettterpstra.com/projects/doing/
+[donate]: http://brettterpstra.com/donate/
+[github]: https://github.com/ttscoff/doing/
+[wiki]: https://github.com/ttscoff/doing/wiki
+[doing 2]: https://brettterpstra.com/2021/11/20/doing-2-dot-0/
+[status bar]: https://brettterpstra.com/2021/10/15/see-what-youre-doing-in-the-iterm-status-bar/
+[touch bar]: https://brettterpstra.com/2021/07/21/crazy-bettertouchtool-touch-bar-simulator/
+[create a plugin]: https://github.com/ttscoff/doing/wiki/Creating-Plugins
+[contact]: https://brettterpstra.com/contact/
+[alfred workflow]: http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/
 
 
 

data/doing.gemspec

@@ -41,6 +41,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   s.add_runtime_dependency('tty-markdown', '~> 0.7', '>= 0.7.0')
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
+  s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
   s.add_runtime_dependency('parslet', '~> 2.0', '>= 2.0.0')
   s.add_runtime_dependency('plist', '~> 3.6', '>= 3.6.0')
   # s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.14
+v2.1.15
 
 === Global Options
 === --config_file arg
@@ -557,7 +557,7 @@ Section
 [Default Value] None
 
 
-===== -t|--took INTERVAL
+===== -t|--took|--for INTERVAL
 
 Set completion date to start date plus interval (XX[mhd] or HH:MM).
   If used without the --back option, the start date will be moved back to allow
@@ -645,7 +645,7 @@ Finish the last X entries matching search filter, surround with slashes for rege
 [Default Value] None
 
 
-===== -t|--took INTERVAL
+===== -t|--took|--for INTERVAL
 
 Set the completed date to the start date plus XX[hmd]
 

data/example_plugin.rb

@@ -152,11 +152,9 @@ module Doing
           finished_at = i.end_date
           took += finished_at.strftime('%A %B %e at %I:%M%p')
 
-          d, h, m = wwid.format_time(interval)
+
           took += ' and it took'
-          took += " #{d.to_i} days" if d.to_i.positive?
-          took += " #{h.to_i} hours" if h.to_i.positive?
-          took += " #{m.to_i} minutes" if m.to_i.positive?
+          took += interval.time_string(format: :natural)
         end
       end
 

data/lib/completion/_doing.zsh

@@ -106,13 +106,13 @@ function _doing() {
                 args=( {-d,--dump}"[DEPRECATED]" {-u,--update}"[DEPRECATED]" )
             ;;
             done) 
-                args=( {-a,--archive}"[Immediately archive the entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--at=)--at=}[Set finish date to specific date/time]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" {-t,--took=}"[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
+                args=( {-a,--archive}"[Immediately archive the entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--at=)--at=}[Set finish date to specific date/time]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" "(--for=)--for=}[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
             ;;
             did) 
-                args=( {-a,--archive}"[Immediately archive the entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--at=)--at=}[Set finish date to specific date/time]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" {-t,--took=}"[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
+                args=( {-a,--archive}"[Immediately archive the entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--at=)--at=}[Set finish date to specific date/time]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" "(--for=)--for=}[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
             ;;
             finish) 
-                args=( {-a,--archive}"[Archive entries]" "(--at=)--at=}[Set finish date to specific date/time]" "(--auto)--auto}[Auto-generate finish dates from next entrys start times start time]" {-b,--back=}"[Backdate completed date to date string [4pm|20m|2h|yesterday noon]]" "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--date)--date}[Include date]" {-i,--interactive}"[Select item(s) to finish from a menu of matching entries]" "(--not)--not}[Finish items that *dont* match search/tag filterst* match search/tag filters]" {-r,--remove}"[Remove done tag]" {-s,--section=}"[Section]" "(--search=)--search=}[Finish the last X entries matching search filter]" {-t,--took=}"[Set the completed date to the start date plus XX[hmd]]" "(--tag=)--tag=}[Finish the last X entries containing TAG]" {-u,--unfinished}"[Finish last entry]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
+                args=( {-a,--archive}"[Archive entries]" "(--at=)--at=}[Set finish date to specific date/time]" "(--auto)--auto}[Auto-generate finish dates from next entrys start times start time]" {-b,--back=}"[Backdate completed date to date string [4pm|20m|2h|yesterday noon]]" "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--date)--date}[Include date]" {-i,--interactive}"[Select item(s) to finish from a menu of matching entries]" "(--not)--not}[Finish items that *dont* match search/tag filterst* match search/tag filters]" {-r,--remove}"[Remove done tag]" {-s,--section=}"[Section]" "(--search=)--search=}[Finish the last X entries matching search filter]" "(--for=)--for=}[Set the completed date to the start date plus XX[hmd]]" "(--tag=)--tag=}[Finish the last X entries containing TAG]" {-u,--unfinished}"[Finish last entry]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             grep) 
                 args=( "(--after=)--after=}[Search entries newer than date]" "(--before=)--before=}[Search entries older than date]" "(--bool=)--bool=}[Combine multiple tags or value queries using AND]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-d,--delete}"[Delete matching entries]" "(--duration)--duration}[Show elapsed time on entries without @done tag]" {-e,--editor}"[Edit matching entries with vim]" "(--from=)--from=}[Date range to show]" {-i,--interactive}"[Display an interactive menu of results to perform further operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact string matching]" )

data/lib/completion/doing.bash

@@ -81,9 +81,9 @@ _doing_config() {
 _doing_done() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --ask --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --ask --at --started --date --editor --note --remove --section --for --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -e -n -r -s -t -u --archive --ask --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -e -n -r -s -u --archive --ask --at --started --date --editor --note --remove --section --for --unfinished' -- $token ) )
   
   fi
 }
@@ -91,9 +91,9 @@ _doing_done() {
 _doing_finish() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --took --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -i -r -s -t -u -x --archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --took --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -i -r -s -u -x --archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   
   fi
 }

data/lib/completion/doing.fish

@@ -155,7 +155,7 @@ complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command done did' -d Include\ a\ note
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command done did' -d Remove\ @done\ tag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command done did' -d Section
-complete -c doing -l took -s t -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
+complete -c doing -l for  -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command done did' -d Finish\ last\ entry\ not\ already\ marked\ @done
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command finish' -d Archive\ entries
 complete -c doing -l at  -f -r -n '__fish_doing_using_command finish' -d Set\ finish\ date\ to\ specific\ date/time
@@ -169,7 +169,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command finish' -d Finish\
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command finish' -d Remove\ done\ tag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command finish' -d Section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ matching\ search\ filter
-complete -c doing -l took -s t -f -r -n '__fish_doing_using_command finish' -d Set\ the\ completed\ date\ to\ the\ start\ date\ plus\ XX\[hmd\]
+complete -c doing -l for  -f -r -n '__fish_doing_using_command finish' -d Set\ the\ completed\ date\ to\ the\ start\ date\ plus\ XX\[hmd\]
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command finish' -d Finish\ last\ entry
 complete -c doing -l val  -f -r -n '__fish_doing_using_command finish' -d Perform\ a\ tag\ value\ query

data/lib/doing/array_chronify.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Doing
+  # Chronify array helpers
+  class ::Array
+    ##
+    ## Format [d, h, m] as string
+    ##
+    ## @param      time    [Array] Array of [days, hours,
+    ##                     minutes]
+    ## @param      format  [Symbol] The format, :dhm, :hm, :m, :clock, :natural
+    ## @return     [String] formatted string
+    ##
+    def time_string(format: :dhm)
+      raise InvalidArgument, 'Invalid array, must be [d,h,m]' unless count == 3
+
+      d, h, m = self
+      case format
+      when :clock
+        format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+      when :dhm
+        output = []
+        output.push(format('%<d>dd', d: d)) if d.positive?
+        output.push(format('%<h>dh', h: h)) if h.positive?
+        output.push(format('%<m>dm', m: m)) if m.positive?
+        output.join(' ')
+      when :hm
+        h += d * 24 if d.positive?
+        format('%<h> 4dh %<m>02dm', h: h, m: m)
+      when :m
+        h += d * 24 if d.positive?
+        m += h * 60 if h.positive?
+        format('%<m> 4dm', m: m)
+      when :natural
+        human = []
+        human.push(format('%<d>d %<s>s', d: d, s: 'day'.to_p(d))) if d.positive?
+        human.push(format('%<h>d %<s>s', h: h, s: 'hour'.to_p(h))) if h.positive?
+        human.push(format('%<m>d %<s>s', m: m, s: 'minute'.to_p(m))) if m.positive?
+        human.join(', ')
+      when :speech
+        human = []
+        human.push(format('%<d>d %<s>s', d: d, s: 'day'.to_p(d))) if d.positive?
+        human.push(format('%<h>d %<s>s', h: h, s: 'hour'.to_p(h))) if h.positive?
+        human.push(format('%<m>d %<s>s', m: m, s: 'minute'.to_p(m))) if m.positive?
+        last = human.pop
+        case human.count
+        when 2
+          human.join(', ') + ", and #{last}"
+        when 1
+          "#{human[0]} and #{last}"
+        when 0
+          last
+        end
+      end
+    end
+  end
+end

data/lib/doing/configuration.rb

@@ -101,7 +101,10 @@ module Doing
         'distance' => 3,
         'case' => 'smart' # sensitive, ignore, smart
       },
-      'include_notes' => true
+      'include_notes' => true,
+      'interaction' => {
+        'confirm_longer_than' => '5h'
+      }
     }
 
     def initialize(file = nil, options: {})

data/lib/doing/item.rb

@@ -57,6 +57,25 @@ module Doing
       @end_date ||= Time.parse(Regexp.last_match(1)) if @title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
     end
 
+    def calculate_end_date(opt)
+      if opt[:took]
+        if @date + opt[:took] > Time.now
+          @date = Time.now - opt[:took]
+          Time.now
+        else
+          @date + opt[:took]
+        end
+      elsif opt[:back]
+        if opt[:back].is_a? Integer
+          @date + opt[:back]
+        else
+          @date + (opt[:back] - @date)
+        end
+      else
+        Time.now
+      end
+    end
+
     # Generate a hash that represents the entry
     #
     # @return [String] entry hash
@@ -112,6 +131,19 @@ module Doing
       (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
     end
 
+    ##
+    ## Updates the title of the Item by expanding natural
+    ## language dates within configured date tags (tags
+    ## whose value is expected to be a date)
+    ##
+    ## @param      additional_tags  An array of additional
+    ##                              tag names to consider
+    ##                              dates
+    ##
+    def expand_date_tags(additional_tags = nil)
+      @title.expand_date_tags(additional_tags)
+    end
+
     ##
     ## Add (or remove) tags from the title of the item
     ##

data/lib/doing/log_adapter.rb

@@ -52,7 +52,7 @@ module Doing
       COUNT_KEYS.each { |key| @counters[key] = { tag: [], count: 0 } }
       @results = []
       @logdev = $stderr
-      @max_length = `tput cols`.strip.to_i - 5 || 85
+      @max_length = TTY::Screen.columns - 5 || 85
       self.log_level = level
       @prev_level = level
     end

data/lib/doing/numeric_chronify.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Doing
+  ##
+  ## Number helpers
+  ##
+  class ::Numeric
+    ##
+    ## Format human readable time from seconds
+    ##
+    ## @param      seconds  [Integer] Seconds
+    ##
+    def format_time(human: false)
+      return [0, 0, 0] if nil?
+
+      seconds = dup.to_i
+      minutes = (seconds / 60).to_i
+      hours = (minutes / 60).to_i
+      if human
+        minutes = (minutes % 60).to_i
+        [0, hours, minutes]
+      else
+        days = (hours / 24).to_i
+        hours = (hours % 24).to_i
+        minutes = (minutes % 60).to_i
+        [days, hours, minutes]
+      end
+    end
+
+    ##
+    ## Format seconds as natural language time string
+    ##
+    ## @param      format  [Symbol] The format to output
+    ##                     (:dhm, :hm, :m, :clock, :natural)
+    ##
+    def time_string(format: :dhm)
+      format_time(human: true).time_string(format: format)
+    end
+  end
+end

data/lib/doing/plugins/export/dayone_export.rb

@@ -84,7 +84,7 @@ module Doing
         interval ||= false
         human_time = false
         if interval
-          d, h, m = wwid.format_time(wwid.get_interval(i, formatted: false))
+          d, h, m = wwid.get_interval(i, formatted: false).format_time
           human_times = []
           human_times << format('%<d>d day%<p>s', d: d, p: d == 1 ? '' : 's') if d > 0
           human_times << format('%<h>d hour%<p>s', h: h, p: h == 1 ? '' : 's') if h > 0

data/lib/doing/plugins/export/json_export.rb

@@ -56,7 +56,7 @@ module Doing
             end_date: end_date,
             title: title.strip, #+ " #{note}"
             note: note.instance_of?(Array) ? note.to_s : note,
-            time: '%02d:%02d:%02d' % wwid.format_time(interval),
+            time: interval.time_string(format: :clock),
             tags: tags
           }
 
@@ -68,7 +68,7 @@ module Doing
           new_item = {
             'id' => index + 1,
             'content' => title.strip, #+ " #{note}"
-            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.format_time(interval)})",
+            'title' => title.strip + " (#{interval.time_string(format: :clock)})",
             'start' => i.date.strftime('%F %T'),
             'type' => 'box',
             'style' => 'color:#4c566b;background-color:#d8dee9;'

data/lib/doing/plugins/export/template_export.rb

@@ -5,6 +5,7 @@
 # author: Brett Terpstra
 # url: https://brettterpstra.com
 module Doing
+  # Template Export
   class TemplateExport
     include Doing::Color
     include Doing::Util
@@ -32,7 +33,7 @@ module Doing
 
         placeholders = {}
 
-        if (!item.note.empty?) && wwid.config['include_notes']
+        if !item.note.empty? && wwid.config['include_notes']
           note = item.note.map(&:strip).delete_if(&:empty?)
           note.map! { |line| "#{line.sub(/^\t*/, '')}  " }
 
@@ -42,122 +43,74 @@ module Doing
               line.simple_wrap(width)
               # line.chomp.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
             end
-            note = note.delete_if(&:empty?)
+            note.delete_if(&:empty?)
           end
         else
           note = []
         end
 
-        # output.sub!(/%(\d+)?date/) do
-        #   pad = Regexp.last_match(1).to_i
-        #   format("%#{pad}s", item.date.strftime(opt[:format]))
-        # end
         placeholders['date'] = item.date.strftime(opt[:format])
 
         interval = wwid.get_interval(item, record: true, formatted: false) if opt[:times]
         if interval
-          case opt[:interval_format].to_sym
-          when :human
-            _d, h, m = wwid.format_time(interval, human: true)
-            interval = format('%<h> 4dh %<m>02dm', h: h, m: m)
-          else
-            d, h, m = wwid.format_time(interval)
-            interval = format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
-          end
+          interval = case opt[:interval_format].to_sym
+                     when :human
+                       interval.time_string(format: :hm)
+                     else
+                       interval.time_string(format: :clock)
+                     end
         end
 
         interval ||= ''
-        # output.sub!(/%interval/, interval)
         placeholders['interval'] = interval
 
         duration = item.duration if opt[:duration]
         if duration
-          case opt[:interval_format].to_sym
-          when :human
-            _d, h, m = wwid.format_time(duration, human: true)
-            duration = format('%<h> 4dh %<m>02dm', h: h, m: m)
-          else
-            d, h, m = wwid.format_time(duration)
-            duration = format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
-          end
+          duration = case opt[:interval_format].to_sym
+                     when :human
+                       duration.time_string(format: :hm)
+                     else
+                       duration.time_string(format: :clock)
+                     end
         end
         duration ||= ''
-        # output.sub!(/%duration/, duration)
         placeholders['duration'] = duration
 
-        # output.sub!(/%(\d+)?shortdate/) do
-        #   pad = Regexp.last_match(1) || 13
-        #   format("%#{pad}s", item.date.relative_date)
-        # end
-        placeholders['shortdate'] = format("%13s", item.date.relative_date)
-        # output.sub!(/%section/, item.section) if item.section
+        placeholders['shortdate'] = format('%13s', item.date.relative_date)
         placeholders['section'] = item.section || ''
         placeholders['title'] = item.title
-
-        # title_rx = /(?mi)%(?<width>-?\d+)?(?:(?<ichar>[ _t])(?<icount>\d+))?(?<prefix>.[ _t]?)?title(?<after>.*?)$/
-        # title_color = Doing::Color.reset + output.match(/(?mi)^(.*?)(%.*?title)/)[1].last_color
-
-        # title_offset = Doing::Color.uncolor(output).match(title_rx).begin(0)
-
-        # output.sub!(title_rx) do
-        #   m = Regexp.last_match
-
-        #   after = m['after']
-        #   pad = m['width'].to_i
-        #   indent = ''
-        #   if m['ichar']
-        #     char = m['ichar'] =~ /t/ ? "\t" : ' '
-        #     indent = char * m['icount'].to_i
-        #   end
-        #   prefix = m['prefix']
-        #   if opt[:wrap_width]&.positive? || pad.positive?
-        #     width = pad.positive? ? pad : opt[:wrap_width]
-        #     item.title.wrap(width, pad: pad, indent: indent, offset: title_offset, prefix: prefix, color: title_color, after: after, reset: reset)
-        #     # flag + item.title.gsub(/(.{#{opt[:wrap_width]}})(?=\s+|\Z)/, "\\1\n ").sub(/\s*$/, '') + reset
-        #   else
-        #     format("%s%#{pad}s%s", prefix, item.title.sub(/\s*$/, ''), after)
-        #   end
-        # end
-
-
-
         placeholders['note'] = note
         placeholders['idnote'] = note.empty? ? '' : "\n#{note.map { |l| "\t\t#{l.strip}  " }.join("\n")}"
         placeholders['odnote'] = note.empty? ? '' : "\n#{note.map { |l| "#{l.strip}  " }.join("\n")}"
-        placeholders['chompnote'] = note.empty? ? '' : note.map { |l| l.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' ') }.join(' ')
-
-        # if note.empty?
-        #   output.gsub!(/%(chomp|[io]d|(\^.)?(([ _t]|[^a-z0-9])?\d+)?(.[ _t]?)?)?note/, '')
-        # else
-        #   output.sub!(/%note/, "\n#{note.map { |l| "\t#{l.strip}  " }.join("\n")}")
-        #   output.sub!(/%idnote/, "\n#{note.map { |l| "\t\t#{l.strip}  " }.join("\n")}")
-        #   output.sub!(/%odnote/, "\n#{note.map { |l| "#{l.strip}  " }.join("\n")}")
-        #   output.sub!(/(?mi)%(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])?(?<icount>\d+))?(?<prefix>.[ _t]?)?note/) do
-        #     m = Regexp.last_match
-        #     mark = m['mchar'] || ''
-        #     indent = if m['ichar']
-        #                char = m['ichar'] =~ /t/ ? "\t" : ' '
-        #                char * m['icount'].to_i
-        #              else
-        #                ''
-        #              end
-        #     prefix = m['prefix'] || ''
-        #     "\n#{note.map { |l| "#{mark}#{indent}#{prefix}#{l.strip}  " }.join("\n")}"
-        #   end
-
-        #   output.sub!(/%chompnote/) do
-        #     note.map { |l| l.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' ') }.join(' ')
-        #   end
-        # end
 
-        template = opt[:template].dup
-        template.sub!(/(?i-m)^([\s\S]*?)(%(?:[io]d|(?:\^[\s\S])?(?:(?:[ _t]|[^a-z0-9])?\d+)?(?:[\s\S][ _t]?)?)?note)([\s\S]*?)$/, '\1\3\2')
-        output = Doing::TemplateString.new(template, placeholders: placeholders, wrap_width: opt[:wrap_width], color: flag, tags_color: opt[:tags_color], reset: reset).colored
+        chompnote = []
+        unless note.empty?
+          chompnote = note.map do |l|
+            l.gsub(/\n+/, ' ').gsub(/(^\s*|\s*$)/, '').gsub(/\s+/, ' ')
+          end
+        end
+        placeholders['chompnote'] = chompnote.join(' ')
 
-        output.gsub!(/(?<!\\)%hr(_under)?/) do
+        template = opt[:template].dup
+        note_rx = /(?i-m)(?x:^([\s\S]*?)
+                    (%(?:[io]d|(?:\^[\s\S])?
+                    (?:(?:[ _t]|[^a-z0-9])?\d+)?
+                    (?:[\s\S][ _t]?)?)?note)
+                    ([\s\S]*?)$)/
+        template.sub!(note_rx, '\1\3\2')
+        output = Doing::TemplateString.new(template,
+                                           color: flag,
+                                           placeholders: placeholders,
+                                           reset: reset,
+                                           tags_color: opt[:tags_color],
+                                           wrap_width: opt[:wrap_width]).colored
+
+        output.gsub!(/(?<!\\)%(\S)?hr(_under)?/) do
           o = ''
-          `tput cols`.to_i.times do
-            o += Regexp.last_match(1).nil? ? '-' : '_'
+          TTY::Screen.columns.to_i.times do
+            char = Regexp.last_match(2).nil? ? '-' : '_'
+            char = Regexp.last_match(1).nil? ? char : Regexp.last_match(1)
+            o += char
           end
           o
         end
@@ -170,7 +123,11 @@ module Doing
       end
 
       # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:template]}")
-      out += wwid.tag_times(format: wwid.config['timer_format'].to_sym, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
+      if opt[:totals]
+        out += wwid.tag_times(format: wwid.config['timer_format'].to_sym,
+                              sort_by_name: opt[:sort_tags],
+                              sort_order: opt[:tag_order])
+      end
       out
     end