doing 1.0.69 → 1.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf5235acbab516c74ea7ff28c610dcbc49b9d9f108056c1b3c60ac0100bd9ec5
-  data.tar.gz: ca6abc5bd66a950d78ab16aabc781660b0ea5ee3f6dc50bb8a9fd0b986cce21e
+  metadata.gz: 652cc285b42ce068d4640a6aff95d2058d1fba60715e41ce4599bfcbe7051507
+  data.tar.gz: 7a940801f8fa9d78b27688b6c92f4fcdb4b5765c28888cb6f1218245d4535376
 SHA512:
-  metadata.gz: b9f62baa0a4348212c54c1f9f3aa5bca041d81bc5061221310a85747b05c0b9b7af9036d309fcffd78e192a7a415f462ceeb96f8c276cef320249651f4890d35
-  data.tar.gz: cc61feaf78e9a3d6865bbb3d5fecdff00659b9b00a7430971012bfca0856e45ee87efd864dde603a7a6e6abf6a571f01f0e8d60afbbb7ebe060364f65c908b6b
+  metadata.gz: df8f8c529b18238a5d069b79c9e43382f2751d18f1dd022e7d918467f31dadd6b6a50780034b516d4d9b321ddcc4d3ebb7a40db9b96a4059adf49eda119663f9
+  data.tar.gz: b67333df19e976fe0cbde7645c6cc8a9098813a023090f7e52bd60052283202f2dff8406beacb28d921d7c947dac2d885caab7fe3388c578a17b73181a4cbbc5

data/README.md

@@ -25,11 +25,9 @@ While I'm working, I have hourly reminders to record what I'm working on, and I
 
 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.
 
-_Side note:_ I actually use the library behind this utility as part of another script that mirrors entries in [Day One](http://dayoneapp.com) that have the tag `wwid`. I can use the hourly writing reminders and enter my stuff in the quick entry popup. Someday I'll get around to cleaning that up and putting it out there.
-
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.68<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.73<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -538,7 +536,7 @@ If you have a use for it, you can use `-o csv` on the show or view commands to o
 
 `doing yesterday` is great for stand-ups (thanks to [Sean Collins](https://github.com/sc68cal) for that!). Note that you can show yesterday's activity from an alternate section by using the section name as an argument (e.g. `doing yesterday archive`).
 
-`doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend).
+`doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend). There's also `doing since` a simple alias for `doing on PAST_DATE to now`, e.g. `doing since monday`.
 
 You can also show entries matching a search string with `doing grep` (synonym `doing search`). If you want to search with regular expressions or for an exact match, surround your search query with forward slashes, e.g. `doing search /project name/`. If you pass a search string without slashes, it's treated as a fuzzy search string, meaning matches can be found as long as the characters in the search string are in order and with no more than three other characters between each. By default searches are across all sections, but you can limit it to one with the `-s SECTION_NAME` flag. Searches can be displayed with the default template, or output as HTML, CSV, or JSON.
 
@@ -619,6 +617,30 @@ Now you can run `doing import --type timing -s SECTION PATH`, where SECTION is t
     # Import to default section (Currently) and prefix entries with '[Imported]'
     doing import --prefix="[Imported]" "~/Desktop/All Activities.json"
 
+#### Interactive Usage
+
+If you have `fzf` installed (<https://github.com/junegunn/fzf>), you can use `doing select` to get a menu of all your items (or items in a given section) which can be searched with fuzzy matching. The menu allows multiple selections to be acted on directly.
+
+To use the menu, type a search string or use the arrow keys to navigate up and down. Press tab on an entry you'd like to perform an action on. A marker will show up on the left indicating the entry is selected. Repeat the process and select as many entries as needed. When you hit Return, the selection will be passed back to doing.
+
+Doing can perform several functions with this menu. Not all of doing's features are available, but the core functionality you'd need is there, plus you can open all selected entries in your editor, make changes to them, and when you save and close the entries are updated accordingly. This allows editing of everything from timestamps to tags to notes.
+
+Run `doing help select` for a list of options:
+
+    -a, --archive         - Archive selected items
+    -c, --cancel          - Cancel selected items (add @done without timestamp)
+    -d, --delete          - Delete selected items
+    -e, --editor          - Edit selected item(s)
+    -f, --finish          - Add @done with current time to selected item(s)
+    --flag                - Add flag to selected item(s)
+    -m, --move=SECTION    - Move selected items to section (default: none)
+    -s, --section=SECTION - Select from a specific section (default: none)
+    -t, --tag=TAG         - Tag selected entries (default: none)
+
+For example, `doing select -d -a` would present the menu, and then mark selected entries as @done (with timestamp) and move them to the Archive section.
+
+Multiple actions can be performed at once by combining options. You can also combine the `--editor` switch with any other options. Other actions will be performed first, then the entries --- with any modifications performed --- will be presented in the editor for tweaking.
+
 ---
 
 ## Extras

data/bin/doing

@@ -79,7 +79,7 @@ command %i[now next] do |c|
     if options[:back]
       date = wwid.chronify(options[:back])
 
-      raise 'Unable to parse date string' if date.nil?
+      exit_now! 'Unable to parse date string' if date.nil?
     else
       date = Time.now
     end
@@ -87,13 +87,13 @@ command %i[now next] do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero?)
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = ''
       input += args.join(' ') unless args.empty?
       input = wwid.fork_editor(input).strip
 
-      raise 'No content' if input.empty?
+      exit_now! 'No content' if input.empty?
 
       title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
@@ -111,7 +111,7 @@ command %i[now next] do |c|
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
     else
-      raise 'You must provide content when creating a new entry'
+      exit_now! 'You must provide content when creating a new entry'
     end
   end
 end
@@ -138,7 +138,7 @@ command :note do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero? && !options[:r])
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = !args.empty? ? args.join(' ') : ''
 
@@ -147,11 +147,11 @@ command :note do |c|
       input = prev_input + input
 
       input = wwid.fork_editor(input).strip
-      raise 'No content, cancelled' unless input
+      exit_now! 'No content, cancelled' unless input
 
       _title, note = wwid.format_input(input)
 
-      raise 'No note content' unless note
+      exit_now! 'No note content' unless note
 
       wwid.note_last(section, note, replace: true)
     elsif !args.empty?
@@ -165,7 +165,7 @@ command :note do |c|
     elsif options[:r]
       wwid.note_last(section, [], replace: true)
     else
-      raise 'You must provide content when adding a note'
+      exit_now! 'You must provide content when adding a note'
     end
     wwid.write(wwid.doing_file)
   end
@@ -196,7 +196,7 @@ command :meanwhile do |c|
     if options[:back]
       date = wwid.chronify(options[:back])
 
-      raise 'Unable to parse date string' if date.nil?
+      exit_now! 'Unable to parse date string' if date.nil?
     else
       date = Time.now
     end
@@ -205,7 +205,7 @@ command :meanwhile do |c|
     input = ''
 
     if options[:e]
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input += args.join(' ') unless args.empty?
       input = wwid.fork_editor(input).strip
@@ -243,19 +243,64 @@ long_desc %(
 arg_name 'TYPE', must_match: /^(?:html|haml|css)/i
 command :template do |c|
   c.action do |_global_options, options, args|
-    raise 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
+    exit_now! 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
 
-    case options[:t]
+    case args[0]
     when /html|haml/i
       $stdout.puts wwid.haml_template
     when /css/i
       $stdout.puts wwid.css_template
     else
-      raise 'Invalid type specified, must be HAML or CSS'
+      exit_now! 'Invalid type specified, must be HAML or CSS'
     end
   end
 end
 
+desc 'Display an interactive menu to perform operations (requires fzf)'
+long_desc 'Requires that `fzf` be installed and available in your path. <https://github.com/junegunn/fzf>
+
+List all entries and select with typeahead fuzzy matching. Multiple selections are allowed, hit tab to add the highlighted entry to the selection. Return processes the selected entries.'
+command :select do |c|
+  c.desc 'Select from a specific section'
+  c.arg_name 'SECTION'
+  c.flag %i[s section]
+
+  c.desc 'Tag selected entries'
+  c.arg_name 'TAG'
+  c.flag %i[t tag]
+
+  # c.desc 'Add @done to selected item(s), using start time of next item as the finish time'
+  # c.switch %i[a auto], negatable: false, default_value: false
+
+  c.desc 'Archive selected items'
+  c.switch %i[a archive], negatable: false, default_value: false
+
+  c.desc 'Move selected items to section'
+  c.arg_name 'SECTION'
+  c.flag %i[m move]
+
+  c.desc 'Cancel selected items (add @done without timestamp)'
+  c.switch %i[c cancel], negatable: false, default_value: false
+
+  c.desc 'Delete selected items'
+  c.switch %i[d delete], negatable: false, default_value: false
+
+  c.desc 'Edit selected item(s)'
+  c.switch %i[e editor], negatable: false, default_value: false
+
+  c.desc 'Add @done with current time to selected item(s)'
+  c.switch %i[f finish], negatable: false, default_value: false
+
+  c.desc 'Add flag to selected item(s)'
+  c.switch %i[flag], negatable: false, default_value: false
+
+  c.action do |_global_options, options, args|
+    section = options[:section] || 'All'
+    edit = options[:editor]
+    wwid.interactive(options)
+  end
+end
+
 desc 'Add an item to the Later section'
 arg_name 'ENTRY'
 command :later do |c|
@@ -277,17 +322,17 @@ command :later do |c|
   c.action do |_global_options, options, args|
     if options[:back]
       date = wwid.chronify(options[:back])
-      raise 'Unable to parse date string' if date.nil?
+      exit_now! 'Unable to parse date string' if date.nil?
     else
       date = Time.now
     end
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero?)
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = args.empty? ? '' : args.join(' ')
       input = wwid.fork_editor(input).strip
-      raise 'No content' unless input && !input.empty?
+      exit_now! 'No content' unless input && !input.empty?
 
       title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
@@ -304,7 +349,7 @@ command :later do |c|
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
-      raise 'You must provide content when creating a new entry'
+      exit_now! 'You must provide content when creating a new entry'
     end
   end
 end
@@ -352,23 +397,23 @@ command %i[done did] do |c|
 
     if options[:took]
       took = wwid.chronify_qty(options[:took])
-      raise 'Unable to parse date string for --took' if took.nil?
+      exit_now! 'Unable to parse date string for --took' if took.nil?
     end
 
     if options[:back]
       date = wwid.chronify(options[:back])
-      raise 'Unable to parse date string for --back' if date.nil?
+      exit_now! 'Unable to parse date string for --back' if date.nil?
     else
       date = options[:took] ? Time.now - took : Time.now
     end
 
     if options[:at]
       finish_date = wwid.chronify(options[:at])
-      raise 'Unable to parse date string for --at' if finish_date.nil?
+      exit_now! 'Unable to parse date string for --at' if finish_date.nil?
 
       date = options[:took] ? finish_date - took : finish_date
     elsif options[:took]
-      finish_date = options[:back] ? date + took : nil
+      finish_date = date + took
     elsif options[:back]
       finish_date = date
     else
@@ -382,12 +427,12 @@ command %i[done did] do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     if options[:e]
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = ''
       input += args.join(' ') unless args.empty?
       input = wwid.fork_editor(input).strip
-      raise 'No content' unless input && !input.empty?
+      exit_now! 'No content' unless input && !input.empty?
 
       title, note = wwid.format_input(input)
       title += " @done#{donedate}"
@@ -422,7 +467,7 @@ command %i[done did] do |c|
       wwid.add_item(title.cap_first, section.cap_first, { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
-      raise 'You must provide content when creating a new entry'
+      exit_now! 'You must provide content when creating a new entry'
     end
   end
 end
@@ -468,9 +513,9 @@ command :cancel do |c|
                        end
     end
 
-    raise 'Only one argument allowed' if args.length > 1
+    exit_now! 'Only one argument allowed' if args.length > 1
 
-    raise 'Invalid argument (specify number of recent items to mark @done)' unless args.empty? || args[0] =~ /\d+/
+    exit_now! 'Invalid argument (specify number of recent items to mark @done)' unless args.empty? || args[0] =~ /\d+/
 
     count = args[0] ? args[0].to_i : 1
     opts = {
@@ -535,14 +580,14 @@ command :finish do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     unless options[:auto]
-      raise '--back and --took cannot be used together' if options[:back] && options[:took]
+      exit_now! '--back and --took cannot be used together' if options[:back] && options[:took]
 
-      raise '--search and --tag cannot be used together' if options[:search] && options[:tag]
+      exit_now! '--search and --tag cannot be used together' if options[:search] && options[:tag]
 
       if options[:back]
         date = wwid.chronify(options[:back])
 
-        raise 'Unable to parse date string' if date.nil?
+        exit_now! 'Unable to parse date string' if date.nil?
       elsif options[:took]
         date = wwid.chronify_qty(options[:took])
       else
@@ -566,9 +611,9 @@ command :finish do |c|
                              end
     end
 
-    raise 'Only one argument allowed' if args.length > 1
+    exit_now! 'Only one argument allowed' if args.length > 1
 
-    raise 'Invalid argument (specify number of recent items to mark @done)' unless args.length == 0 || args[0] =~ /\d+/
+    exit_now! 'Invalid argument (specify number of recent items to mark @done)' unless args.length == 0 || args[0] =~ /\d+/
 
     count = args[0] ? args[0].to_i : 1
     opts = {
@@ -650,6 +695,9 @@ command :tag do |c|
   c.arg_name 'COUNT'
   c.flag %i[c count], default_value: 1
 
+  c.desc 'Don\'t ask permission to tag all entries when count is 0'
+  c.switch %i[force], negatable: false, default_value: false
+
   c.desc 'Include current date/time with tag'
   c.switch %i[d date], negatable: false, default_value: false
 
@@ -662,12 +710,48 @@ command :tag do |c|
   c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
   c.switch %i[a autotag], negatable: false, default_value: false
 
+  c.desc 'Tag the last X entries containing TAG.
+  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool'
+  c.arg_name 'TAG'
+  c.flag [:tag]
+
+  c.desc 'Tag entries matching search filter, surround with slashes for regex (e.g. "/query.*/")'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.arg_name 'BOOLEAN'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
+
   c.action do |_global_options, options, args|
-    raise 'You must specify at least one tag' if args.empty? && !options[:a]
+    exit_now! 'You must specify at least one tag' if args.empty? && !options[:a]
+
+    exit_now! '--search and --tag cannot be used together' if options[:search] && options[:tag]
+
+    section = 'All'
+
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
-    if options[:a]
+    if options[:tag].nil?
+      search_tags = []
+    else
+      search_tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
+      options[:bool] = case options[:bool]
+                             when /(and|all)/i
+                              'AND'
+                             when /(any|or)/i
+                              'OR'
+                             when /(not|none)/i
+                              'NOT'
+                             else
+                              'AND'
+                             end
+    end
+
+    if options[:autotag]
       tags = []
     else
       tags = if args.join('') =~ /,/
@@ -679,10 +763,19 @@ command :tag do |c|
       tags.map! { |tag| tag.sub(/^@/, '').strip }
     end
 
-    count = options[:c].to_i
+    count = options[:count].to_i
+
+    if count.zero? && !options[:force]
+      if options[:search]
+        section_q = ' matching your search terms'
+      elsif options[:tag]
+        section_q = ' matching your tag search'
+      elsif section == 'All'
+        section_q = ''
+      else
+        section_q = " in section #{section}"
+      end
 
-    if count.zero?
-      section_q = section == 'All' ? '' : " in section #{section}"
 
       question = if options[:a]
                    "Are you sure you want to autotag all records#{section_q}"
@@ -694,14 +787,18 @@ command :tag do |c|
 
       res = wwid.yn(question, default_response: false)
 
-      raise 'Cancelled' unless res
+      exit_now! 'Cancelled' unless res
     end
+
     opts = {
       autotag: options[:a],
       count: count,
       date: options[:date],
       remove: options[:r],
+      search: options[:search],
       section: section,
+      tag: search_tags,
+      tag_bool: options[:bool],
       tags: tags,
       unfinished: options[:unfinished]
     }
@@ -768,10 +865,10 @@ command :show do |c|
   c.flag %i[f from]
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -800,7 +897,7 @@ command :show do |c|
         section = 'All'
       else
         section = wwid.guess_section(args[0])
-        raise "No such section: #{args[0]}" unless section
+        exit_now! "No such section: #{args[0]}" unless section
 
         args.shift
       end
@@ -890,10 +987,10 @@ command [:grep, :search] do |c|
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -937,10 +1034,10 @@ command :recent do |c|
   c.flag %i[s section], default_value: 'All'
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -977,10 +1074,10 @@ command :today do |c|
   c.flag %i[s section], default_value: 'All'
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -1012,10 +1109,10 @@ command :on do |c|
   c.flag %i[s section], default_value: 'All'
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -1055,6 +1152,55 @@ command :on do |c|
   end
 end
 
+desc 'List entries since a date'
+long_desc %(Date argument can be natural language and are always interpreted as being in the past. "thursday" would be interpreted as "last thursday,"
+and "2d" would be interpreted as "two days ago.")
+arg_name 'DATE_STRING'
+command :since do |c|
+  c.desc 'Section'
+  c.arg_name 'NAME'
+  c.flag %i[s section], default_value: 'All'
+
+  c.desc 'Show time intervals on @done tasks'
+  c.switch %i[t times], default_value: true, negatable: true
+
+  c.desc 'Show time totals at the end of output'
+  c.switch [:totals], default_value: false, negatable: false
+
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
+  c.arg_name 'KEY'
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+
+  c.desc 'Output to export format (csv|html|json|template|timeline)'
+  c.arg_name 'FORMAT'
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
+
+  c.action do |_global_options, options, args|
+    exit_now! 'Missing date argument' if args.empty?
+
+    date_string = args.join(' ')
+
+    date_string += ' at midnight' unless date_string =~ /(\d:|\d *[ap]m?|midnight|noon)/i
+    date_string.sub!(/(day) (\d)/, '\1 at \2') if date_string =~ /day \d/
+
+    start = wwid.chronify(date_string)
+    finish = Time.now
+
+    exit_now! 'Unrecognized date string' unless start
+
+    message = "Date interpreted as #{start} through the current time"
+    wwid.results.push(message)
+
+    options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+
+    puts wwid.list_date([start, finish], options[:s], options[:t], options[:output],
+                        { totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+  end
+end
+
 desc 'List entries from yesterday'
 command :yesterday do |c|
   c.desc 'Specify a section'
@@ -1066,10 +1212,10 @@ command :yesterday do |c|
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
@@ -1106,7 +1252,7 @@ command :last do |c|
   c.flag [:search]
 
   c.action do |_global_options, options, _args|
-    raise '--tag and --search cannot be used together' if options[:tag] && options[:search]
+    exit_now! '--tag and --search cannot be used together' if options[:tag] && options[:search]
 
     if options[:tag].nil?
       tags = []
@@ -1155,7 +1301,7 @@ desc 'Add a new section to the "doing" file'
 arg_name 'SECTION_NAME'
 command :add_section do |c|
   c.action do |_global_options, _options, args|
-    raise "Section #{args[0]} already exists" if wwid.sections.include?(args[0])
+    exit_now! "Section #{args[0]} already exists" if wwid.sections.include?(args[0])
 
     wwid.add_section(args[0].cap_first)
     wwid.write(wwid.doing_file)
@@ -1196,10 +1342,10 @@ command :view do |c|
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true
+  c.switch %i[t times], default_value: true, negatable: true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: true
+  c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Include colors in output'
   c.switch [:color], default_value: true, negatable: true
@@ -1211,7 +1357,7 @@ command :view do |c|
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
-  c.switch [:only_timed], default_value: false, negatable: true
+  c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |_global_options, options, args|
     title = if args.empty?
@@ -1283,7 +1429,7 @@ command :view do |c|
     elsif title.instance_of?(FalseClass)
       exit_now! 'Cancelled'
     else
-      raise "View #{title} not found in config"
+      exit_now! "View #{title} not found in config"
     end
   end
 end
@@ -1340,7 +1486,7 @@ command :archive do |c|
       tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : []
     end
 
-    raise '--keep and --count can\'t be used together' if options[:keep] && options[:count]
+    exit_now! '--keep and --count can\'t be used together' if options[:keep] && options[:count]
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
@@ -1391,7 +1537,7 @@ command :open do |c|
       elsif options[:b]
         system %(open -b "#{options[:b]}" "#{File.expand_path(wwid.doing_file)}")
       elsif options[:e]
-        raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+        exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
         system %($EDITOR "#{File.expand_path(wwid.doing_file)}")
       elsif wwid.config.key?('editor_app') && !wwid.config['editor_app'].nil?
@@ -1401,7 +1547,7 @@ command :open do |c|
       end
 
     else
-      raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       system %($EDITOR "#{File.expand_path(wwid.doing_file)}")
     end
@@ -1438,13 +1584,13 @@ command :config do |c|
           `open -b #{options[:b]} "#{wwid.config_file}"`
         end
       else
-        raise 'No EDITOR variable defined in environment' if options[:e].nil? && ENV['EDITOR'].nil?
+        exit_now! 'No EDITOR variable defined in environment' if options[:e].nil? && ENV['EDITOR'].nil?
 
         editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
         system %(#{editor} "#{wwid.config_file}")
       end
     else
-      raise 'No EDITOR variable defined in environment' if options[:e].nil? && ENV['EDITOR'].nil?
+      exit_now! 'No EDITOR variable defined in environment' if options[:e].nil? && ENV['EDITOR'].nil?
 
       editor = options[:e].nil? ? ENV['EDITOR'] : options[:e]
       system %(#{editor} "#{wwid.config_file}")
@@ -1497,7 +1643,7 @@ command :import do |c|
         wwid.write(wwid.doing_file)
       end
     else
-      raise 'Invalid import type'
+      exit_now! 'Invalid import type'
     end
   end
 end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.69'
+  VERSION = '1.0.74'
 end

data/lib/doing/wwid.rb

@@ -3,6 +3,7 @@
 require 'deep_merge'
 require 'open3'
 require 'pp'
+require 'shellwords'
 
 ##
 ## @brief      Main "What Was I Doing" methods
@@ -72,7 +73,7 @@ class WWID
     rescue StandardError
       @config = {}
       @local_config = {}
-      # raise "error reading config"
+      # exit_now! "error reading config"
     end
   end
 
@@ -157,7 +158,7 @@ class WWID
 
     # if ENV['DOING_DEBUG'].to_i == 3
     #   if @config['default_tags'].length > 0
-    #     raise "DEFAULT CONFIG CHANGED"
+    #     exit_now! "DEFAULT CONFIG CHANGED"
     #   end
     # end
 
@@ -292,7 +293,7 @@ class WWID
       if $?.exitstatus == 0
         input = IO.read(tmpfile.path)
       else
-        raise 'Cancelled'
+        exit_now! 'Cancelled'
       end
     ensure
       tmpfile.close
@@ -310,16 +311,16 @@ class WWID
   # @param      input  (String) The string to parse
   #
   def format_input(input)
-    raise 'No content in entry' if input.nil? || input.strip.empty?
+    exit_now! 'No content in entry' if input.nil? || input.strip.empty?
 
     input_lines = input.split(/[\n\r]+/).delete_if {|line| line =~ /^#/ || line =~ /^\s*$/ }
     title = input_lines[0]&.strip
-    raise 'No content in first line' if title.nil? || title.strip.empty?
+    exit_now! 'No content in first line' if title.nil? || title.strip.empty?
 
     note = input_lines.length > 1 ? input_lines[1..-1] : []
     # If title line ends in a parenthetical, use that as the note
-    if note.empty? && title =~ /\(.*?\)$/
-      title.sub!(/\((.*?)\)$/) do
+    if note.empty? && title =~ /\s+\(.*?\)$/
+      title.sub!(/\s+\((.*?)\)$/) do
         m = Regexp.last_match
         note.push(m[1])
         ''
@@ -345,7 +346,7 @@ class WWID
   #
   def chronify(input)
     now = Time.now
-    raise "Invalid time expression #{input.inspect}" if input.to_s.strip == ''
+    exit_now! "Invalid time expression #{input.inspect}" if input.to_s.strip == ''
 
     secs_ago = if input.match(/^(\d+)$/)
                  # plain number, assume minutes
@@ -437,7 +438,7 @@ class WWID
     end
     unless section || guessed
       alt = guess_view(frag, true)
-      raise "Did you mean `doing view #{alt}`?" if alt
+      exit_now! "Did you mean `doing view #{alt}`?" if alt
 
       res = yn("Section #{frag} not found, create it", default_response: false)
 
@@ -447,7 +448,7 @@ class WWID
         return frag.cap_first
       end
 
-      raise "Unknown section: #{frag}"
+      exit_now! "Unknown section: #{frag}"
     end
     section ? section.cap_first : guessed
   end
@@ -517,9 +518,9 @@ class WWID
     unless view || guessed
       alt = guess_section(frag, guessed: true)
       if alt
-        raise "Did you mean `doing show #{alt}`?"
+        exit_now! "Did you mean `doing show #{alt}`?"
       else
-        raise "Unknown view: #{frag}"
+        exit_now! "Unknown view: #{frag}"
       end
     end
     view
@@ -630,7 +631,7 @@ class WWID
 
     add_tags = opt[:tag] ? opt[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '@') }.join(' ') : ''
     prefix = opt[:prefix] ? opt[:prefix] : '[Timing.app]'
-    raise "File not found" unless File.exist?(File.expand_path(path))
+    exit_now! "File not found" unless File.exist?(File.expand_path(path))
 
     data = JSON.parse(IO.read(File.expand_path(path)))
     new_items = []
@@ -687,7 +688,7 @@ class WWID
       section = combined['items'].dup.sort_by { |item| item['date'] }.reverse[0]['section']
     end
 
-    raise "Section #{section} not found" unless @content.key?(section)
+    exit_now! "Section #{section} not found" unless @content.key?(section)
 
     last_item = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse[0]
     warn "Editing note for #{last_item['title']}"
@@ -765,13 +766,136 @@ class WWID
     all_items.max_by { |item| item['date'] }
   end
 
+
+  ##
+  ## @brief      Display an interactive menu of entries
+  ##
+  ## @param      opt   (Hash) Additional options
+  ##
+  def interactive(opt = {})
+    exit_now! "Select command requires that fzf be installed" unless exec_available('fzf')
+
+    section = opt[:section] ? guess_section(opt[:section]) : 'All'
+
+
+    if section =~ /^all$/i
+      combined = { 'items' => [] }
+      @content.each do |_k, v|
+        combined['items'] += v['items']
+      end
+      items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
+    else
+      items = @content[section]['items']
+    end
+
+
+    options = items.map.with_index do |item, i|
+      out = [
+        i,
+        ') ',
+        item['date'],
+        ' | ',
+        item['title'],
+      ]
+      if opt[:section] =~ /^all/i
+        out.concat([
+          ' (',
+          item['section'],
+          ') '
+        ])
+      end
+      out.join('')
+    end
+
+    res = `echo #{Shellwords.escape(options.join("\n"))}|fzf -m`
+    selected = []
+    res.split(/\n/).each do |item|
+      idx = item.match(/^(\d+)\)/)[1].to_i
+      selected.push(items[idx])
+    end
+
+    if selected.empty?
+      @results.push("No selection")
+      return
+    end
+
+    if opt[:delete]
+      res = yn("Delete #{selected.size} items?", default_response: 'y')
+      if res
+        selected.each {|item| delete_item(item) }
+        write(@doing_file)
+      end
+      return
+    end
+
+    if opt[:flag]
+      tag = @config['marker_tag'] || 'flagged'
+      selected.map! {|item| tag_item(item, tag, date: false) }
+    end
+
+    if opt[:finish] || opt[:cancel]
+      tag = 'done'
+      selected.map! {|item| tag_item(item, tag, date: !opt[:cancel])}
+    end
+
+    if opt[:tag]
+      tag = opt[:tag]
+      selected.map! {|item| tag_item(item, tag, date: false)}
+    end
+
+    if opt[:archive] || opt[:move]
+      section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
+      selected.map! {|item| move_item(item, section) }
+    end
+
+    write(@doing_file)
+
+    if opt[:editor]
+
+      editable_items = []
+
+      selected.each do |item|
+        editable = "#{item['date']} | #{item['title']}"
+        old_note = item['note'] ? item['note'].map(&:strip).join("\n") : nil
+        editable += "\n#{old_note}" unless old_note.nil?
+        editable_items << editable
+      end
+
+      new_items = fork_editor(editable_items.join("\n---\n") + "\n\n# You may delete entries, but leave all --- lines in place").split(/\n---\n/)
+
+      new_items.each_with_index do |new_item, i|
+        input_lines = new_item.split(/[\n\r]+/).delete_if {|line| line =~ /^#/ || line =~ /^\s*$/ }
+        title = input_lines[0]&.strip
+        if title.nil? || title =~ /^---$/ || title.strip.empty?
+          delete_item(selected[i])
+        else
+          note = input_lines.length > 1 ? input_lines[1..-1] : []
+
+          note.map!(&:strip)
+          note.delete_if { |line| line =~ /^\s*$/ || line =~ /^#/ }
+
+          date = title.match(/^([\d\-: ]+) \| /)[1]
+          title.sub!(/^([\d\-: ]+) \| /, '')
+
+          item = selected[i].dup
+          item['title'] = title
+          item['note'] = note
+          item['date'] = Time.parse(date)
+          update_item(selected[i], item)
+        end
+      end
+
+      write(@doing_file)
+    end
+  end
+
   ##
   ## @brief      Tag the last entry or X entries
   ##
   ## @param      opt   (Hash) Additional Options
   ##
   def tag_last(opt = {})
-    opt[:section] ||= @current_section
+    opt[:section] ||= nil
     opt[:count] ||= 1
     opt[:archive] ||= false
     opt[:tags] ||= ['done']
@@ -786,7 +910,11 @@ class WWID
     sec_arr = []
 
     if opt[:section].nil?
-      sec_arr = [@current_section]
+      if opt[:search] || opt[:tag]
+        sec_arr = sections
+      else
+        sec_arr = [@current_section]
+      end
     elsif opt[:section].instance_of?(String)
       if opt[:section] =~ /^all$/i
         if opt[:count] == 1
@@ -797,7 +925,11 @@ class WWID
           items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
           sec_arr.push(items[0]['section'])
         elsif opt[:count] > 1
-          raise 'A count greater than one requires a section to be specified'
+          if opt[:search] || opt[:tag]
+            sec_arr = sections
+          else
+            exit_now! 'A count greater than one requires a section to be specified'
+          end
         else
           sec_arr = sections
         end
@@ -834,12 +966,6 @@ class WWID
               if opt[:sequential]
                 done_date = next_start - 1
                 next_start = item['date']
-              elsif opt[:back]
-                if opt[:back].is_a? Integer
-                  done_date = item['date'] + opt[:back]
-                else
-                  done_date = item['date'] + (opt[:back] - item['date'])
-                end
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -847,6 +973,12 @@ class WWID
                 else
                   done_date = item['date'] + opt[:took]
                 end
+              elsif opt[:back]
+                if opt[:back].is_a? Integer
+                  done_date = item['date'] + opt[:back]
+                else
+                  done_date = item['date'] + (opt[:back] - item['date'])
+                end
               else
                 done_date = Time.now
               end
@@ -897,13 +1029,78 @@ class WWID
           @results.push('Archiving is skipped when operating on all entries') if (opt[:count]).zero?
         end
       else
-        raise "Section not found: #{section}"
+        exit_now! "Section not found: #{section}"
       end
     end
 
     write(@doing_file)
   end
 
+  def move_item(item, section)
+    old_section = item['section']
+    new_item = item.dup
+    new_item['section'] = section
+
+    section_items = @content[old_section]['items']
+    section_items.delete(item)
+    @content[old_section]['items'] = section_items
+
+    archive_items = @content[section]['items']
+    archive_items.push(new_item)
+    # archive_items = archive_items.sort_by { |item| item['date'] }
+    @content[section]['items'] = archive_items
+
+    @results.push("Entry moved to #{section}: #{new_item['title']}")
+    return new_item
+  end
+
+  ##
+  ## @brief      Delete an item from the index
+  ##
+  ## @param      old_item
+  ##
+  def delete_item(old_item)
+    section = old_item['section']
+
+    section_items = @content[section]['items']
+    deleted = section_items.delete(old_item)
+    @results.push("Entry deleted: #{deleted['title']}")
+    @content[section]['items'] = section_items
+  end
+
+  ##
+  ## @brief      Tag an item from the index
+  ##
+  ## @param      old_item  (Item) The item to tag
+  ## @param      tag       (string) The tag to apply
+  ## @param      date      (Boolean) Include timestamp?
+  ##
+  def tag_item(old_item, tag, date: false)
+    title = old_item['title'].dup
+    done_date = Time.now
+    if title !~ /@#{tag}/
+      title.chomp!
+      if date
+        title += " @#{tag}(#{done_date.strftime('%F %R')})"
+      else
+        title += " @#{tag}"
+      end
+      new_item = old_item.dup
+      new_item['title'] = title
+      update_item(old_item, new_item)
+      return new_item
+    else
+      @results.push(%(Item already @#{tag}: "#{title}" in #{old_item['section']}))
+      return old_item
+    end
+  end
+
+  ##
+  ## @brief      Update an item in the index with a modified item
+  ##
+  ## @param      old_item  The old item
+  ## @param      new_item  The new item
+  ##
   def update_item(old_item, new_item)
     section = old_item['section']
 
@@ -1002,7 +1199,7 @@ class WWID
       section = combined['items'].dup.sort_by { |item| item['date'] }.reverse[0]['section']
     end
 
-    raise "Section #{section} not found" unless @content.key?(section)
+    exit_now! "Section #{section} not found" unless @content.key?(section)
 
     # sort_section(opt[:section])
     items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
@@ -1238,7 +1435,7 @@ class WWID
       end
     end
 
-    raise 'Invalid section object' unless opt[:section].instance_of? Hash
+    exit_now! 'Invalid section object' unless opt[:section].instance_of? Hash
 
     items = opt[:section]['items'].sort_by { |item| item['date'] }
 
@@ -1288,7 +1485,7 @@ class WWID
 
     out = ''
 
-    raise 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline)$/i)
+    exit_now! 'Unknown output format' if opt[:output] && (opt[:output] !~ /^(template|html|csv|json|timeline)$/i)
 
     case opt[:output]
     when /^csv$/i
@@ -1345,13 +1542,13 @@ class WWID
             'id' => index + 1,
             'content' => title.strip, #+ " #{note}"
             'title' => title.strip + " (#{'%02d:%02d:%02d' % fmt_time(interval)})",
-            'start' => i['date'].strftime('%F'),
+            'start' => i['date'].strftime('%F %T'),
             'type' => 'point'
           }
 
-          if interval && interval > 0
-            new_item['end'] = end_date.strftime('%F')
-            new_item['type'] = 'range' if interval > 3600 * 3
+          if interval && interval.to_i > 0
+            new_item['end'] = end_date.strftime('%F %T')
+            new_item['type'] = 'range' if interval.to_i > 3600 * 3
           end
           items_out.push(new_item)
         end
@@ -1367,8 +1564,8 @@ class WWID
                     <!doctype html>
                     <html>
                     <head>
-                      <link href="http://visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
-                      <script src="http://visjs.org/dist/vis.js"></script>
+                      <link href="https://unpkg.com/vis-timeline@7.4.9/dist/vis-timeline-graph2d.min.css" rel="stylesheet" type="text/css" />
+                      <script src="https://unpkg.com/vis-timeline@7.4.9/dist/vis-timeline-graph2d.min.js"></script>
                     </head>
                     <body>
                       <div id="mytimeline"></div>
@@ -1561,7 +1758,7 @@ class WWID
       do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
       write(doing_file)
     else
-      raise 'Either source or destination does not exist'
+      exit_now! 'Either source or destination does not exist'
     end
   end
 
@@ -2005,4 +2202,12 @@ EOS
     minutes = (minutes % 60).to_i
     [days, hours, minutes]
   end
+
+  def exec_available(cli)
+    if File.exists?(File.expand_path(cli))
+      File.executable?(File.expand_path(cli))
+    else
+      system "which #{cli}", :out => File::NULL, :err => File::NULL
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.69
+  version: 1.0.74
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,16 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement