doing 1.0.49 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f254e337c39ad92b9f2e7aa7a30797432c642af248387a448cf1673675ea7a
-  data.tar.gz: 4cd5f972401da1b668b0ae8402d7d463d35c6d0d7d6e3d5de2ad3d2de907ab25
+  metadata.gz: 1f1fda3219bcf3e27c6816ff77efe53b168d4c2ecf5d8c17653fd4dc6f95a1dd
+  data.tar.gz: 17a4dc1ea548c201e22335d0055fd383f6ceac611c2f0d71f1ae5900e7cd1087
 SHA512:
-  metadata.gz: e598cbe3377bda1a868015ea87f14b147b9d77fe02d5b663157b101e6ce988417344b6bf1731fdcb140ba91627e7cc3ab6520ee098811369128f8aa8756eab65
-  data.tar.gz: 8b32c6b73ceab01561163c28b4bc401293daf13d1fdf64ffd7966a907221941010d12b495fbfed2874ecf75f40612287d55ef7804fac3fd88029f4db1f0b1a82
+  metadata.gz: b2fb4ddc3f092a01134e157e84ea86ce44b5be6714c074b17bed647b8b1341fa43a5514311cfd387e662a744d307a624a57ec242caa3e651d57dc6875e572b08
+  data.tar.gz: f7e2eb609ce0eda0e2ca51205609b77cc44bf7c3d6dc12f25eb5bb8f06c50322d8d89d789998509d542dd7a90b3b29e1d3c82f5e021cf501850666ccc45243d0

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
@@ -17,6 +17,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 - [Changelog](#changelog)
 
 <!-- end toc -->
+<!--README-->
 
 ## What and why
 
@@ -413,6 +414,8 @@ When used with `doing done`, `--back` and `--took` allow time intervals to be ac
 
 All of these commands accept a `-e` argument. This opens your command line editor (as defined in the environment variable `$EDITOR`). Add your entry, save the temp file, and close it. The new entry is added. Anything after the first line is included as a note on the entry.
 
+`doing again` (or `doing resume`) will duplicate the last @done entry (most recently completed) with a new start date (and without the @done tag). To resume the last entry matching specific tags, use `--tag=TAG`. You can specify multiple tags by separating with a comma. Multiple tags are combined with 'AND' by default (all tags must exist on the entry to match), but you can use `--bool=` to set it to 'OR' or 'NOT'. By default the new entry will be added to the same section as the matching entry, but you can specify a section with `--in=SECTION`.
+
 `doing meanwhile` is a special command for creating and finishing tasks that may have other entries come before they're complete. When you create an entry with `doing meanwhile [entry text]`, it will automatically complete the last _@meanwhile_ item (dated _@done_ tag) and add the _@meanwhile_ tag to the new item. This allows time tracking on a more general basis, and still lets you keep track of the smaller things you do while working on an overarching project. The `meanwhile` command accepts `--back [time]` and will backdate the _@done_ tag and start date of the new task at the same time. Running `meanwhile` with no arguments will simply complete the last _@meanwhile_ task. 
 
 See `doing help meanwhile` for more options.
@@ -420,6 +423,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
 
@@ -431,6 +435,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 `--bool=OR` (last entry containing any of the specified tags) or `--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. `cancel` also accepts the `--tag` and `--bool` flags for tag filtering.
+
 
 ##### Tagging and Autotagging
 
@@ -565,11 +579,16 @@ __Fish:__ See the file [`doing.fish`](https://github.com/ttscoff/doing/blob/mast
 
 The LaunchBar action requires that `doing` be available in `/usr/local/bin/doing`. If it's not (because you're using RVM or similar), you'll need to symlink it there. Running the action with Return will show the latest 9 items from Currently, along with any time intervals recorded, and includes a submenu of Timers for each tag.
 
-Pressing Spacebar and typing allows you to add a new entry to currently. You an also trigger a custom show command by typing "show [section/tag]" and hitting return.
+Pressing Spacebar and typing allows you to add a new entry to currently. You an also trigger a custom show command by typing "show [section/tag]" and hitting return. Include any command line flags at the end of the string, and if you add text in parenthesis, it will be processed as a note on the entry.
 
 Point of interest, the LaunchBar Action makes use of the `-o json` flag for outputting JSON to the action's script for parsing.
 
+<!--GITHUB-->
 See <https://brettterpstra.com/projects/doing/> for the download.
+<!--JEKYLL
+{% download 117 %} 
+-->
+<!--END GITHUB-->
 
 Evan Lovely has [created an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
 
@@ -610,7 +629,9 @@ Please try not to email me directly about GitHub projects.
 
 Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add more comments in the future (and retroactively).
 
-{% donate doing now sending coffee money to Brett. %}
+<!--END README-->
+
+PayPal link: [paypal.me/ttscoff](https://paypal.me/ttscoff)
 
 ## Changelog
 

data/bin/doing

@@ -36,23 +36,20 @@ default_command :recent
 # sort_help :manually
 
 desc 'Output notes if included in the template'
-default_value true
-switch [:notes], :default_value => true, :negatable => true
+switch [:notes], default_value: true, negatable: true
 
 desc 'Send results report to STDOUT instead of STDERR'
-default_value false
-switch [:stdout], :default_value => false, :negatable => 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
 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]
@@ -62,8 +59,7 @@ arg_name 'entry'
 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]
@@ -72,8 +68,7 @@ command [:now, :next] do |c|
   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'
@@ -81,8 +76,7 @@ command [:now, :next] 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.flag [:a, :app]
 
   c.action do |global_options,options,args|
     if options[:back]
@@ -103,7 +97,7 @@ command [:now, :next] do |c|
       if input
         title, note = wwid.format_input(input)
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
+        wwid.add_item(title.cap_first, section, {note: note, back: date, timed: options[:f]})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
@@ -112,12 +106,12 @@ command [:now, :next] do |c|
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
+        wwid.add_item(title.cap_first, section, {note: note, back: date, timed: options[:f]})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, section, {:note => note, :back => date, :timed => options[:f]})
+        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"
@@ -136,14 +130,13 @@ 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.flag [:s, :section], default_value: "All"
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
-  c.switch [:e, :editor], :negatable => false, :default_value => false
+  c.switch [:e, :editor], negatable: false, default_value: false
 
   c.desc "Replace/Remove last entry's note (default append)"
-  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|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -196,14 +189,13 @@ 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.flag [:s, :section], default_value: wwid.current_section
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch [:e, :editor]
 
   c.desc "Archive previous @meanwhile entry"
-  c.switch [:a, :archive], :default_value => false
+  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 [:b, :back]
@@ -238,7 +230,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,7 +268,6 @@ 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]'
@@ -302,7 +293,7 @@ command :later do |c|
       if input
         title, note = wwid.format_input(input)
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
+        wwid.add_item(title.cap_first, "Later", {note: note, back: date})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
@@ -311,12 +302,12 @@ command :later do |c|
       if args.length > 0
         title, note = wwid.format_input(args.join(" "))
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
+        wwid.add_item(title.cap_first, "Later", {note: note, back: date})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
         note.push(options[:n]) if options[:n]
-        wwid.add_item(title.cap_first, "Later", {:note => note, :back => date})
+        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"
@@ -329,16 +320,13 @@ desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'entry'
 command [:done, :did] do |c|
   c.desc 'Remove @done tag'
-  c.default_value false
-  c.switch [:r, :remove], :negatable => false, :default_value => false
+  c.switch [:r, :remove], negatable: false, default_value: false
 
   c.desc 'Include date'
-  c.default_value true
-  c.switch [: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.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'
   c.flag [:at]
@@ -350,16 +338,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.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 +376,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?
@@ -401,16 +387,16 @@ command [:done, :did] do |c|
         title, note = wwid.format_input(input)
         title += " @done#{donedate}"
         section = "Archive" if options[:a]
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
+        wwid.add_item(title.cap_first, section.cap_first, {note: note, back: date})
         wwid.write(wwid.doing_file)
       else
         raise "No content"
       end
     elsif args.length == 0 && STDIN.stat.size == 0
       if options[:r]
-        wwid.tag_last({:tags => ["done"], :count => 1, :section => section, :remove => true })
+        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[:date]})
+        wwid.tag_last({tags: ["done"], count: 1, section: section, archive: options[:a], back: finish_date, date: options[:date]})
       end
     else
       if args.length > 0
@@ -418,13 +404,13 @@ command [:done, :did] do |c|
         title.chomp!
         title += " @done#{donedate}"
         section = "Archive" if options[:a]
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
+        wwid.add_item(title.cap_first, section.cap_first, {note: note, back: date})
         wwid.write(wwid.doing_file)
       elsif STDIN.stat.size > 0
         title, note = wwid.format_input(STDIN.read)
         title += " @done#{donedate}"
         section = options[:a] ? "Archive" : section
-        wwid.add_item(title.cap_first, section.cap_first, {:note => note, :back => date})
+        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"
@@ -433,12 +419,51 @@ 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.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag2,tag2)'
+  c.flag [:tag]
+
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+
+
+  c.action do |global_options,options,args|
+
+    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+
+    if options[:tag].nil?
+      tags = []
+    else
+      tags = options[:tag].split(/ *, */).map {|t| t.strip.sub(/^@/, '') }
+      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+    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: false, date: false, tag: tags, tag_bool: options[:bool] })
+    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.switch [:date], :negatable => true, :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]
@@ -446,17 +471,20 @@ command :finish do |c|
   c.desc 'Set the completed date to the start date plus XX[hmd]'
   c.flag [:t, :took]
 
+  c.desc 'Finish the last X entries containing TAG. Separate multiple tags with comma (--tag=tag2,tag2)'
+  c.flag [:tag]
+
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.flag [:bool], must_match: /^(and|or|not)$/i, 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.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|
 
@@ -476,11 +504,18 @@ command :finish do |c|
       end
     end
 
+    if options[:tag].nil?
+      tags = []
+    else
+      tags = options[:tag].split(/ *, */).map {|t| t.strip.sub(/^@/, '') }
+      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+    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[:date], :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[:bool] })
     else
       raise "Invalid argument (specify number of recent items to mark @done)"
     end
@@ -491,14 +526,24 @@ desc 'Repeat last entry as new entry'
 arg_name 'section'
 command [:again, :resume] do |c|
   c.desc 'Section'
-  c.flag [:s, :section], :default_value => "All"
+  c.flag [:s, :section], default_value: "All"
+
+  c.desc 'Add new entry to section (default: same section as repeated entry)'
+  c.flag [:in]
+
+  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma.'
+  c.flag [:tag]
+
+  c.desc 'Boolean used to combine multiple tags'
+  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'ALL'
 
   c.desc 'Note'
   c.arg_name 'note_text'
   c.flag [:n, :note]
 
   c.action do |global_options, options, args|
-    wwid.restart_last({ section: options[:s], note: options[:n] })
+    tags = options[:tag].nil? ? [] : options[:tag].split(/ *, */).map {|t| t.sub(/^@/, '').strip }
+    wwid.restart_last({ section: options[:s], note: options[:n], tag: tags, tag_bool: options[:bool], in: options[:in] })
   end
 end
 
@@ -506,23 +551,19 @@ desc 'Tag last entry'
 arg_name 'tag1 [tag2...]'
 command :tag do |c|
   c.desc 'Section'
-  c.flag [:s, :section], :default_value => "All"
+  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.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.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.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.switch [:a, :autotag], negatable: false, default_value: false
 
   c.action do |global_options,options,args|
     if args.length == 0 && !options[:a]
@@ -563,7 +604,7 @@ command :tag do |c|
         end
       end
 
-      wwid.tag_last({:tags => tags, :count => count, :section => section, :date => options[:date], :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
@@ -571,17 +612,15 @@ end
 desc 'Mark last entry as highlighted'
 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|
     mark = wwid.config['marker_tag'] || "flagged"
-    wwid.tag_last({:tags => [mark], :section => options[:s], :remove => options[:r]})
+    wwid.tag_last({tags: [mark], section: options[:s], remove: options[:r]})
   end
 end
 
@@ -589,21 +628,20 @@ desc 'List all entries'
 long_desc 'The argument can be a section name, @tag(s) or both. "pick" or "choose" as an argument will offer a section menu.'
 arg_name '[section|@tags]'
 command :show do |c|
+  c.desc 'Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.'
+  c.flag [:tag]
+
   c.desc 'Tag boolean (AND,OR,NONE)'
-  c.default_value "OR"
-  c.flag [:b, :bool], :default_value => "OR"
+  c.flag [:b, :bool], must_match: /^(and|or|not)$/i, 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.
@@ -613,23 +651,20 @@ command :show do |c|
   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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  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.switch [:only_timed], default_value: false, negatable: false
 
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o, :output]
@@ -666,6 +701,8 @@ command :show do |c|
       section = wwid.current_section
     end
 
+    tags.concat(options[:tag].split(/ *, */).map {|t| t.sub(/^@/, '').strip }) if options[:tag]
+
     unless tags.empty?
       tag_filter = {
         'tags' => tags,
@@ -684,14 +721,14 @@ command :show do |c|
         finish = false
       end
       exit_now! "Unrecognized date string" unless start
-      dates = [start,finish]
+      dates = [start, finish]
     end
 
     options[:t] = true if options[:totals]
 
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_section({:section => section, :date_filter => dates, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags], :highlight => true, :only_timed => options[:only_timed]})
+    puts wwid.list_section({section: section, date_filter: dates, count: options[:c].to_i, tag_filter: tag_filter, age: options[:a], order: options[:s], output: options[:output], times: options[:t], totals: options[:totals], sort_tags: options[:sort_tags], highlight: true, only_timed: options[:only_timed]})
 
   end
 end
@@ -706,30 +743,26 @@ EODESC
 arg_name 'search_pattern'
 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.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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  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.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |global_options,options,args|
 
@@ -738,7 +771,7 @@ command [:grep, :search] do |c|
     options[:t] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed], :sort_tags => options[:sort_tags]})
+    puts wwid.list_section({search: args.join(' '), section: section, output: options[:output], times: options[:t], highlight: true, totals: options[:totals], only_timed: options[:only_timed], sort_tags: options[:sort_tags]})
 
   end
 end
@@ -748,23 +781,20 @@ 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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  c.flag [:tag_sort], default_value: default
 
   c.action do |global_options,options,args|
 
@@ -779,7 +809,7 @@ command :recent do |c|
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags] })
+      puts wwid.recent(count,section.cap_first,{ times: options[:t], totals: options[:totals], sort_tags: options[:sort_tags] })
 
     end
   end
@@ -789,23 +819,20 @@ 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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  c.flag [:tag_sort], default_value: default
 
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o, :output]
@@ -815,7 +842,7 @@ command :today do |c|
     options[:t] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.today(options[:t],options[:output],{:totals => options[:totals], :section => options[:s], :sort_tags => options[:sort_tags]}).chomp
+    puts wwid.today(options[:t], options[:output], {totals: options[:totals], section: options[:s], sort_tags: options[:sort_tags]}).chomp
 
   end
 end
@@ -826,28 +853,26 @@ 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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  c.flag [:tag_sort], default_value: default
 
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o, :output]
 
   c.action do |global_options,options,args|
+    exit_now! "Missing date argument" if args.empty?
 
     date_string = args.join(" ")
 
@@ -869,7 +894,7 @@ command :on do |c|
     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
+    puts wwid.list_date([start, finish], options[:s], options[:t], options[:output], {totals: options[:totals], sort_tags: options[:sort_tags]}).chomp
 
   end
 end
@@ -878,30 +903,27 @@ 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.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.switch [:totals], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  c.flag [:tag_sort], default_value: default
 
   c.action do |global_options, options,args|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-    puts wwid.yesterday(options[:s],options[:t],options[:o],{:totals => options[:totals], :sort_tags => options[:sort_tags]}).chomp
+    puts wwid.yesterday(options[:s], options[:t], options[:o],{ totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
 
   end
 end
@@ -909,7 +931,6 @@ end
 desc 'Show the last entry'
 command :last do |c|
   c.desc 'Specify a section'
-  c.default_value "All"
   c.flag [:s, :section]
 
   c.action do |global_options,options,args|
@@ -920,8 +941,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"
@@ -933,7 +953,7 @@ 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 })
   end
 end
 
@@ -975,29 +995,29 @@ command :view do |c|
   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.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.switch [:totals], default_value: false, negatable: true
+
+  c.desc 'Include colors in output'
+  c.switch [:color], default_value: true, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   default = 'time'
   if wwid.config.has_key?('tag_sort')
     default = wwid.config['tag_sort']
   end
-  c.flag [:tag_sort], :default_value => default
+  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.switch [:only_timed], default_value: false, negatable: true
 
   c.action do |global_options,options,args|
     if args.empty?
@@ -1024,7 +1044,7 @@ command :view do |c|
       tag_filter = false
       if view.has_key?('tags')
         unless view['tags'].nil? || view['tags'].empty?
-          tag_filter = {'tags' => [], 'bool' => "OR"}
+          tag_filter = {'tags' => [], 'bool' => 'OR'}
           if view['tags'].class == Array
             tag_filter['tags'] = view['tags'].map{|tag| tag.strip }
           else
@@ -1045,7 +1065,7 @@ command :view do |c|
       options[:output].downcase! if options[:output]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed, :sort_tags => options[:sort_tags] })
+      puts wwid.list_section({section: section, count: count, template: template, format: format, order: order, tag_filter: tag_filter, output: options[:o], tags_color: tags_color, times: options[:t], highlight: options[:color], totals: options[:totals], only_timed: only_timed, sort_tags: options[:sort_tags] })
     else
       if title.class == FalseClass
         exit_now! "Cancelled"
@@ -1059,8 +1079,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"
@@ -1068,21 +1087,21 @@ command :views do |c|
   end
 end
 
-desc 'Move entries in between sections'
+desc 'Move entries between sections'
 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 filter, combine multiple tags with a comma. Added for compatibility with other commands.'
+  c.flag [:tag]
 
   c.desc 'Tag boolean'
-  c.default_value "AND"
-  c.flag [:b, :bool], :default_value => "AND"
+  c.flag [:b, :bool], must_match: /(and|or|not)/i, default_value: 'AND'
 
   c.action do |global_options,options,args|
     if args.length > 0
@@ -1091,13 +1110,16 @@ command :archive do |c|
         tags = args.map {|t| t.sub(/^@/,'').strip }
       else
         section = args[0].cap_first
-        tags = args.length > 1 ? args[1..-1].map {|t| t.sub(/^@/,'').strip } : nil
+        tags = args.length > 1 ? args[1..-1].map {|t| t.sub(/^@/, '').strip } : nil
       end
     else
       section = wwid.current_section
-      tags = nil
+      tags = []
     end
-    wwid.archive(section,options[:k],options[:t],tags,options[:b])
+
+    tags.concat(options[:tag].split(/ *, */).map {|t| t.sub(/^@/, '').strip }) if options[:tag]
+
+    wwid.archive(section, options[:k], options[:t], tags, options[:b])
   end
 end
 
@@ -1113,7 +1135,7 @@ if `uname` =~ /Darwin/
   c.flag [:b]
 end
   c.desc 'open with $EDITOR'
-  c.switch [:e], :negatable => false
+  c.switch [:e], negatable: false
 
   c.action do |global_options,options,args|
     params = options.dup
@@ -1150,8 +1172,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'
@@ -1189,8 +1210,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
@@ -1202,7 +1222,7 @@ end
 pre do |global,command,options,args|
   if global[:config_file]
     wwid.config_file = global[:config_file]
-    wwid.configure({:ignore_local => true})
+    wwid.configure({ignore_local: true})
     # wwid.results.push("Override config file #{wwid.config_file}")
   end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.49'
+  VERSION = '1.0.54'
 end

data/lib/doing/wwid.rb

@@ -3,6 +3,45 @@
 require 'deep_merge'
 require 'open3'
 
+##
+## @brief      Hash helpers
+##
+class Hash
+  def has_tags?(tags, bool = 'AND')
+    tags = tags.split(/ *, */) if tags.is_a? String
+    item = self
+    case bool
+    when 'AND'
+      result = true
+      tags.each do |tag|
+        unless item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    when 'NOT'
+      result = true
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    else
+      result = false
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = true
+          break
+        end
+      end
+      result
+    end
+  end
+end
+
 ##
 ## @brief      String helpers
 ##
@@ -637,6 +676,8 @@ class WWID
   def restart_last(opt = {})
     opt[:section] ||= 'all'
     opt[:note] ||= []
+    opt[:tag] ||= []
+    opt[:tag_bool] ||= 'AND'
 
     last = last_entry(opt)
     if last.nil?
@@ -645,8 +686,9 @@ class WWID
     end
     # Remove @done tag
     title = last['title'].sub(/\s*@done(\(.*?\))?/, '').chomp
+    section = opt[:in].nil? ? last['section'] : guess_section(opt[:in])
     @auto_tag = false
-    add_item(title, last['section'], { note: opt[:note], back: opt[:date], timed: true })
+    add_item(title, section, { note: opt[:note], back: opt[:date], timed: true })
     write(@doing_file)
   end
 
@@ -656,6 +698,8 @@ class WWID
   ## @param      opt   (Hash) Additional Options
   ##
   def last_entry(opt = {})
+    opt[:tag] ||= []
+    opt[:tag_bool] ||= 'AND'
     opt[:section] ||= @current_section
 
     sec_arr = []
@@ -682,6 +726,8 @@ class WWID
       all_items.concat(@content[section]['items'].dup) if @content.key?(section)
     end
 
+    all_items.select! { |item| item.has_tags?(opt[:tag], opt[:tag_bool]) } if !opt[:tag].nil? && opt[:tag].length.positive?
+
     all_items.max_by { |item| item['date'] }
   end
 
@@ -728,7 +774,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
@@ -736,44 +781,48 @@ 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 = !opt[:tag].nil? && opt[:tag].length.positive? ? item.has_tags?(opt[:tag], opt[:tag_bool]) : true
+
+          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
@@ -783,9 +832,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

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.49
+  version: 1.0.54
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 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