doing 2.1.19 → 2.1.21

data/lib/doing/items.rb

@@ -131,7 +131,9 @@ module Doing
       out = []
       @sections.each do |section|
         out.push(section.original)
-        in_section(section.title).each { |item| out.push(item.to_s)}
+        items = in_section(section.title).sort_by { |i| i.date }
+        items.reverse! if Doing.config.settings['doing_file_sort'].normalize_order == 'desc'
+        items.each { |item| out.push(item.to_s)}
       end
 
       out.join("\n")

data/lib/doing/pager.rb

@@ -55,7 +55,7 @@ module Doing
           write_io.write(text)
           write_io.close
         rescue SystemCallError => e
-          raise Errors::DoingStandardError, "Pager error, #{e}"
+          # raise Errors::DoingStandardError, "Pager error, #{e}"
         end
 
         _, status = Process.waitpid2(pid)

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

@@ -75,7 +75,7 @@ module Doing
           note = i.note.map { |line| line.strip.link_urls(format: :markdown) } if i.note
         end
 
-        title = "#{title} @project(#{i.section})" unless variables[:is_single]
+        title = "#{title} @section(#{i.section})" unless variables[:is_single]
 
         tags.concat(i.tag_array).sort!.uniq!
         flagged = day_flagged = true if i.tags?(wwid.config['marker_tag'])

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

@@ -48,7 +48,7 @@ module Doing
           note = i.note.map { |line| line.strip.link_urls(format: :markdown) } if i.note
         end
 
-        title = "#{title} @project(#{i.section})" unless variables[:is_single]
+        title = "#{title} @section(#{i.section})" unless variables[:is_single]
 
         interval = wwid.get_interval(i, record: true) if i.title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= false

data/lib/doing/string.rb

@@ -685,6 +685,15 @@ module Doing
       end
     end
 
+    def to_bool
+      case self
+      when /^[yt1]/i
+        true
+      else
+        false
+      end
+    end
+
     ##
     ## Convert a string value to an appropriate type. If
     ## kind is not specified, '[one, two]' becomes an Array,
@@ -704,6 +713,8 @@ module Doing
           gsub(/^\[ *| *\]$/, '').split(/ *, */)
         when /^i/i
           to_i
+        when /^(fa|tr)/i
+          to_bool
         when /^f/i
           to_f
         when /^sy/i

data/lib/doing/string_chronify.rb

@@ -26,12 +26,12 @@ module Doing
     ##
     def chronify(**options)
       now = Time.now
-      raise InvalidTimeExpression, "Invalid time expression #{inspect}" if to_s.strip == ''
+      raise Errors::InvalidTimeExpression, "Invalid time expression #{inspect}" if to_s.strip == ''
 
       secs_ago = if match(/^(\d+)$/)
                    # plain number, assume minutes
                    Regexp.last_match(1).to_i * 60
-                 elsif (m = match(/^(?:(?<day>\d+)d)?(?:(?<hour>\d+)h)?(?:(?<min>\d+)m)?$/i))
+                 elsif (m = match(/^(?:(?<day>\d+)d)? *(?:(?<hour>\d+)h)? *(?:(?<min>\d+)m)?$/i))
                    # day/hour/minute format e.g. 1d2h30m
                    [[m['day'], 24 * 3600],
                     [m['hour'], 3600],
@@ -39,14 +39,23 @@ module Doing
                  end
 
       if secs_ago
-        now - secs_ago
+        res = now - secs_ago
+        Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res} (#{secs_ago} seconds ago)))
       else
-        Chronic.parse(self, {
-                        guess: options.fetch(:guess, :begin),
-                        context: options.fetch(:future, false) ? :future : :past,
-                        ambiguous_time_range: 8
-                      })
+        date_string = dup
+        date_string = 'today' if date_string.match(REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
+        date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ REGEX_TIME && options[:context]
+
+        res = Chronic.parse(date_string, {
+                              guess: options.fetch(:guess, :begin),
+                              context: options.fetch(:future, false) ? :future : :past,
+                              ambiguous_time_range: 8
+                            })
+
+        Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res}))
       end
+
+      res
     end
 
     ##
@@ -152,6 +161,10 @@ module Doing
       end
     end
 
+    def is_range?
+      self =~ / (to|through|thru|(un)?til|-+) /
+    end
+
     ##
     ## Splits a range string and returns an array of
     ## DateTime objects as [start, end]. If only one date is
@@ -163,20 +176,45 @@ module Doing
     ## "mon 3pm to mon 5pm".split_date_range
     ##
     def split_date_range
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+      range_rx = / (to|through|thru|(?:un)?til|-+) /
+
       date_string = dup
-      case date_string
-      when / (to|through|thru|(un)?til|-+) /
-        dates = date_string.split(/ (?:to|through|thru|(?:un)?til|-+) /)
-        start = dates[0].chronify(guess: :begin)
-        finish = dates[-1].chronify(guess: :end)
+
+      if date_string.is_range?
+        # Do we want to differentiate between "to" and "through"?
+        # inclusive = date_string =~ / (through|thru|-+) / ? true : false
+        inclusive = true
+
+        dates = date_string.split(range_rx)
+        if dates[0].strip =~ time_rx && dates[-1].strip =~ time_rx
+          start = dates[0].strip
+          finish = dates[-1].strip
+        else
+          start = dates[0].chronify(guess: :begin, future: false)
+          finish = dates[-1].chronify(guess: inclusive ? :end : :begin, future: false)
+        end
+
+        raise Errors::InvalidTimeExpression, 'Unrecognized date string' if start.nil? || finish.nil?
+
       else
-        start = date_string.chronify(guess: :begin)
-        finish = nil
+        if date_string.strip =~ time_rx
+          start = date_string.strip
+          finish = nil
+        else
+          start = date_string.strip.chronify(guess: :begin, future: false)
+          finish = date_string.strip.chronify(guess: :end)
+        end
+        raise Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+
       end
 
-      raise InvalidTimeExpression, 'Unrecognized date string' unless start
 
-      Doing.logger.debug('Parser:', "date range interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+      if start.is_a? String
+        Doing.logger.debug('Parser:', "--from string interpreted as time span, from #{start || '12am'} to #{finish || '11:59pm'}")
+      else
+        Doing.logger.debug('Parser:', "date range interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+      end
       [start, finish]
     end
   end

data/lib/doing/types.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i
+REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i
+REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/
+REGEX_CLOCK = '(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)'
+REGEX_TIME = /^#{REGEX_CLOCK}$/i
+REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i
+REGEX_RANGE_INDICATOR = ' +(?:to|through|thru|(?:un)?til|-+) +'
+REGEX_RANGE = /^\S+#{REGEX_RANGE_INDICATOR}+\S+/i
+REGEX_TIME_RANGE = /^#{REGEX_CLOCK}#{REGEX_RANGE_INDICATOR}#{REGEX_CLOCK}$/i
+
+InvalidExportType = Class.new(RuntimeError)
+MissingConfigFile = Class.new(RuntimeError)
+TagArray = Class.new(Array)
+DateBeginString = Class.new(DateTime)
+DateEndString = Class.new(DateTime)
+DateRangeString = Class.new(Array)
+DateIntervalString = Class.new(DateTime)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.19'
+  VERSION = '2.1.21'
 end

data/lib/doing/wwid.rb

@@ -305,6 +305,28 @@ module Doing
       view
     end
 
+    def add_with_editor(**options)
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Util.default_editor.nil?
+
+      input = options[:date].strftime('%F %R | ')
+      input += options[:title]
+      input += "\n#{options[:note]}" if options[:note]
+      input = fork_editor(input).strip
+
+      d, title, note = format_input(input)
+      raise EmptyInput, 'No content' if title.empty?
+
+      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? ? options[:date] : d
+      finish = options[:finish_last] || false
+      add_item(title.cap_first, options[:section], { note: note, back: date, timed: finish })
+      write(@doing_file)
+    end
+
     ##
     ## Adds an entry
     ##
@@ -356,7 +378,7 @@ module Doing
 
       @content.push(entry)
       # logger.count(:added, level: :debug)
-      logger.info('New entry:', %(added "#{entry.title}" to #{section}))
+      logger.info('New entry:', %(added "#{entry.date.relative_date}: #{entry.title}" to #{section}))
 
       Hooks.trigger :post_entry_added, self, entry.dup
     end
@@ -454,7 +476,8 @@ module Doing
       opt ||= {}
       if item.should_finish?
         if item.should_time?
-          item.title.tag!('done', value: Time.now.strftime('%F %R'))
+          finish_date = verify_duration(item.date, Time.now, title: item.title)
+          item.title.tag!('done', value: finish_date.strftime('%F %R'))
         else
           item.title.tag!('done')
         end
@@ -484,7 +507,7 @@ module Doing
       end
 
       # @content.update_item(original, item)
-      add_item(title, section, { note: note, back: opt[:date], timed: true })
+      add_item(title, section, { note: note, back: opt[:date], timed: false })
     end
 
     ##
@@ -633,42 +656,25 @@ module Doing
 
       opt[:time_filter] = [nil, nil]
       if opt[:from] && !opt[:date_filter]
-        date_string = opt[:from]
-        case date_string
-        when / (to|through|thru|(un)?til|-+) /
-          dates = date_string.split(/ (?:to|through|thru|(?:un)?til|-+) /)
-          if dates[0].strip =~ time_rx && dates[-1].strip =~ time_rx
-            time_start = dates[0].strip
-            time_end = dates[-1].strip
-          else
-            start = dates[0].chronify(guess: :begin)
-            finish = dates[-1].chronify(guess: :end)
-          end
-        when time_rx
-          time_start = date_string
-          time_end = nil
-        else
-          start = date_string.chronify(guess: :begin)
-          finish = false
+        if opt[:from][0].is_a?(String) && opt[:from][0] =~ time_rx
+          time_start, time_end = opt[:from]
+        elsif opt[:from].is_a?(Time)
+          start, finish = opt[:from]
         end
 
         if time_start
           opt[:time_filter] = [time_start, time_end]
-          Doing.logger.debug('Parser:', "--from string interpreted as time span, from #{time_start ? time_start : '12am'} to #{time_end ? time_end : '11:59pm'}")
         else
-          raise InvalidTimeExpression, 'Unrecognized date string' unless start
-
-          opt[:date_filter] = [start, finish]
-          Doing.logger.debug('Parser:', "--from string interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+          opt[:date_filter] = opt[:from]
         end
       end
 
-      if opt[:before] =~ time_rx
+      if opt[:before].is_a?(String) && opt[:before] =~ time_rx
         opt[:time_filter][1] = opt[:before]
         opt[:before] = nil
       end
 
-      if opt[:after] =~ time_rx
+      if opt[:after].is_a?(String) && opt[:after] =~ time_rx
         opt[:time_filter][0] = opt[:after]
         opt[:after] = nil
       end
@@ -734,7 +740,7 @@ module Doing
           start_time = start_string.chronify(guess: :begin)
 
           end_string = if opt[:time_filter][1].nil?
-                         "#{item.date.next_day.strftime('%Y-%m-%d')} 12am"
+                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 12am"
                        else
                          "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
                        end
@@ -753,22 +759,26 @@ module Doing
         end
 
         if keep && opt[:before]
-          time_string = opt[:before]
-          if time_string =~ time_rx
-            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :begin)
+          before = opt[:before]
+          if before =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
+          elsif before.is_a?(String)
+            cutoff = before.chronify(guess: :begin)
           else
-            cutoff = time_string.chronify(guess: :begin)
+            cutoff = before
           end
           keep = cutoff && item.date <= cutoff
           keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:after]
-          time_string = opt[:after]
-          if time_string =~ time_rx
-            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :end)
+          after = opt[:after]
+          if after =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
+          elsif after.is_a?(String)
+            cutoff = after.chronify(guess: :end)
           else
-            cutoff = time_string.chronify(guess: :end)
+            cutoff = after
           end
           keep = cutoff && item.date >= cutoff
           keep = opt[:not] ? !keep : keep
@@ -934,6 +944,7 @@ module Doing
         actions = [
           'add tag',
           'remove tag',
+          'autotag',
           'cancel',
           'delete',
           'finish',
@@ -960,6 +971,8 @@ module Doing
             opt[:resume] = true
           when /reset/
             opt[:reset] = true
+          when /autotag/
+            opt[:autotag] = true
           when /(add|remove) tag/
             type = action =~ /^add/ ? 'add' : 'remove'
             raise InvalidArgument, "'add tag' and 'remove tag' can not be used together" if opt[:tag]
@@ -1071,6 +1084,21 @@ module Doing
         end
       end
 
+      if opt[:autotag]
+        items.map! do |i|
+          new_title = autotag(i.title)
+          if new_title == i.title
+            logger.count(:skipped, level: :debug, message: '%count unchaged %items')
+            # logger.debug('Autotag:', 'No changes')
+          else
+            logger.count(:added_tags)
+            logger.write(items.count == 1 ? :info : :debug, 'Tagged:', new_title)
+            i.title = new_title
+            Hooks.trigger :post_entry_updated, self, i
+          end
+        end
+      end
+
       if opt[:tag]
         tag = opt[:tag]
         items.map! do |i|
@@ -1098,10 +1126,7 @@ module Doing
 
       return unless opt[:output]
 
-      items.map! do |i|
-        i.title = "#{i.title} @project(#{i.section})"
-        i
-      end
+      items.each { |i| i.title = "#{i.title} @section(#{i.section})" }
 
       export_items = Items.new
       export_items.concat(items)
@@ -1138,6 +1163,8 @@ module Doing
     def verify_duration(date, finish_date, title: nil)
       max_elapsed = @config.dig('interaction', 'confirm_longer_than') || 0
       max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
+      date = date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
+
       elapsed = finish_date - date
 
       if max_elapsed.positive? && (elapsed > max_elapsed)
@@ -1316,7 +1343,7 @@ module Doing
     ##
     ## @return     [Item] the next chronological item in the index
     ##
-    def next_item(item, options)
+    def next_item(item, options = {})
       options ||= {}
       items = filter_items(Items.new, opt: options)
 
@@ -1747,7 +1774,7 @@ module Doing
       opt[:sort_tags] ||= false
       section = guess_section(section)
       # :date_filter expects an array with start and end date
-      dates = [dates, dates] if dates.instance_of?(String)
+      dates = dates.split_date_range if dates.instance_of?(String)
 
       list_section({
                      section: section,

data/lib/examples/commands/later.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Example command that calls an existing command (tag) with
+# preset options
+desc 'Add an item to the Later section'
+arg_name 'ENTRY'
+command :later do |c|
+  c.example 'doing later "Something I\'ll think about tomorrow"', desc: 'Add an entry to the Later section'
+  c.example 'doing later -e', desc: 'Open $EDITOR to create an entry and optional note'
+
+  c.desc "Edit entry with #{Doing::Util.default_editor}"
+  c.switch %i[e editor], negatable: false, default_value: false
+
+  c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
+  c.arg_name 'DATE_STRING'
+  c.flag %i[b back started], type: DateBeginString
+
+  c.desc 'Note'
+  c.arg_name 'TEXT'
+  c.flag %i[n note]
+
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
+  c.action do |global_options, options, args|
+    cmd = commands[:now]
+    options[:section] = 'Later'
+    options[:finish_last] = false
+    action = cmd.send(:get_action, nil)
+    action.call(global_options, options, args)
+  end
+end