doing 2.1.0pre → 2.1.1pre

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.0pre
+v2.1.1pre
 
 === Global Options
 === --config_file arg
@@ -145,7 +145,7 @@ Repeat last entry matching tags. Combine multiple tags with a comma.
 
 
 ===== -e|--editor
-Edit duplicated entry with vim before adding
+Edit duplicated entry with emacs -nw before adding
 
 
 
@@ -541,7 +541,7 @@ Include date
 
 
 ===== -e|--editor
-Edit entry with vim (with no arguments, edits the last entry)
+Edit entry with emacs -nw (with no arguments, edits the last entry)
 
 
 
@@ -670,14 +670,14 @@ To search with regular expressions, single quote the string and surround with sl
 ===== Options
 ===== --after DATE_STRING
 
-Constrain search to entries newer than date
+Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
 
 ===== --before DATE_STRING
 
-Constrain search to entries older than date
+Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
@@ -690,6 +690,18 @@ Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart
 [Must Match] (?-mix:^[csi])
 
 
+===== --from DATE_OR_RANGE
+
+Date range to show, or a single day to filter date on.
+      Date range argument should be quoted. Date specifications can be natural language.
+      To specify a range, use "to" or "through": `doing search --from "monday 8am to friday 5pm"`.
+
+      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+      by time of day.
+
+[Default Value] None
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
@@ -891,7 +903,7 @@ Tag filter, combine multiple tags with a comma.
 
 
 ===== -e|--editor
-Edit entry with vim
+Edit entry with emacs -nw
 
 
 
@@ -925,7 +937,7 @@ Note
 
 
 ===== -e|--editor
-Edit entry with vim
+Edit entry with emacs -nw
 
 
 
@@ -1047,7 +1059,7 @@ Archive previous @meanwhile entry
 
 
 ===== -e|--editor
-Edit entry with vim
+Edit entry with emacs -nw
 
 
 
@@ -1098,7 +1110,7 @@ Add/remove note from last entry matching tag
 
 
 ===== -e|--editor
-Edit entry with vim
+Edit entry with emacs -nw
 
 
 
@@ -1129,7 +1141,7 @@ Record what you're starting now, or backdate the start time using natural langua
 
 A parenthetical at the end of the entry will be converted to a note.
 
-Run with no argument to create a new entry using vim.
+Run with no argument to create a new entry using emacs -nw.
 ===== Options
 ===== -b|--back|--started DATE_STRING
 
@@ -1153,7 +1165,7 @@ Section
 
 
 ===== -e|--editor
-Edit entry with vim
+Edit entry with emacs -nw
 
 
 
@@ -1433,6 +1445,20 @@ Multiple selections are allowed, hit tab to add the highlighted entry to the
 selection, and use ctrl-a to select all visible items. Return processes the
 selected entries.
 ===== Options
+===== --after DATE_STRING
+
+Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
+
+[Default Value] None
+
+
+===== --before DATE_STRING
+
+Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
+
+[Default Value] None
+
+
 ===== --case TYPE
 
 Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]
@@ -1441,6 +1467,18 @@ Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart
 [Must Match] (?-mix:^[csi])
 
 
+===== --from DATE_OR_RANGE
+
+Date range to show, or a single day to filter date on.
+      Date range argument should be quoted. Date specifications can be natural language.
+      To specify a range, use "to" or "through": `doing select --from "monday 8am to friday 5pm"`.
+
+      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+      by time of day.
+
+[Default Value] None
+
+
 ===== -m|--move SECTION
 
 Move selected items to section
@@ -1558,7 +1596,7 @@ Age (oldest|newest)
 
 ===== --after DATE_STRING
 
-View entries newer than date
+Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
@@ -1573,7 +1611,7 @@ Tag boolean (AND,OR,NOT)
 
 ===== --before DATE_STRING
 
-View entries older than date
+Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
@@ -1593,11 +1631,14 @@ Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart
 [Must Match] (?-mix:^[csi])
 
 
-===== -f|--from DATE_OR_RANGE
+===== --from DATE_OR_RANGE
 
 Date range to show, or a single day to filter date on.
-    Date range argument should be quoted. Date specifications can be natural language.
-    To specify a range, use "to" or "through": `doing show --from "monday to friday"`
+      Date range argument should be quoted. Date specifications can be natural language.
+      To specify a range, use "to" or "through": `doing show --from "monday 8am to friday 5pm"`.
+
+      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+      by time of day.
 
 [Default Value] None
 
@@ -1869,6 +1910,13 @@ View entries before specified time (e.g. 8am, 12:30pm, 15:00)
 [Default Value] None
 
 
+===== --from DATE_OR_RANGE
+
+Time range to show `doing today --from "12pm to 4pm"`
+
+[Default Value] None
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
@@ -1920,7 +1968,7 @@ Command line options override view configuration
 ===== Options
 ===== --after DATE_STRING
 
-View entries newer than date
+View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
@@ -1935,7 +1983,7 @@ Tag boolean (AND,OR,NOT)
 
 ===== --before DATE_STRING
 
-View entries older than date
+View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.
 
 [Default Value] None
 
@@ -1956,6 +2004,18 @@ Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart
 [Must Match] (?-mix:^[csi])
 
 
+===== --from DATE_OR_RANGE
+
+Date range to show, or a single day to filter date on.
+      Date range argument should be quoted. Date specifications can be natural language.
+      To specify a range, use "to" or "through": `doing view --from "monday 8am to friday 5pm" view_name`.
+
+      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
+      by time of day.
+
+[Default Value] None
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
@@ -2126,6 +2186,13 @@ View entries before specified time (e.g. 8am, 12:30pm, 15:00)
 [Default Value] None
 
 
+===== --from TIME_RANGE
+
+Time range to show, e.g. `doing yesterday --from "1am to 8am"`
+
+[Default Value] None
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)

data/lib/completion/doing.bash

@@ -101,9 +101,9 @@ _doing_finish() {
 _doing_grep() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --case --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --case --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   
   fi
 }
@@ -261,9 +261,9 @@ _doing_sections() {
 _doing_select() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --resume --cancel --case --delete --editor --finish --flag --force --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t -x --archive --resume --cancel --case --delete --editor --finish --flag --force --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t -x --archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --exact' -- $token ) )
   
   fi
 }
@@ -278,7 +278,7 @@ IFS="$OLD_IFS"
   if [[ "$token" == --* ]]; then
     COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -c -f -i -o -s -t -x --age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -c -i -o -s -t -x --age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -331,9 +331,9 @@ _doing_template() {
 _doing_today() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --from --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --from --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -356,9 +356,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -401,9 +401,9 @@ _doing_wiki() {
 _doing_yesterday() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   
   fi
 }

data/lib/doing/string_chronify.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Doing
+  # Chronify methods for strings
+  class ::String
+    ##
+    ## Converts input string into a Time object when input
+    ## takes on the following formats:
+    ##             - interval format e.g. '1d2h30m', '45m'
+    ##               etc.
+    ##             - a semantic phrase e.g. 'yesterday
+    ##               5:30pm'
+    ##             - a strftime e.g. '2016-03-15 15:32:04
+    ##               PDT'
+    ##
+    ## @param      options  Additional options
+    ##
+    ## @option options :future [Boolean] assume future date
+    ##                                   (default: false)
+    ##
+    ## @option options :guess  [Symbol] :begin or :end to
+    ##                                   assume beginning or end of
+    ##                                   arbitrary time range
+    ##
+    ## @return     [DateTime] result
+    ##
+    def chronify(**options)
+      now = Time.now
+      raise 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))
+                   # day/hour/minute format e.g. 1d2h30m
+                   [[m['day'], 24 * 3600],
+                    [m['hour'], 3600],
+                    [m['min'], 60]].map { |qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
+                 end
+
+      if secs_ago
+        now - secs_ago
+      else
+        Chronic.parse(self, { guess: options.fetch(:guess, :begin), context: options.fetch(:future, false) ? :future : :past, ambiguous_time_range: 8 })
+      end
+    end
+
+    ##
+    ## Converts simple strings into seconds that can be
+    ## added to a Time object
+    ##
+    ## Input string can be HH:MM or XX[dhm][[XXhm][XXm]]
+    ## (1d2h30m, 45m, 1.5d, 1h20m, etc.)
+    ##
+    ## @return     [Integer] seconds
+    ##
+    def chronify_qty
+      minutes = 0
+      case self.strip
+      when /^(\d+):(\d\d)$/
+        minutes += Regexp.last_match(1).to_i * 60
+        minutes += Regexp.last_match(2).to_i
+      when /^(\d+(?:\.\d+)?)([hmd])?$/
+        amt = Regexp.last_match(1)
+        type = Regexp.last_match(2).nil? ? 'm' : Regexp.last_match(2)
+
+        minutes = case type.downcase
+                  when 'm'
+                    amt.to_i
+                  when 'h'
+                    (amt.to_f * 60).round
+                  when 'd'
+                    (amt.to_f * 60 * 24).round
+                  else
+                    minutes
+                  end
+      end
+      minutes * 60
+    end
+  end
+end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.0pre'
+  VERSION = '2.1.1pre'
 end

data/lib/doing/wwid.rb

@@ -190,7 +190,7 @@ module Doing
         m = Regexp.last_match
         t = m['tag']
         d = m['date']
-        parsed_date = d =~ date_rx ? Time.parse(d) : chronify(d, guess: :begin)
+        parsed_date = d =~ date_rx ? Time.parse(d) : d.chronify(guess: :begin)
         parsed_date.nil? ? m[0] : "@#{t}(#{parsed_date.strftime('%F %R')})"
       end
 
@@ -200,7 +200,7 @@ module Doing
         date = if d =~ iso_rx
                  Time.parse(d)
                else
-                 chronify(d, guess: :begin)
+                 d.chronify(guess: :begin)
                end
         title.sub!(date_rx, '').strip!
       end
@@ -222,71 +222,6 @@ module Doing
       [date, title, note]
     end
 
-    ##
-    ## Converts input string into a Time object when input takes on the
-    ##             following formats:
-    ##             - interval format e.g. '1d2h30m', '45m' etc.
-    ##             - a semantic phrase e.g. 'yesterday 5:30pm'
-    ##             - a strftime e.g. '2016-03-15 15:32:04 PDT'
-    ##
-    ## @param      input  [String] String to chronify
-    ##
-    ## @return     [DateTime] result
-    ##
-    def chronify(input, future: false, guess: :begin)
-      now = Time.now
-      raise InvalidTimeExpression, "Invalid time expression #{input.inspect}" if input.to_s.strip == ''
-
-      secs_ago = if input.match(/^(\d+)$/)
-                   # plain number, assume minutes
-                   Regexp.last_match(1).to_i * 60
-                 elsif (m = input.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],
-                    [m['min'], 60]].map { |qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
-                 end
-
-      if secs_ago
-        now - secs_ago
-      else
-        Chronic.parse(input, { guess: guess, context: future ? :future : :past, ambiguous_time_range: 8 })
-      end
-    end
-
-    ##
-    ## Converts simple strings into seconds that can be added to a Time
-    ##             object
-    ##
-    ## @param      qty   [String] HH:MM or XX[dhm][[XXhm][XXm]] (1d2h30m, 45m,
-    ##                   1.5d, 1h20m, etc.)
-    ##
-    ## @return     [Integer] seconds
-    ##
-    def chronify_qty(qty)
-      minutes = 0
-      case qty.strip
-      when /^(\d+):(\d\d)$/
-        minutes += Regexp.last_match(1).to_i * 60
-        minutes += Regexp.last_match(2).to_i
-      when /^(\d+(?:\.\d+)?)([hmd])?$/
-        amt = Regexp.last_match(1)
-        type = Regexp.last_match(2).nil? ? 'm' : Regexp.last_match(2)
-
-        minutes = case type.downcase
-                  when 'm'
-                    amt.to_i
-                  when 'h'
-                    (amt.to_f * 60).round
-                  when 'd'
-                    (amt.to_f * 60 * 24).round
-                  else
-                    minutes
-                  end
-      end
-      minutes * 60
-    end
-
     ##
     ## List sections
     ##
@@ -661,12 +596,55 @@ module Doing
     ## @option opt [String] :age  ('old' or 'new')
     ##
     def filter_items(items = Items.new, opt: {})
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+
       if items.nil? || items.empty?
         section = opt[:section] ? guess_section(opt[:section]) : 'All'
-
         items = section =~ /^all$/i ? @content.dup : @content.in_section(section)
       end
 
+      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
+        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'}")
+        end
+      end
+
+      if opt[:before] =~ time_rx
+        opt[:time_filter][1] = opt[:before]
+        opt[:before] = nil
+      end
+
+      if opt[:after] =~ time_rx
+        opt[:time_filter][0] = opt[:after]
+        opt[:after] = nil
+      end
+
       items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
 
       filtered_items = items.select do |item|
@@ -708,6 +686,26 @@ module Doing
           keep = opt[:not] ? !keep : keep
         end
 
+        if keep && opt[:time_filter][0] || opt[:time_filter][1]
+          start_string = if opt[:time_filter][0].nil?
+                           "#{item.date.strftime('%Y-%m-%d')} 12am"
+                         else
+                           "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
+                         end
+          start_time = start_string.chronify(guess: :begin)
+
+          end_string = if opt[:time_filter][1].nil?
+                         "#{item.date.next_day.strftime('%Y-%m-%d')} 12am"
+                       else
+                         "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
+                       end
+          end_time = end_string.chronify(guess: :end)
+
+          in_time_range = item.date >= start_time && item.date <= end_time
+          keep = false unless in_time_range
+          keep = opt[:not] ? !keep : keep
+        end
+
         keep = false if keep && opt[:only_timed] && !item.interval
 
         if keep && opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
@@ -717,14 +715,22 @@ module Doing
 
         if keep && opt[:before]
           time_string = opt[:before]
-          cutoff = chronify(time_string, guess: :begin)
+          if time_string =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :begin)
+          else
+            cutoff = time_string.chronify(guess: :begin)
+          end
           keep = cutoff && item.date <= cutoff
           keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:after]
           time_string = opt[:after]
-          cutoff = chronify(time_string, guess: :end)
+          if time_string =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :end)
+          else
+            cutoff = time_string.chronify(guess: :end)
+          end
           keep = cutoff && item.date >= cutoff
           keep = opt[:not] ? !keep : keep
         end
@@ -760,7 +766,7 @@ module Doing
     ## Options hash is shared with #filter_items and #act_on
     ##
     def interactive(opt = {})
-      section = opt[:section] ? guess_section(opt[:section]) : 'All'
+      opt[:section] = opt[:section] ? guess_section(opt[:section]) : 'All'
 
       search = nil
 
@@ -774,9 +780,12 @@ module Doing
       opt[:query] = "!#{opt[:query]}" if opt[:not]
       opt[:multiple] = true
       opt[:show_if_single] = true
-      items = filter_items(Items.new, opt: { section: section, search: opt[:search], fuzzy: opt[:fuzzy], case: opt[:case], not: opt[:not] })
+      filter_options = %i[after before case date_filter from fuzzy not search section].each_with_object({}) {
+        |k, hsh| hsh[k] = opt[k]
+      }
+      items = filter_items(Items.new, opt: filter_options)
 
-      selection = Prompt.choose_from_items(items, include_section: section =~ /^all$/i, **opt)
+      selection = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **opt)
 
       raise NoResults, 'no items selected' if selection.nil? || selection.empty?
 
@@ -1336,7 +1345,7 @@ module Doing
         break if counter >= max
         if opt[:before]
           time_string = opt[:before]
-          cutoff = chronify(time_string, guess: :begin)
+          cutoff = time_string.chronify(guess: :begin)
         end
 
         unless ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
@@ -1524,10 +1533,12 @@ module Doing
         'order' => @config['order'] || 'asc',
         'tags_color' => @config['tags_color']
       })
+
       options = {
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        from: opt[:from],
         format: cfg['date_format'],
         order: cfg['order'] || 'asc',
         output: output,
@@ -1584,6 +1595,7 @@ module Doing
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        from: opt[:from],
         order: opt[:order],
         output: output,
         section: section,
@@ -2044,7 +2056,7 @@ EOS
         break if counter >= max
         if opt[:before]
           time_string = opt[:before]
-          cutoff = chronify(time_string, guess: :begin)
+          cutoff = time_string.chronify(guess: :begin)
         end
 
         if (item.section.downcase != section.downcase && section != /^all$/i) || item.section.downcase == destination.downcase

data/lib/doing.rb

@@ -17,6 +17,7 @@ require 'safe_yaml/load'
 require 'doing/hash'
 require 'doing/colors'
 require 'doing/string'
+require 'doing/string_chronify'
 require 'doing/time'
 require 'doing/array'
 require 'doing/symbol'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.0pre
+  version: 2.1.1pre
 platform: ruby
 authors:
 - Brett Terpstra
@@ -444,6 +444,7 @@ files:
 - lib/doing/prompt.rb
 - lib/doing/section.rb
 - lib/doing/string.rb
+- lib/doing/string_chronify.rb
 - lib/doing/symbol.rb
 - lib/doing/time.rb
 - lib/doing/util.rb