doing 1.0.78 → 1.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64076f13651c82428d05f490870a3a8a2507dc783cfaeebe7658538523aaef25
-  data.tar.gz: 691df494543c3ff71911a4ca87135adba9504fb445d51180e9c5914372c5d35b
+  metadata.gz: 24a207b31d2f64fc81c00b1484f62a5ab2609ded162fc9733cb54463c652d63e
+  data.tar.gz: dfc767b0d8cec0229e9ad3823f5853d81c343261198c6638e364331920dc7989
 SHA512:
-  metadata.gz: be005b1f54f3e170030f88a6df19567478985965b56bb50a842fe3d5c87d7afb750e165d4888da45466f3dba16205a94d1baf5cbfe723f0a18dffe960d944d00
-  data.tar.gz: 48e5cbec09157db3c974b5d0c242c394884a77f47ce5cf4e009b7dedf47daccba581709aefb534266415884ab71fad03c0a4d22385e3abc9d3e33576f3aaad17
+  metadata.gz: 1f64972ed2d157a0b52afa882d257190d236ebb5805d0ff8049d3ab65ca92974a1cbe2e11ba2ee1ea9cd04b751bd4cc6874f409d442cdfb9347c37bacb6fc47c
+  data.tar.gz: 9d3432a35cd14d44474ef32e90df40943a2a9ed7eb7c232a2361816aba255b7ed39992dc7b4cfa000afb93abbe4cea3036c9eec244a2fe141f7dca70ce400095

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.78<!--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/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -823,7 +823,7 @@ class WWID
       out.join('')
     end
 
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --header="Arrows to navigate, tab to mark for selection, enter to perform action" --prompt="Select entries to act on> " -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -835,7 +835,16 @@ class WWID
       return
     end
 
-    unless opt[:delete] || opt[:flag] || opt[:finish] || opt[:cancel] || opt[:tag] || opt[:archive] || opt[:output] || opt[:save_to]
+    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
       action = choose_from(
                            [
                             "add tag",
@@ -1199,19 +1208,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 +1236,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.78
+  version: 1.0.79
 platform: ruby
 authors:
 - Brett Terpstra
@@ -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/