doing 1.0.50 → 1.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e84e7e125fd635921025a3c3f8a20a0987215eb551c9adf5ed4239bd276707
-  data.tar.gz: 6a0c28fb01d02a27c51593793d37a4600d45370d7733180cad706dddbddf8715
+  metadata.gz: 03b16107627feaf0adeafbce9ad45e96fc53df7ba379f59dc72d2970d12642ef
+  data.tar.gz: 5cd54e6ba005e985b6c86468831d0b83369c5801916a9e8e15e742c86fcccf53
 SHA512:
-  metadata.gz: 975ec56664d80ceb67f9087d3bc26fa347fb5c38ec3a1488834790a8ac5e8adc2c4c6df74c64ef23eca4689bb38120f9bccce19e1a38001116548a8fdbb587d9
-  data.tar.gz: 8389272923846981d307dfc2f27737f478307b33f805d3eede7f476d07477037a75792f30116aee4d23e9627291546b81ddbe6a88dafba58958e135cd51d466f
+  metadata.gz: 617cd299b816ad12dc042ec76dbd58e5f19dca7098362ad4cc465d70d5c6dfab0e5ca4e05b82cd9535a85638ae490adea4da502ce4b6f0127e25da8f08b0bc6c
+  data.tar.gz: c82bb894c5d457d6bde4e6396cb7badffb4db3e6d0d81b75372f98968ec79b9ebfe15548b7040ddb5cc2eb2abfda2e3faaf6ea517c0485878689b50ce1739a79

data/README.md

@@ -420,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
 
@@ -431,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

@@ -233,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
@@ -422,6 +422,31 @@ 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'
@@ -435,6 +460,12 @@ 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], :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.switch [:auto], :negatable => false, :default_value => false
 
@@ -462,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[: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[:tag_bool] })
     else
       raise "Invalid argument (specify number of recent items to mark @done)"
     end

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -728,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
@@ -736,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
@@ -783,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.50
+  version: 1.0.51
 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
@@ -78,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