doing 1.0.68 → 1.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf8a6f7fcc6e38684720c4a4f28c00b03ad5e7d0d51a92c734f84254eeb6c1a
-  data.tar.gz: 4cf29822709042f2744718ce5e525582408295f2300df8f962e32c9a788c339e
+  metadata.gz: bf5235acbab516c74ea7ff28c610dcbc49b9d9f108056c1b3c60ac0100bd9ec5
+  data.tar.gz: ca6abc5bd66a950d78ab16aabc781660b0ea5ee3f6dc50bb8a9fd0b986cce21e
 SHA512:
-  metadata.gz: 9a76904bdca84e0bbc77694d0864d01a419ae6cd5c13aa42404b199bcb60d7421fcc58b02dd1373f1a81c8645815dbf43f958f43d52510f574fa9147c04cbfb3
-  data.tar.gz: 1edaa81995c4b1ab77f5a0b4413b7961d47e67974a7201b623eb7d1727b274076e26a8a86a6ad1811ee6c2f8c9d3ac0786579097783eb5069feb045097527da2
+  metadata.gz: b9f62baa0a4348212c54c1f9f3aa5bca041d81bc5061221310a85747b05c0b9b7af9036d309fcffd78e192a7a415f462ceeb96f8c276cef320249651f4890d35
+  data.tar.gz: cc61feaf78e9a3d6865bbb3d5fecdff00659b9b00a7430971012bfca0856e45ee87efd864dde603a7a6e6abf6a571f01f0e8d60afbbb7ebe060364f65c908b6b

data/README.md

@@ -29,7 +29,7 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.67<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.68<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -464,6 +464,7 @@ You can also include a `--no-date` switch to add `@done` without a finish date,
 
 By default `doing finish` works on a single entry, the last entry or the most recent entry matching a `--tag` or `--search` query. Specifying `doing finish 10` would finish any unfinished entries within the last 10 entries. In the case of `--tag` or `--search` queries, the count serves as the maximum number of matches doing will act on, sorted in reverse date order (most recent first). A count of 0 will disable the limit entirely, acting on all matching entries.
 
+Both `finish` and `cancel` accept `--unfinished` as an argument. This causes them to act on the last entry not already marked @done, no matter how far back it's dated or how many @done entries come after it. You can use `doing finish --unfinished X -s SECTION` to finish the last X unfinished entries in SECTION.
 
 ##### Tagging and Autotagging
 

data/bin/doing

@@ -446,6 +446,9 @@ command :cancel do |c|
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
+  c.desc 'Cancel last entry (or entries) not already marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
@@ -478,7 +481,8 @@ command :cancel do |c|
       sequential: false,
       tag: tags,
       tag_bool: options[:bool],
-      tags: ['done']
+      tags: ['done'],
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -512,6 +516,9 @@ command :finish do |c|
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
+  c.desc 'Finish last entry (or entries) not already marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
   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.)
@@ -574,7 +581,8 @@ command :finish do |c|
       sequential: options[:auto],
       tag: tags,
       tag_bool: options[:bool],
-      tags: ['done']
+      tags: ['done'],
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -648,6 +656,9 @@ command :tag do |c|
   c.desc 'Remove given tag(s)'
   c.switch %i[r remove], negatable: false, default_value: false
 
+  c.desc 'Tag last entry (or entries) not marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
   c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
   c.switch %i[a autotag], negatable: false, default_value: false
 
@@ -691,7 +702,8 @@ command :tag do |c|
       date: options[:date],
       remove: options[:r],
       section: section,
-      tags: tags
+      tags: tags,
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -706,9 +718,17 @@ command [:mark, :flag] do |c|
   c.desc 'Remove mark'
   c.switch %i[r remove], negatable: false, default_value: false
 
+  c.desc 'Mark last entry not marked @done'
+  c.switch %i[u unfinished], 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({
+      remove: options[:r],
+      section: options[:s],
+      tags: [mark],
+      unfinished: options[:unfinished]
+    })
   end
 end
 

data/lib/doing/helpers.rb

@@ -6,6 +6,7 @@ class ::Hash
     tags = tags.split(/ *, */) if tags.is_a? String
     bool = bool.normalize_bool if bool.is_a? String
     item = self
+    tags.map! {|t| t.strip.sub(/^@/, '')}
     case bool
     when :and
       result = true

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -781,6 +781,7 @@ class WWID
     opt[:autotag] ||= false
     opt[:back] ||= false
     opt[:took] ||= nil
+    opt[:unfinished] ||= false
 
     sec_arr = []
 
@@ -816,10 +817,11 @@ class WWID
         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])
 
-          if tag_match && search_match
+          if tag_match && search_match && !finished
             if opt[:autotag]
               new_title = autotag(item['title']) if @auto_tag
               if new_title == item['title']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.68
+  version: 1.0.69
 platform: ruby
 authors:
 - Brett Terpstra