doing 2.1.14 → 2.1.18

data/bin/doing

@@ -199,7 +199,7 @@ command %i[again resume] do |c|
     end
 
     note = Doing::Note.new(options[:note])
-    note.add(Doing::Prompt.request_lines(prompt: 'Add a note')) if options[:ask]
+    note.add(Doing::Prompt.read_lines(prompt: 'Add a note')) if options[:ask]
 
     options[:note] = note
 
@@ -338,19 +338,26 @@ command %i[done did] do |c|
   c.switch %i[a archive], negatable: false, default_value: false
 
   c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm).
-  If used, ignores --back. Used with --took, backdates start date)
+  Used with --took, backdates start date)
   c.arg_name 'DATE_STRING'
-  c.flag [:at]
+  c.flag %i[at finished]
 
   c.desc 'Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]'
   c.arg_name 'DATE_STRING'
   c.flag %i[b back started]
 
+  c.desc %(
+        Start and end times as a date/time range `doing done --from "1am to 8am"`.
+        Overrides other date flags.
+      )
+  c.arg_name 'TIME_RANGE'
+  c.flag [:from]
+
   c.desc %(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
   the completion date to be the current time.)
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc 'Section'
   c.arg_name 'NAME'
@@ -377,30 +384,41 @@ command %i[done did] do |c|
     took = 0
     donedate = nil
 
-    if options[:took]
-      took = options[:took].chronify_qty
-      raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
-    end
-
-    if options[:back]
-      date = options[:back].chronify(guess: :begin)
-      raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+    if options[:from]
+      date, finish_date = options[:from].split_date_range
+      finish_date ||= Time.now
     else
-      date = options[:took] ? Time.now - took : Time.now
-    end
+      if options[:took]
+        took = options[:took].chronify_qty
+        raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
+      end
 
-    if options[:at]
-      finish_date = options[:at].chronify(guess: :begin)
-      raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+      if options[:back]
+        date = options[:back].chronify(guess: :begin)
+        raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+      else
+        date = options[:took] ? Time.now - took : Time.now
+      end
 
-      date = options[:took] ? finish_date - took : finish_date
-    elsif options[:took]
-      finish_date = date + took
-    else
-      finish_date = Time.now
+      if options[:at]
+        finish_date = options[:at].chronify(guess: :begin)
+        raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+
+        if options[:took]
+          date = finish_date - took
+        else
+          date ||= finish_date
+        end
+      elsif options[:took]
+        finish_date = date + took
+      else
+        finish_date = Time.now
+      end
     end
 
     if options[:date]
+      finish_date = wwid.verify_duration(date, finish_date) unless options[:took] || options[:from]
+
       donedate = finish_date.strftime('%F %R')
     end
 
@@ -410,9 +428,13 @@ command %i[done did] do |c|
       section = settings['current_section']
     end
 
+
     note = Doing::Note.new
     note.add(options[:note]) if options[:note]
-    note.add(Doing::Prompt.request_lines(prompt: 'Add a note')) if options[:ask]
+
+    if options[:ask] && !options[:editor]
+      note.add(Doing::Prompt.read_lines(prompt: 'Add a note'))
+    end
 
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
@@ -438,6 +460,12 @@ command %i[done did] do |c|
       raise EmptyInput, 'No content' unless input && !input.empty?
 
       d, title, note = wwid.format_input(input)
+
+      if options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
       date = d.nil? ? date : d
       new_entry = Doing::Item.new(date, title, section, note)
       if new_entry.should_finish?
@@ -467,7 +495,6 @@ command %i[done did] do |c|
       if options[:remove]
         wwid.tag_last({ tags: ['done'], count: 1, section: section, remove: true })
       else
-        note = options[:note] ? Doing::Note.new(options[:note]) : nil
         opt = {
           archive: options[:archive],
           back: finish_date,
@@ -482,12 +509,13 @@ command %i[done did] do |c|
         wwid.tag_last(opt)
       end
     elsif !args.empty?
-      note = Doing::Note.new(options[:note])
       d, title, new_note = wwid.format_input([args.join(' '), note.strip_lines.join("\n")].join("\n"))
       date = d.nil? ? date : d
+      new_note.add(options[:note])
       title.chomp!
       section = 'Archive' if options[:archive]
       new_entry = Doing::Item.new(date, title, section, new_note)
+
       if new_entry.should_finish?
         if new_entry.should_time?
           new_entry.tag('done', value: donedate)
@@ -495,12 +523,14 @@ command %i[done did] do |c|
           new_entry.tag('done')
         end
       end
+
       Doing::Hooks.trigger :pre_entry_add, wwid, new_entry
       wwid.content.push(new_entry)
       Doing::Hooks.trigger :post_entry_added, wwid, new_entry.dup
       wwid.write(wwid.doing_file)
       Doing.logger.info('Entry Added:', new_entry.title)
     elsif $stdin.stat.size.positive?
+      note = Doing::Note.new(options[:note])
       d, title, note = wwid.format_input($stdin.read.strip)
       unless d.nil?
         Doing.logger.debug('Parser:', 'Date detected in input, overriding command line values')
@@ -548,7 +578,7 @@ command :finish do |c|
 
   c.desc 'Set the completed date to the start date plus XX[hmd]'
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back.)
   c.arg_name 'DATE_STRING'
@@ -710,22 +740,29 @@ command :later do |c|
       date = Time.now
     end
 
-    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
+    ask_note = options[:ask] && !options[:editor] && args.count.positive? ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
+    if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
+      input = ''
       input += date.strftime('%F %R | ')
       input += args.empty? ? '' : args.join(' ')
       input += "\n#{options[:note]}" if options[:note]
       input += "\n#{ask_note}" unless ask_note.empty?
 
       input = wwid.fork_editor(input).strip
-      raise EmptyInput, 'No content' unless input && !input.empty?
 
       d, title, note = wwid.format_input(input)
-      date = d.nil? ? date : d
+      raise EmptyInput, 'No content' if title.empty?
+
       note.add(options[:note]) if options[:note]
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
+      date = d.nil? ? date : d
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     elsif !args.empty?
@@ -746,7 +783,16 @@ command :later do |c|
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
-      raise EmptyInput, 'You must provide content when creating a new entry'
+      title = Doing::Prompt.read_line(prompt: 'Entry content')
+      raise EmptyInput, 'You must provide content when creating a new entry' if title.strip.empty?
+
+      note = Doing::Note.new
+      res = Doing::Prompt.yn('Add a note', default_response: false)
+      ask_note = res ? Doing::Prompt.read_lines(prompt: 'Enter note') : []
+      note.add(ask_note)
+
+      wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
+      wwid.write(wwid.doing_file)
     end
   end
 end
@@ -928,7 +974,7 @@ command :meanwhile do |c|
     end
     input = ''
 
-    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : []
+    ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : []
 
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
@@ -1052,7 +1098,7 @@ command :note do |c|
 
     last_note = last_entry.note || Doing::Note.new
     new_note = Doing::Note.new
-    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
+    ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
 
     if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove] && !options[:ask])
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
@@ -1102,10 +1148,13 @@ long_desc %(Record what you're starting now, or backdate the start time using na
 
 A parenthetical at the end of the entry will be converted to a note.
 
-Run with no argument to create a new entry using #{Doing::Util.default_editor}.)
+Run without arguments to create a new entry interactively.
+
+Run with --editor to create a new entry using #{Doing::Util.default_editor}.)
 arg_name 'ENTRY'
 command %i[now next] do |c|
-  c.example 'doing now', desc: "Open #{Doing::Util.default_editor} to input an entry and optional note."
+  c.example 'doing now', desc: 'Create a new entry with interactive prompts'
+  c.example 'doing now -e', desc: "Open #{Doing::Util.default_editor} to input an entry and optional note"
   c.example 'doing now working on a new project', desc: 'Add a new entry at the current time'
   c.example 'doing now debugging @project2', desc: 'Add an entry with a tag'
   c.example 'doing now adding an entry (with a note)', desc: 'Parenthetical at end is converted to note'
@@ -1151,9 +1200,9 @@ command %i[now next] do |c|
       options[:section] = settings['current_section']
     end
 
-    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
+    ask_note = options[:ask] && !options[:editor] && args.count.positive? ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
+    if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = date.strftime('%F %R | ')
@@ -1162,9 +1211,13 @@ command %i[now next] do |c|
       input += "\n#{ask_note}" unless ask_note.empty?
       input = wwid.fork_editor(input).strip
 
-      raise EmptyInput, 'No content' if input.empty?
-
       date, title, note = wwid.format_input(input)
+      raise EmptyInput, 'No content' if title.strip.empty?
+
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
 
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
@@ -1183,11 +1236,26 @@ command %i[now next] do |c|
         date = d
       end
       note.add(options[:note]) if options[:note]
-      note.add(ask_note) unless ask_note.empty?
+      if ask_note.empty? && options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     else
-      raise EmptyInput, 'You must provide content when creating a new entry'
+      tags = wwid.all_tags(wwid.content)
+      $stderr.puts Doing::Color.boldgreen("Add a new entry. Tab will autocomplete known tags. Ctrl-c to cancel.")
+      title = Doing::Prompt.read_line(prompt: 'Entry content', completions: tags)
+      raise EmptyInput, 'You must provide content when creating a new entry' if title.strip.empty?
+
+      note = Doing::Note.new
+      note.add(options[:note]) if options[:note]
+      res = Doing::Prompt.yn('Add a note', default_response: false)
+      ask_note = res ? Doing::Prompt.read_lines(prompt: 'Enter note') : []
+      note.add(ask_note)
+
+      wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      wwid.write(wwid.doing_file)
     end
   end
 end
@@ -1510,7 +1578,7 @@ command :tag do |c|
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
-    raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
+    # raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
 
     raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 
@@ -1530,11 +1598,15 @@ command :tag do |c|
     if options[:autotag]
       tags = []
     else
-      tags = if args.join('') =~ /,/
-               args.join('').split(/,/)
-             else
-               args.join(' ').split(' ') # in case tags are quoted as one arg
-             end
+      if args.empty?
+        tags = []
+      else
+        tags = if args.join('') =~ /,/
+                 args.join('').split(/ *, */)
+               else
+                 args.join(' ').split(' ') # in case tags are quoted as one arg
+               end
+      end
 
       tags.map! { |tag| tag.sub(/^@/, '').strip }
     end
@@ -1678,6 +1750,9 @@ command %i[grep search] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   c.desc "Edit matching entries with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false
 
@@ -1755,6 +1830,9 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
   c.arg_name 'QUERY'
   c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
@@ -1809,6 +1887,7 @@ command :last do |c|
                         search: options[:search],
                         fuzzy: options[:fuzzy],
                         case: options[:case],
+                        hilite: options[:hilite],
                         negate: options[:not],
                         tag: options[:tag],
                         tag_bool: options[:bool],
@@ -1954,6 +2033,9 @@ command :show do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2101,6 +2183,7 @@ command :show do |c|
     opt[:sort_tags] = options[:tag_sort] =~ /^n/i
     opt[:count] = options[:count].to_i
     opt[:highlight] = true
+    opt[:hilite] = options[:hilite]
     opt[:order] = options[:sort].normalize_order
     opt[:tag] = nil
     opt[:tag_order] = options[:tag_order].normalize_order
@@ -2427,6 +2510,9 @@ command :view do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Highlight search matches in output. Only affects command line output"
+  c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2587,6 +2673,7 @@ command :view do |c|
       opts[:count] = count
       opts[:format] = date_format
       opts[:highlight] = options[:color]
+      opts[:hilite] = options[:hilite]
       opts[:only_timed] = only_timed
       opts[:order] = order
       opts[:output] = options[:interactive] ? nil : options[:output]

data/docs/doc/Array.html

@@ -94,14 +94,16 @@
   
   <dl>
     <dt>Defined in:</dt>
-    <dd>lib/doing/array.rb</dd>
+    <dd>lib/doing/array.rb<span class="defines">,<br />
+  lib/doing/array_chronify.rb</span>
+</dd>
   </dl>
   
 </div>
 
 <h2>Overview</h2><div class="docstring">
   <div class="discussion">
-    <p>Array helpers</p>
+    <p>Chronify array helpers</p>
 
 
   </div>
@@ -217,6 +219,29 @@
     <span class="summary_desc"><div class='inline'><p>Convert an @tags to plain strings.</p>
 </div></span>
   
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="#time_string-instance_method" title="#time_string (instance method)">#<strong>time_string</strong>(format: :dhm)  &#x21d2; String </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'><p>Format [d, h, m] as string.</p>
+</div></span>
+  
 </li>
 
       
@@ -464,6 +489,95 @@ with</p>
   
 </ul>
 
+</div>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="time_string-instance_method">
+  
+    #<strong>time_string</strong>(format: :dhm)  &#x21d2; <tt><span class='object_link'><a href="String.html" title="String (class)">String</a></span></tt> 
+  
+
+  
+
+  
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Format [d, h, m] as string</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>time</span>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="" title="Array (class)">Array</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>Array of [days, hours,
+minutes]</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>format</span>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="Symbol.html" title="Symbol (class)">Symbol</a></span></tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>:dhm</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'><p>The format, :dhm, :hm, :m, :clock, :natural</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt><span class='object_link'><a href="String.html" title="String (class)">String</a></span></tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>formatted string</p>
+</div>
+      
+    </li>
+  
+</ul>
+<p class="tag_title">Raises:</p>
+<ul class="raise">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>InvalidArgument</tt>)</span>
+      
+      
+      
+    </li>
+  
+</ul>
+
 </div>
 </div>
     
@@ -540,7 +654,7 @@ with</p>
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser/Clause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser/Query.html

@@ -407,7 +407,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser/QueryParser.html

@@ -125,7 +125,7 @@ parser. In order to do that, a new "clause" node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser/QueryTransformer.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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/doc/BooleanTermParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 15 17:27:48 2022 by
+  Generated on Tue Jan 18 07:44:44 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>