doing 1.0.46 → 1.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a90bfcfe901ff215cddf7ce3f0f19734371c2934c08af6bf0263137320d7cc
-  data.tar.gz: d791452d6e5235aaf2a04db3e485c57e56a99c84c65f61026f82fa0e6a56b04e
+  metadata.gz: 03b16107627feaf0adeafbce9ad45e96fc53df7ba379f59dc72d2970d12642ef
+  data.tar.gz: 5cd54e6ba005e985b6c86468831d0b83369c5801916a9e8e15e742c86fcccf53
 SHA512:
-  metadata.gz: 2166a9ee774dc475e2f9d13c116ce7e1aaa550b0e454ce7ae47a6b950a855443a0c59d6a24ff87247aac28a88404314011a4d6420190fdf007b236a53dcac3e6
-  data.tar.gz: f3ebed8c0f2ae40770fca5df63a2a7a680915aa57d0baf0046a2ffb50f3908914bfbb8ba46a38ad943e6fe0fc1bd8d4e92b39761212bf6285dbf70b385544d77
+  metadata.gz: 617cd299b816ad12dc042ec76dbd58e5f19dca7098362ad4cc465d70d5c6dfab0e5ca4e05b82cd9535a85638ae490adea4da502ce4b6f0127e25da8f08b0bc6c
+  data.tar.gz: c82bb894c5d457d6bde4e6396cb7badffb4db3e6d0d81b75372f98968ec79b9ebfe15548b7040ddb5cc2eb2abfda2e3faaf6ea517c0485878689b50ce1739a79

data/README.md

@@ -2,7 +2,7 @@
 
 **A command line tool for remembering what you were doing and tracking what you've done.**
 
-_If you're one of the rare people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate)._
+_If you're one of the rare people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate/)._
 
 
 ## Contents
@@ -393,10 +393,11 @@ Note that you can include a tag with synonyms in the whitelist as well to tag it
 
 #### Adding entries:
 
-    now, did - Add an entry
-    later    - Add an item to the Later section
-    done     - Add a completed item with @done(date). No argument finishes last entry.
-    meanwhile - Finish any @meanwhile tasks and optionally create a new one
+    now, did      - Add an entry
+    later         - Add an item to the Later section
+    done          - Add a completed item with @done(date). No argument finishes last entry.
+    meanwhile     - Finish any @meanwhile tasks and optionally create a new one
+    again, resume - Duplicate the last entry as new entry (without @done tag)
 
 The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back=AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back=25m ENTRY` or `doing now --back="yesterday 3:30pm" ENTRY`.
 
@@ -419,6 +420,7 @@ See `doing help meanwhile` for more options.
 #### Modifying entries:
 
     finish      - Mark last X entries as @done
+    cancel      - Mark last X entries as @done without completion date
     tag         - Tag last entry
     note        - Add a note to the last entry
 
@@ -430,6 +432,16 @@ See `doing help meanwhile` for more options.
 
 As mentioned above, `finish` also accepts `--back "2 hours"` (sets the finish date from time now minus interval) or `--took 30m` (sets the finish date to time started plus interval) so you can accurately add times to completed tasks, even if you don't do it in the moment.
 
+Both `done` and `finish` accept an `--archive` switch which immediately moves the completed entries to the Archive section with a `@from(Project)` tag.
+
+You can finish the last entry containing a specific tag or combination of tags using the `--tag` flag. Multiple tags are separated by commas. By default tags are combined with an AND boolean, meaning the entry must contain all specified tags to be considered. For example, to finish the last entry containing both "@work" and "@project1", you would use:
+
+    doing finish --tag=work,project1
+
+You can change the boolean using `--tag_bool=OR` (last entry containing any of the specified tags) or `--tag_bool=NOT` (last entry containing none of the tags).
+
+You can also include a `--no-date` switch to add `@done` without a finish date, meaning no time is tracked for the task. `doing cancel` is an alias for this. Like `finish`, `cancel` accepts a count to act on the last X entries, as well as `--archive` and `--section` options.
+
 
 ##### Tagging and Autotagging
 

data/bin/doing

@@ -44,7 +44,7 @@ default_value false
 switch [:stdout], :default_value => false, :negatable => false
 
 desc 'Exclude auto tags and default tags'
-switch [:x,:noauto], :default_value => false
+switch [:x, :noauto], :default_value => false
 
 desc 'Use a specific configuration file'
 default_value false
@@ -52,37 +52,34 @@ flag [:config_file]
 
 
 # desc 'Wrap notes at X chars (0 for no wrap)'
-# flag [:w,:wrapwidth], :must_match => /^\d+$/, :type => Integer
+# flag [:w, :wrapwidth], :must_match => /^\d+$/, :type => Integer
 
 desc 'Specify a different doing_file'
 flag [:f, :doing_file]
 
 desc 'Add an entry'
 arg_name 'entry'
-command [:now,:next] do |c|
+command [:now, :next] do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
-  c.default_value wwid.current_section
-  c.flag [:s,:section], :default_value => wwid.current_section
+  c.flag [:s, :section], :default_value => wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e,:editor]
+  c.switch [:e, :editor]
 
   c.desc 'Backdate start time [4pm|20m|2h|yesterday noon]'
-  c.flag [:back]
+  c.flag [:b, :back]
 
   c.desc 'Timed entry, marks last entry in section as @done'
-  c.default_value false
-  c.switch [:f,:finish_last], :negatable => false, :default_value => false
+  c.switch [:f, :finish_last], :negatable => false, :default_value => false
 
   c.desc 'Note'
   c.arg_name 'note_text'
-  c.flag [:n,:note]
+  c.flag [:n, :note]
 
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
-  # c.default_value wwid.config.has_key?('editor_app') && wwid.config['editor_app'] ? wwid.config['editor_app'] : false
-  # c.flag [:a,:app]
+  # # c.flag [:a, :app]
 
   c.action do |global_options,options,args|
     if options[:back]
@@ -136,7 +133,6 @@ arg_name 'note_text'
 command :note do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
-  c.default_value wwid.current_section
   c.flag [:s, :section], :default_value => "All"
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
@@ -196,7 +192,6 @@ arg_name 'entry'
 command :meanwhile do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
-  c.default_value wwid.current_section
   c.flag [:s, :section], :default_value => wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
@@ -206,7 +201,7 @@ command :meanwhile do |c|
   c.switch [:a, :archive], :default_value => false
 
   c.desc 'Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]'
-  c.flag [:back]
+  c.flag [:b, :back]
 
   c.desc 'Note'
   c.arg_name 'note_text'
@@ -238,7 +233,7 @@ command :meanwhile do |c|
     input = false unless input && input.length > 0
 
     note = options[:n] ? options[:n] : false
-    wwid.stop_start("meanwhile",{:new_item => input, :back => date, :section => section, :archive => options[:a], :note => note})
+    wwid.stop_start('meanwhile', {:new_item => input, :back => date, :section => section, :archive => options[:a], :note => note})
     wwid.write(wwid.doing_file)
   end
 end
@@ -276,11 +271,10 @@ command :later do |c|
 
   c.desc "Edit entry with specified app"
   c.arg_name 'editor_app'
-  c.default_value wwid.config.has_key?('editor_app') && wwid.config['editor_app'] ? wwid.config['editor_app'] : false
   c.flag [:a, :app]
 
   c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
-  c.flag [:back]
+  c.flag [:b, :back]
 
   c.desc 'Note'
   c.arg_name 'note_text'
@@ -327,17 +321,14 @@ end
 
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'entry'
-command [:done,:did] do |c|
+command [:done, :did] do |c|
   c.desc 'Remove @done tag'
-  c.default_value false
   c.switch [:r, :remove], :negatable => false, :default_value => false
 
   c.desc 'Include date'
-  c.default_value true
-  c.switch [:d, :date], :negatable => true, :default_value => true
+  c.switch [:date], :negatable => true, :default_value => true
 
   c.desc 'Immediately archive the entry'
-  c.default_value false
   c.switch [:a, :archive], :negatable => false, :default_value => false
 
   c.desc 'Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back. Used with --took, backdates start date'
@@ -350,16 +341,14 @@ command [:done,:did] do |c|
   c.flag [:t, :took]
 
   c.desc 'Section'
-  c.default_value wwid.current_section
-  c.flag [:s,:section], :default_value => wwid.current_section
+  c.flag [:s, :section], :default_value => wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e,:editor]
+  c.switch [:e, :editor]
 
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
-  # c.default_value wwid.config.has_key?('editor_app') && wwid.config['editor_app'] ? wwid.config['editor_app'] : false
-  # c.flag [:a,:app]
+  # # c.flag [:a, :app]
 
   c.action do |global_options,options,args|
     took = 0
@@ -390,7 +379,7 @@ command [:done,:did] do |c|
     end
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
-    donedate = options[:d] ? "(#{finish_date.strftime('%F %R')})" : ""
+    donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ""
 
     if options[:e]
       raise "No EDITOR variable defined in environment" if ENV['EDITOR'].nil?
@@ -410,7 +399,7 @@ command [:done,:did] do |c|
       if options[:r]
         wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :remove => true })
       else
-        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => finish_date, :date => options[:d]})
+        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :archive => options[:a], :back => finish_date, :date => options[:date]})
       end
     else
       if args.length > 0
@@ -433,31 +422,58 @@ command [:done,:did] do |c|
   end
 end
 
+desc 'End last X entries with no time tracked'
+long_desc 'Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doing finish --no-date`.'
+arg_name 'count'
+command :cancel do |c|
+  c.desc 'Archive entries'
+  c.switch [:a, :archive], :negatable => false, :default_value => false
+
+  c.desc 'Section'
+  c.flag [:s, :section], :default_value => wwid.current_section
+
+  c.action do |global_options,options,args|
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    if args.length > 1
+      raise "Only one argument allowed"
+    elsif args.length == 0 || args[0] =~ /\d+/
+      count = args[0] ? args[0].to_i : 1
+      wwid.tag_last({:tags => ["done"], :count => count, :section => section, :archive => options[:a], :sequential => false, :date => false })
+    else
+      raise "Invalid argument (specify number of recent items to mark @done)"
+    end
+  end
+end
+
 desc 'Mark last X entries as @done'
 long_desc 'Marks the last X entries with a @done tag and current date. Does not alter already completed entries.'
 arg_name 'count'
 command :finish do |c|
   c.desc 'Include date'
-  c.default_value true
-  c.switch [:d,:date], :default_value => true
+  c.switch [:date], :negatable => true, :default_value => true
 
   c.desc 'Backdate completed date to date string [4pm|20m|2h|yesterday noon]'
-  c.flag [:b,:back]
+  c.flag [:b, :back]
 
   c.desc 'Set the completed date to the start date plus XX[hmd]'
-  c.flag [:t,:took]
+  c.flag [:t, :took]
+
+  c.desc 'Finish the last X entries containing TAG. Separate multiple tags with comma (--tag=tag2,tag2)'
+  c.flag [:tag], :default_value => []
+
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.flag [:tag_bool], default_value: 'AND'
 
   c.desc 'Auto-generate finish dates from next entry\'s start time. Automatically generate completion dates 1 minute before next start date. --auto overrides the --date and --back parameters.'
-  c.default_value false
   c.switch [:auto], :negatable => false, :default_value => false
 
   c.desc 'Archive entries'
-  c.default_value false
-  c.switch [:a,:archive], :negatable => false, :default_value => false
+  c.switch [:a, :archive], :negatable => false, :default_value => false
 
   c.desc 'Section'
-  c.default_value wwid.current_section
-  c.flag [:s,:section], :default_value => wwid.current_section
+  c.flag [:s, :section], :default_value => wwid.current_section
 
   c.action do |global_options,options,args|
 
@@ -477,11 +493,20 @@ command :finish do |c|
       end
     end
 
+    if options[:tag]
+      options[:tag] = options[:tag].split(/,/).map {|tag| tag.strip.sub(/^@/, '') }
+      if options[:tag_bool] =~ /^(and|or|not)$/i
+        options[:tag_bool] = options[:tag_bool].upcase
+      else
+        options[:tag_bool] = 'AND'
+      end
+    end
+
     if args.length > 1
       raise "Only one argument allowed"
     elsif args.length == 0 || args[0] =~ /\d+/
       count = args[0] ? args[0].to_i : 1
-      wwid.tag_last({:tags => ["done"], :count => count, :section => section, :archive => options[:a], :sequential => options[:auto], :date => options[:d], :back => date })
+      wwid.tag_last({ tags: ["done"],count: count,section: section,archive: options[:a],sequential: options[:auto],date: options[:date], back: date, tag: options[:tag], tag_bool: options[:tag_bool] })
     else
       raise "Invalid argument (specify number of recent items to mark @done)"
     end
@@ -490,13 +515,13 @@ end
 
 desc 'Repeat last entry as new entry'
 arg_name 'section'
-command [:again,:resume] do |c|
+command [:again, :resume] do |c|
   c.desc 'Section'
   c.flag [:s, :section], :default_value => "All"
 
   c.desc 'Note'
   c.arg_name 'note_text'
-  c.flag [:n,:note]
+  c.flag [:n, :note]
 
   c.action do |global_options, options, args|
     wwid.restart_last({ section: options[:s], note: options[:n] })
@@ -510,19 +535,15 @@ command :tag do |c|
   c.flag [:s, :section], :default_value => "All"
 
   c.desc 'How many recent entries to tag (0 for all)'
-  c.default_value 1
   c.flag [:c, :count], :default_value => 1
 
   c.desc 'Include current date/time with tag'
-  c.default_value false
   c.switch [:d, :date], :negatable => false, :default_value => false
 
   c.desc 'Remove given tag(s)'
-  c.default_value false
   c.switch [:r, :remove], :negatable => false, :default_value => false
 
   c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
-  c.default_value false
   c.switch [:a, :autotag], :negatable => false, :default_value => false
 
   c.action do |global_options,options,args|
@@ -557,27 +578,25 @@ command :tag do |c|
           question = "Are you sure you want to add #{tags.join(" and ")} to all records#{section_q}"
         end
 
-        res = wwid.yn(question,false)
+        res = wwid.yn(question, default_response: false)
 
         unless res
           raise "Cancelled"
         end
       end
 
-      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:d], :remove => options[:r], :autotag => options[:a]})
+      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:date], :remove => options[:r], :autotag => options[:a]})
     end
   end
 end
 
 desc 'Mark last entry as highlighted'
-command [:mark,:flag] do |c|
+command [:mark, :flag] do |c|
   c.desc 'Section'
-  c.default_value wwid.current_section
-  c.flag [:s,:section], :default_value => wwid.current_section
+  c.flag [:s, :section], :default_value => wwid.current_section
 
   c.desc 'Remove mark'
-  c.default_value false
-  c.switch [:r,:remove], :negatable => false, :default_value => false
+  c.switch [:r, :remove], :negatable => false, :default_value => false
 
 
   c.action do |global_options,options,args|
@@ -591,32 +610,28 @@ long_desc 'The argument can be a section name, @tag(s) or both. "pick" or "choos
 arg_name '[section|@tags]'
 command :show do |c|
   c.desc 'Tag boolean (AND,OR,NONE)'
-  c.default_value "OR"
-  c.flag [:b,:bool], :default_value => "OR"
+  c.flag [:b, :bool], :default_value => "OR"
 
   c.desc 'Max count to show'
-  c.default_value 0
-  c.flag [:c,:count], :default_value => 0
+  c.flag [:c, :count], :default_value => 0
 
   c.desc 'Age (oldest/newest)'
-  c.default_value 'newest'
-  c.flag [:a,:age], :default_value => 'newest'
+  c.flag [:a, :age], :default_value => 'newest'
 
   c.desc 'Sort order (asc/desc)'
-  c.default_value 'asc'
-  c.flag [:s,:sort], :default_value => 'asc'
+  c.flag [:s, :sort], :default_value => 'asc'
 
   c.desc %{
-    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,". Example `doing show --from "monday to friday"`
+    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"`
   }
-  c.flag [:f,:from]
+  c.flag [:f, :from]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -627,11 +642,10 @@ command :show do |c|
   c.flag [:tag_sort], :default_value => default
 
   c.desc 'Only show items with recorded time intervals'
-  c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
   c.action do |global_options,options,args|
 
     tag_filter = false
@@ -696,22 +710,24 @@ command :show do |c|
 end
 
 desc 'Search for entries'
-long_desc 'Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched, delineate regex with /expression/'
+long_desc <<-'EODESC'
+Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched.
+
+To search with regular expressions, single quote the string and surround with slashes: `doing search '/\bm.*?x\b/'`
+EODESC
+
 arg_name 'search_pattern'
-command [:grep,:search] do |c|
+command [:grep, :search] do |c|
   c.desc 'Section'
-  c.default_value "all"
-  c.flag [:s,:section], :default_value => "All"
+  c.flag [:s, :section], :default_value => "All"
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -722,7 +738,6 @@ command [:grep,:search] do |c|
   c.flag [:tag_sort], :default_value => default
 
   c.desc 'Only show items with recorded time intervals'
-  c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
 
   c.action do |global_options,options,args|
@@ -742,15 +757,12 @@ default_value 10
 arg_name 'count'
 command :recent do |c|
   c.desc 'Section'
-  c.default_value "All"
-  c.flag [:s,:section], :default_value => "All"
+  c.flag [:s, :section], :default_value => "All"
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -783,15 +795,12 @@ desc 'List entries from today'
 command :today do |c|
   c.desc 'Specify a section'
   c.arg_name 'section_name'
-  c.default_value "All"
-  c.flag [:s,:section], :default_value => 'All'
+  c.flag [:s, :section], :default_value => 'All'
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show time totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -802,7 +811,7 @@ command :today do |c|
   c.flag [:tag_sort], :default_value => default
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
 
   c.action do |global_options,options,args|
 
@@ -820,15 +829,12 @@ arg_name 'date_string'
 command :on do |c|
   c.desc 'Section'
   c.arg_name 'section_name'
-  c.default_value 'All'
-  c.flag [:s,:section], :default_value => 'All'
+  c.flag [:s, :section], :default_value => 'All'
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show time totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -839,7 +845,7 @@ command :on do |c|
   c.flag [:tag_sort], :default_value => default
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
 
   c.action do |global_options,options,args|
 
@@ -872,18 +878,15 @@ desc 'List entries from yesterday'
 command :yesterday do |c|
   c.desc 'Specify a section'
   c.arg_name 'section_name'
-  c.default_value "All"
-  c.flag [:s,:section], :default_value => 'All'
+  c.flag [:s, :section], :default_value => 'All'
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show time totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -903,8 +906,7 @@ end
 desc 'Show the last entry'
 command :last do |c|
   c.desc 'Specify a section'
-  c.default_value "All"
-  c.flag [:s,:section]
+  c.flag [:s, :section]
 
   c.action do |global_options,options,args|
     puts wwid.last(true,options[:s]).strip
@@ -914,8 +916,7 @@ end
 desc 'List sections'
 command :sections do |c|
   c.desc 'List in single column'
-  c.default_value false
-  c.switch [:c,:column], :default_value => false
+  c.switch [:c, :column], :default_value => false
 
   c.action do |global_options,options,args|
     joiner = options[:c] ? "\n" : "\t"
@@ -966,20 +967,18 @@ desc 'Display a user-created view'
 arg_name 'view_name'
 command :view do |c|
   c.desc 'Section (override view settings)'
-  c.flag [:s,:section]
+  c.flag [:s, :section]
 
   c.desc 'Count to display (override view settings)'
-  c.flag [:c,:count], :must_match => /^\d+$/, :type => Integer
+  c.flag [:c, :count], :must_match => /^\d+$/, :type => Integer
 
   c.desc 'Output to export format (csv|html|json)'
-  c.flag [:o,:output]
+  c.flag [:o, :output]
 
   c.desc 'Show time intervals on @done tasks'
-  c.default_value true
-  c.switch [:t,:times], :default_value => true
+  c.switch [:t, :times], :default_value => true
 
   c.desc 'Show intervals with totals at the end of output'
-  c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
   c.desc 'Sort tags by (name|time)'
@@ -990,7 +989,6 @@ command :view do |c|
   c.flag [:tag_sort], :default_value => default
 
   c.desc 'Only show items with recorded time intervals'
-  c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => true
 
   c.action do |global_options,options,args|
@@ -1053,8 +1051,7 @@ end
 desc 'List available custom views'
 command :views do |c|
   c.desc 'List in single column'
-  c.default_value false
-  c.switch [:c,:column], :default_value => false
+  c.switch [:c, :column], :default_value => false
 
   c.action do |global_options,options,args|
     joiner = options[:c] ? "\n" : "\t"
@@ -1067,16 +1064,13 @@ arg_name 'section'
 default_value wwid.current_section
 command :archive do |c|
   c.desc 'Count to keep (ignored if archiving by tag)'
-  c.default_value 5
-  c.flag [:k,:keep], :default_value => 5, :must_match => /^\d+$/, :type => Integer
+  c.flag [:k, :keep], :default_value => 5, :must_match => /^\d+$/, :type => Integer
 
   c.desc 'Move entries to'
-  c.default_value "Archive"
-  c.flag [:t,:to], :default_value => "Archive"
+  c.flag [:t, :to], :default_value => "Archive"
 
   c.desc 'Tag boolean'
-  c.default_value "AND"
-  c.flag [:b,:bool], :default_value => "AND"
+  c.flag [:b, :bool], :default_value => "AND"
 
   c.action do |global_options,options,args|
     if args.length > 0
@@ -1144,8 +1138,7 @@ end
 desc 'Edit the configuration file'
 command :config do |c|
   c.desc 'Editor to use'
-  c.default_value ENV['EDITOR']
-  c.flag [:e,:editor], :default_value => nil
+  c.flag [:e, :editor], :default_value => nil
 
   if `uname` =~ /Darwins/
     c.desc 'Application to use'
@@ -1183,8 +1176,7 @@ end
 desc 'Undo the last change to the doing_file'
 command :undo do |c|
   c.desc 'Specify alternate doing file'
-  c.default_value wwid.doing_file
-  c.flag [:f,:file], :default_value => wwid.doing_file
+  c.flag [:f, :file], :default_value => wwid.doing_file
 
   c.action do |global_options,options,args|
     file = options[:f] || wwid.doing_file

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.46'
+  VERSION = '1.0.51'
 end

data/lib/doing/wwid.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 require 'deep_merge'
+require 'open3'
 
 ##
 ## @brief      String helpers
@@ -644,6 +645,7 @@ class WWID
     end
     # Remove @done tag
     title = last['title'].sub(/\s*@done(\(.*?\))?/, '').chomp
+    @auto_tag = false
     add_item(title, last['section'], { note: opt[:note], back: opt[:date], timed: true })
     write(@doing_file)
   end
@@ -726,7 +728,6 @@ class WWID
       if @content.key?(section)
 
         items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
-
         index = 0
         done_date = Time.now
         next_start = Time.now
@@ -734,44 +735,80 @@ class WWID
         items.map! do |item|
           break if index == count
 
-          if opt[:autotag]
-            new_title = autotag(item['title']) if @auto_tag
-            if new_title == item['title']
-              @results.push(%(Autotag: No changes))
-            else
-              @results.push("Tags updated: #{new_title}")
-              item['title'] = new_title
-            end
-          else
-            if opt[:sequential]
-              done_date = next_start - 1
-              next_start = item['date']
-            elsif opt[:back]
-              done_date = item['date'] + (opt[:back] - item['date'])
+          tag_match = if opt[:tag].length.positive?
+                        case opt[:tag_bool]
+                        when 'AND'
+                          result = true
+                          opt[:tag].each do |tag|
+                            unless item['title'] =~ /@#{tag}/
+                              result = false
+                              break
+                            end
+                          end
+                          result
+                        when 'NOT'
+                          result = true
+                          opt[:tag].each do |tag|
+                            if item['title'] =~ /@#{tag}/
+                              result = false
+                              break
+                            end
+                          end
+                          result
+                        else
+                          result = false
+                          opt[:tag].each do |tag|
+                            if item['title'] =~ /@#{tag}/
+                              result = true
+                              break
+                            end
+                          end
+                          result
+                        end
+                      else
+                        true
+                      end
+
+          if tag_match
+            if opt[:autotag]
+              new_title = autotag(item['title']) if @auto_tag
+              if new_title == item['title']
+                @results.push(%(Autotag: No changes))
+              else
+                @results.push("Tags updated: #{new_title}")
+                item['title'] = new_title
+              end
             else
-              done_date = Time.now
-            end
+              if opt[:sequential]
+                done_date = next_start - 1
+                next_start = item['date']
+              elsif opt[:back]
+                done_date = item['date'] + (opt[:back] - item['date'])
+              else
+                done_date = Time.now
+              end
 
-            title = item['title']
-            opt[:tags].each do |tag|
-              tag.strip!
-              if opt[:remove] && title =~ /@#{tag}\b/
-                title.gsub!(/(^| )@#{tag}(\([^)]*\))?/, '')
-                @results.push(%(Removed @#{tag}: "#{title}" in #{section}))
-              elsif title !~ /@#{tag}/
-                title.chomp!
-                title += if opt[:date]
-                           " @#{tag}(#{done_date.strftime('%F %R')})"
-                         else
-                           " @#{tag}"
-                         end
-                @results.push(%(Added @#{tag}: "#{title}" in #{section}))
+              title = item['title']
+              opt[:tags].each do |tag|
+                tag.strip!
+                if opt[:remove] && title =~ /@#{tag}\b/
+                  title.gsub!(/(^| )@#{tag}(\([^)]*\))?/, '')
+                  @results.push(%(Removed @#{tag}: "#{title}" in #{section}))
+                elsif title !~ /@#{tag}/
+                  title.chomp!
+                  title += if opt[:date]
+                             " @#{tag}(#{done_date.strftime('%F %R')})"
+                           else
+                             " @#{tag}"
+                           end
+                  @results.push(%(Added @#{tag}: "#{title}" in #{section}))
+                end
               end
+              item['title'] = title
             end
-            item['title'] = title
-          end
 
-          index += 1
+            index += 1
+          end
 
           item
         end
@@ -781,9 +818,10 @@ class WWID
         if opt[:archive] && section != 'Archive' && (opt[:count]).positive?
           # concat [count] items from [section] and archive section
           archived = @content[section]['items'][0..opt[:count] - 1].map do |i|
-            i['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{i['section']})")
+            i['title'].sub!(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{i['section']})")
+            i
           end.concat(@content['Archive']['items'])
-          # chop [count] items off of [section] items
+          # slice [count] items off of [section] items
           @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
           # overwrite archive section with concatenated array
           @content['Archive']['items'] = archived
@@ -931,10 +969,10 @@ class WWID
       end
 
       if @config.key?('run_after')
-        script = File.expand_path(@config['run_after'])
-        if File.exist?(script)
-          # warn "Running #{script}"
-          `#{script}`
+        stdout, stderr, status = Open3.capture3(@config['run_after'])
+        if status.exitstatus.positive?
+          warn "Error running #{@config['run_after']}"
+          warn stderr
         end
       end
     end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.46
+  version: 1.0.51
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.1
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.1
@@ -72,20 +78,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.19.2
+        version: 2.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.19.2
+        version: 2.20.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement