doing 1.0.78 → 1.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64076f13651c82428d05f490870a3a8a2507dc783cfaeebe7658538523aaef25
-  data.tar.gz: 691df494543c3ff71911a4ca87135adba9504fb445d51180e9c5914372c5d35b
+  metadata.gz: 146bc31206860d02e7f7e3d3d04b12cd84ecf794171af8f25ca679f49c6a98d0
+  data.tar.gz: 994568054f7f905bbe6a1982b00be636a68bac2719b4f6740ce04bf5cbcb208a
 SHA512:
-  metadata.gz: be005b1f54f3e170030f88a6df19567478985965b56bb50a842fe3d5c87d7afb750e165d4888da45466f3dba16205a94d1baf5cbfe723f0a18dffe960d944d00
-  data.tar.gz: 48e5cbec09157db3c974b5d0c242c394884a77f47ce5cf4e009b7dedf47daccba581709aefb534266415884ab71fad03c0a4d22385e3abc9d3e33576f3aaad17
+  metadata.gz: d3c606a1bf94fc65241841ca4e9899488f8271569492fb33d4ecf49c46007bb1f678c5d6995656a17fbd003d387942bf43b0575b09d9a78bfc64852504224586
+  data.tar.gz: 5032b06cc50cc867e29f99973b6f03e4256f746f5643db7275a17621252db5e825fb1aa1b07439c0a3f087a2cfe96f6bc3a9966c98693f8a3a994880c81b6857

data/README.md

@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.76<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.79<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -619,12 +619,15 @@ Now you can run `doing import --type timing -s SECTION PATH`, where SECTION is t
 
 #### 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.
+FuzzyFileFinder (`fzf`) is included with doing (<https://github.com/junegunn/fzf>), and 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. Use Control-A to select all visible entries.
+To use the menu, type a search string or use the arrow keys to navigate up and down. Tip: searching is "fuzzy" by default, but you can start your search with a single quote (`'`) to force an exact match. 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. Use Control-A to select all visible entries.
 
 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 the selected entries on one page in your text 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.
 
+If no actions are specified, an interactive menu of options will be
+presented.
+
 Run `doing help select` for a list of options:
 
     -a, --archive         - Archive selected items
@@ -634,7 +637,11 @@ Run `doing help select` for a list of options:
     -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)
+    -o, --output=FORMAT   - Output format for export (doing|taskpaper|csv|html|json|template|timeline) (default: none)
+    -q, --query=QUERY     - Initial search query for filtering (default: none)
+    -r, --remove          - Reverse -c, -f, --flag, and -t (remove instead of adding)
     -s, --section=SECTION - Select from a specific section (default: none)
+    --save_to=FILE        - Save selected entries to file using --output format (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.

data/bin/doing

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
@@ -301,6 +301,9 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
+  c.desc 'Perform action without confirmation'
+  c.switch %i[force], negatable: false, default_value: false
+
   c.desc 'Save selected entries to file using --output format'
   c.arg_name 'FILE'
   c.flag %i[save_to]
@@ -1306,7 +1309,8 @@ desc 'Select a section to display from a menu'
 command :choose do |c|
   c.action do |_global_options, _options, _args|
     section = wwid.choose_section
-    puts wwid.list_section({ section: section.cap_first, count: 0 })
+
+    puts wwid.list_section({ section: section.cap_first, count: 0 }) if section
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.78'
+  VERSION = '1.0.82'
 end

data/lib/doing/wwid.rb

@@ -757,7 +757,7 @@ class WWID
       all_items.concat(@content[section]['items'].dup) if @content.key?(section)
     end
 
-    if opt[:tag] && opt[:tag].length.positive?
+    if opt[:tag]&.length
       all_items.select! { |item| item.has_tags?(opt[:tag], opt[:tag_bool]) }
     elsif opt[:search]&.length
       all_items.select! { |item| item.matches_search?(opt[:search]) }
@@ -771,16 +771,17 @@ class WWID
   ##
   ## @return     (String) The selected option
   ##
-  def choose_from(options, prompt)
-    puts prompt
-    options.each_with_index do |section, i|
-      puts format('% 3d: %s', i + 1, section)
-    end
-    print "#{colors['green']}> #{colors['default']}"
-    num = STDIN.gets
-    return false if num =~ /^[a-z ]*$/i
-
-    options[num.to_i - 1]
+  def choose_from(options, prompt: 'Make a selection: ', multiple: false, fzf_args: [])
+    fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
+    fzf_args << '-1'
+    fzf_args << %(--prompt "#{prompt}")
+    fzf_args << '--multi' if multiple
+    header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+    fzf_args << %(--header "#{header}")
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
+    return false if res.strip.size.zero?
+
+    res
   end
 
   ##
@@ -811,7 +812,7 @@ class WWID
         ') ',
         item['date'],
         ' | ',
-        item['title'],
+        item['title']
       ]
       if opt[:section] =~ /^all/i
         out.concat([
@@ -822,8 +823,15 @@ class WWID
       end
       out.join('')
     end
-
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
+    fzf_args = [
+      %(--header="Arrows: navigate, tab: mark for selection, ctrl-a: select all, enter: commit"),
+      %(--prompt="Select entries to act on > "),
+      '-1',
+      '-m',
+      '--bind ctrl-a:select-all',
+      %(-q "#{opt[:query]}")
+    ]
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -835,63 +843,81 @@ class WWID
       return
     end
 
-    unless opt[:delete] || opt[:flag] || opt[:finish] || opt[:cancel] || opt[:tag] || opt[:archive] || opt[:output] || opt[:save_to]
-      action = choose_from(
-                           [
-                            "add tag",
-                            "remove tag",
-                            "archive",
-                            "cancel",
-                            "delete",
-                            "edit",
-                            "finish",
-                            "flag",
-                            "move",
-                            "output format"
-                          ],
-                            'What do you want to do with the selected items?')
-      case action
-      when /(add|remove) tag/
-        print "Enter tag: "
-        tag = STDIN.gets
-        return if tag =~ /^ *$/
-        opt[:tag] = tag.strip
-        opt[:remove] = true if action =~ /remove tag/
-      when /output format/
-        output_format = choose_from(%w[doing taskpaper json timeline html csv], 'Which output format?')
-        return if tag =~ /^ *$/
-        opt[:output] = output_format.strip
-        res = yn("Save to file?", default_response: 'n')
-        if res
-          print "File path/name: "
-          filename = STDIN.gets.strip
-          return if filename.empty?
-          opt[:save_to] = filename
-        end
-      when /archive/
-        opt[:archive] = true
-      when /delete/
-        opt[:delete] = true
-      when /edit/
-        opt[:editor] = true
-      when /finish/
-        opt[:finish] = true
-      when /cancel/
-        opt[:cancel] = true
-      when /move/
-        section = choose_section.strip
-        return if section =~ /^ *$/
-        opt[:move] = section.strip
-      when /flag/
-        opt[:flag] = true
+    actions = %i[editor delete tag flag finish cancel tag archive output save_to]
+    has_action = false
+    actions.each do |a|
+      if opt[a]
+        has_action = true
+        break
       end
     end
 
+    unless has_action
+      choice = choose_from([
+                             'add tag',
+                             'remove tag',
+                             'cancel',
+                             'delete',
+                             'finish',
+                             'flag',
+                             'archive',
+                             'move',
+                             'edit',
+                             'output formatted'
+                           ],
+                           prompt: 'What do you want to do with the selected items? > ',
+                           multiple: true,
+                           fzf_args: ['--height=60%', '--tac', '--no-sort'])
+      return unless choice
+
+      to_do = choice.strip.split(/\n/)
+      to_do.each do |action|
+        case action
+        when /(add|remove) tag/
+          type = action =~ /^add/ ? 'add' : 'remove'
+          if opt[:tag]
+            warn "'add tag' and 'remove tag' can not be used together"
+            Process.exit 1
+          end
+          print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
+          tag = STDIN.gets
+          return if tag =~ /^ *$/
+          opt[:tag] = tag.strip.sub(/^@/, '')
+          opt[:remove] = true if type == 'remove'
+        when /output formatted/
+          output_format = choose_from(%w[doing taskpaper json timeline html csv].sort, prompt: 'Which output format? > ', fzf_args: ['--height=60%', '--tac', '--no-sort'])
+          return if tag =~ /^ *$/
+          opt[:output] = output_format.strip
+          res = opt[:force] ? false : yn('Save to file?', default_response: 'n')
+          if res
+            print "#{colors['yellow']}File path/name: #{colors['reset']}"
+            filename = STDIN.gets.strip
+            return if filename.empty?
+            opt[:save_to] = filename
+          end
+        when /archive/
+          opt[:archive] = true
+        when /delete/
+          opt[:delete] = true
+        when /edit/
+          opt[:editor] = true
+        when /finish/
+          opt[:finish] = true
+        when /cancel/
+          opt[:cancel] = true
+        when /move/
+          section = choose_section.strip
+          opt[:move] = section.strip unless section =~ /^ *$/
+        when /flag/
+          opt[:flag] = true
+        end
+      end
+    end
 
     if opt[:delete]
-      res = yn("Delete #{selected.size} items?", default_response: 'y')
+      res = opt[:force] ? true : yn("Delete #{selected.size} items?", default_response: 'y')
       if res
-        selected.each {|item| delete_item(item) }
+        selected.each { |item| delete_item(item) }
         write(@doing_file)
       end
       return
@@ -985,13 +1011,16 @@ class WWID
         item
       end
 
-      @content = {'Export' => {'original' => 'Export:', 'items' => selected}}
-      options = {section: 'Export'}
+      @content = { 'Export' => { 'original' => 'Export:', 'items' => selected } }
+      options = { section: 'Export' }
 
-      if opt[:output] !~ /(doing|taskpaper)/
-        options[:output] = opt[:output]
-      else
+      case opt[:output]
+      when /doing/
         options[:template] = '- %date | %title%note'
+      when /taskpaper/
+        options[:template] = '- %title @date(%date)%note'
+      else
+        options[:output] = opt[:output]
       end
 
       output = list_section(options)
@@ -1073,7 +1102,6 @@ class WWID
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
-
           finished = opt[:unfinished] && item.has_tags?('done', :and)
           tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.has_tags?(opt[:tag], opt[:tag_bool])
           search_match = opt[:search].nil? || opt[:search].empty? ? true : item.matches_search?(opt[:search])
@@ -1199,19 +1227,24 @@ class WWID
   ## @param      old_item  (Item) The item to tag
   ## @param      tag       (string) The tag to remove
   ##
-  def untag_item(old_item, tag)
+  def untag_item(old_item, tags)
     title = old_item['title'].dup
-
-    if title =~ /@#{tag}/
-      title.chomp!
-      title.gsub!(/ +@#{tag}(\(.*?\))?/, '')
-      new_item = old_item.dup
-      new_item['title'] = title
-      update_item(old_item, new_item)
-      return new_item
-    else
-      @results.push(%(Item isn't tagged @#{tag}: "#{title}" in #{old_item['section']}))
-      return old_item
+    if tags.is_a? ::String
+      tags = tags.split(/ *, */).map {|t| t.strip.gsub(/\*/,'[^ (]*') }
+    end
+
+    tags.each do |tag|
+      if title =~ /@#{tag}/
+        title.chomp!
+        title.gsub!(/ +@#{tag}(\(.*?\))?/, '')
+        new_item = old_item.dup
+        new_item['title'] = title
+        update_item(old_item, new_item)
+        return new_item
+      else
+        @results.push(%(Item isn't tagged @#{tag}: "#{title}" in #{old_item['section']}))
+        return old_item
+      end
     end
   end
 
@@ -1222,23 +1255,29 @@ class WWID
   ## @param      tag       (string) The tag to apply
   ## @param      date      (Boolean) Include timestamp?
   ##
-  def tag_item(old_item, tag, remove: false, date: false)
+  def tag_item(old_item, tags, remove: false, date: false)
     title = old_item['title'].dup
+    if tags.is_a? ::String
+      tags = tags.split(/ *, */).map(&:strip)
+    end
+
     done_date = Time.now
-    if title !~ /@#{tag}/
-      title.chomp!
-      if date
-        title += " @#{tag}(#{done_date.strftime('%F %R')})"
+    tags.each do |tag|
+      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
-        title += " @#{tag}"
+        @results.push(%(Item already @#{tag}: "#{title}" in #{old_item['section']}))
+        return old_item
       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
 
@@ -1487,14 +1526,8 @@ class WWID
   ## @return     (String) The selected section name
   ##
   def choose_section
-    sections.each_with_index do |section, i|
-      puts format('% 3d: %s', i + 1, section)
-    end
-    print "#{colors['green']}> #{colors['default']}"
-    num = STDIN.gets
-    return false if num =~ /^[a-z ]*$/i
-
-    sections[num.to_i - 1]
+    choice = choose_from(sections.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##
@@ -1512,14 +1545,8 @@ class WWID
   ## @return     (String) The selected view name
   ##
   def choose_view
-    views.each_with_index do |view, i|
-      puts format('% 3d: %s', i + 1, view)
-    end
-    print '> '
-    num = STDIN.gets
-    return false if num =~ /^[a-z ]*$/i
-
-    views[num.to_i - 1]
+    choice = choose_from(views.sort, prompt: 'Choose a view > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##

data/lib/doing.rb

@@ -8,5 +8,6 @@ require 'tempfile'
 require 'chronic'
 require 'haml'
 require 'json'
-require 'doing/helpers.rb'
-require 'doing/wwid.rb'
+require 'doing/helpers'
+require 'doing/wwid'
+# require 'doing/markdown_document_listener'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.78
+  version: 1.0.82
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,6 +168,7 @@ files:
 - lib/doing/helpers.rb
 - lib/doing/version.rb
 - lib/doing/wwid.rb
+- lib/helpers/fuzzyfilefinder
 - lib/templates/doing.css
 - lib/templates/doing.haml
 homepage: http://brettterpstra.com/project/doing/