doing 1.0.58 → 1.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d29fb84f196b9219119d876aad52a8d4569b12324ece7617b74636d4245885
-  data.tar.gz: 40ed7d9d336b757d777dfa7014e754f115d732835a0a62c4e6a72ce9102c4a7f
+  metadata.gz: 9e2384e06e56e40f7f6c2b26121d16e0caa2cf40639158fc0f079f8ae26738da
+  data.tar.gz: 9e62f0ac38c0f19082094b88382e9779b743a4885403d796dddfb21a68ea1de2
 SHA512:
-  metadata.gz: de8702acf70b5ea8382cf848b65b5164c2230e7f19b893032d4216fc225d596290146a8f461aae4d215a5021f1a0a4129b12750b119f324032f4e206819bfd3d
-  data.tar.gz: a52d1d2f07988441a14f5451206bfb9add306a9cf3b7bd0908b493c5076b5c720d8d26285bc5634f6e23db9ff81e670cd56c20e514bd5163ce82cab950a659dd
+  metadata.gz: 8cdb34a404ae818f10ee9facaba83fd44c584d06950fd2908b6fbb25b04e6a117a74a20836b765a2dca1cde480928398a42b5999e1678499013cbb1e88e5ccac
+  data.tar.gz: 5a771f4ba236518f54cd11bc99f1258b90026afe4face70db83e98f5f5ee97124eab732c7c65ccd61f1b98e18129c4034ea6c036c145e45abe298f058e25bc3e

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.57<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.61<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -167,7 +167,7 @@ The config also contains templates for various command outputs. Include placehol
     - there are some random special combo colors. Use `doing colors` to see the list
 - `%interval`: when used with the `-t` switch on the `show` command, it will display the time between a timestamp or _@start(date)_ tag and the _@done(date)_ tag, if it exists. Otherwise, it will remain empty.
 
-Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting.
+Date formats are based on Ruby [`strftime`](http://www.ruby-doc.org/stdlib-2.1.1/libdoc/date/rdoc/Date.html#method-i-strftime) formatting. You can try it out [here](http://strftime.net).
 
 My normal template for the `recent` command looks like this:
 

data/bin/doing

@@ -310,7 +310,7 @@ end
 
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'ENTRY'
-command [:done, :did] do |c|
+command %i[done did] do |c|
   c.desc 'Remove @done tag'
   c.switch %i[r remove], negatable: false, default_value: false
 
@@ -367,7 +367,7 @@ command [:done, :did] do |c|
 
       date = options[:took] ? finish_date - took : finish_date
     elsif options[:took]
-      finish_date = date + took
+      finish_date = options[:back] ? date + took : nil
     elsif options[:back]
       finish_date = date
     else
@@ -375,7 +375,9 @@ command [:done, :did] do |c|
     end
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
-    donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
+    if finish_date
+      donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
+    end
 
     if options[:e]
       raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -394,8 +396,15 @@ 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[:date] })
+        options = { tags: ['done'],
+          archive: options[:a],
+          back: finish_date,
+          count: 1,
+          date: options[:date],
+          section: section,
+          took: took == 0 ? nil : took
+        }
+        wwid.tag_last(options)
       end
     elsif !args.empty?
       title, note = wwid.format_input(args.join(' '))
@@ -572,7 +581,7 @@ command [:again, :resume] do |c|
 
   c.desc 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'ALL'
+  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
 
   c.desc 'Note'
   c.arg_name 'TEXT'
@@ -1230,14 +1239,17 @@ desc 'Move entries between sections'
 arg_name 'SECTION_NAME'
 default_value wwid.current_section
 command :archive do |c|
-  c.desc 'Count to keep (ignored if archiving by tag)'
-  c.arg_name 'COUNT'
-  c.flag %i[k keep], default_value: 5, must_match: /^\d+$/, type: Integer
+  c.desc 'How many items to keep (ignored if archiving by tag or search)'
+  c.arg_name 'X'
+  c.flag %i[k keep], must_match: /^\d+$/, type: Integer
 
   c.desc 'Move entries to'
   c.arg_name 'SECTION_NAME'
   c.flag %i[t to], default_value: 'Archive'
 
+  c.desc 'Label moved items with @from(SECTION_NAME)'
+  c.switch [:label], default_value: true, negatable: true
+
   c.desc 'Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.'
   c.arg_name 'TAG'
   c.flag [:tag]
@@ -1246,21 +1258,36 @@ command :archive do |c|
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
 
+  c.desc 'Search filter'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.action do |_global_options, options, args|
     if args.empty?
       section = wwid.current_section
       tags = []
+    elsif args[0] =~ /^all/i
+      section = 'all'
     elsif args[0] =~ /^@\S+/
       section = 'all'
       tags = args.map { |t| t.sub(/^@/, '').strip }
     else
       section = args[0].cap_first
-      tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : nil
+      tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : []
     end
 
+    raise '--keep and --count can\'t be used together' if options[:keep] && options[:count]
+
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
-    wwid.archive(section, options[:keep], options[:to], tags, options[:bool])
+    opts = {
+      bool: options[:bool],
+      destination: options[:to],
+      keep: options[:keep],
+      search: options[:search],
+      tags: tags
+    }
+    wwid.archive(section, opts)
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.58'
+  VERSION = '1.0.62'
 end

data/lib/doing/wwid.rb

@@ -2,6 +2,7 @@
 
 require 'deep_merge'
 require 'open3'
+require 'pp'
 
 ##
 ## @brief      Hash helpers
@@ -775,6 +776,7 @@ class WWID
     opt[:remove] ||= false
     opt[:autotag] ||= false
     opt[:back] ||= false
+    opt[:took] ||= nil
 
     sec_arr = []
 
@@ -832,6 +834,8 @@ class WWID
                 else
                   done_date = item['date'] + (opt[:back] - item['date'])
                 end
+              elsif opt[:took]
+                done_date = item['date'] + opt[:took]
               else
                 done_date = Time.now
               end
@@ -890,26 +894,7 @@ class WWID
   end
 
   def update_item(old_item, new_item)
-    items = []
-    @content.each do |_k, v|
-      items.concat(v['items'])
-    end
-
-    idx = nil
-
-    items.each_with_index do |item, i|
-      if old_item == item
-        idx = i
-        break
-      end
-    end
-
-    if idx.nil?
-      @results.push('No entries found')
-      return
-    end
-
-    section = items[idx]['section']
+    section = old_item['section']
 
     section_items = @content[section]['items']
     s_idx = section_items.index(old_item)
@@ -917,7 +902,6 @@ class WWID
     section_items[s_idx] = new_item
     @results.push("Entry updated: #{section_items[s_idx]['title']}")
     @content[section]['items'] = section_items
-    write(@doing_file)
   end
 
   ##
@@ -1570,31 +1554,24 @@ class WWID
   ##             section
   ##
   ## @param      section      (String) The source section
-  ## @param      count        (Integer) The count
-  ## @param      destination  (String) The destination section
-  ## @param      tags         (Array) Tags to archive
-  ## @param      bool         (String) Tag boolean combinator
+  ## @param      options      (Hash) Options
   ##
-  def archive(section = 'Currently', count = 5, destination = nil, tags = nil, bool = nil, _export = nil)
+  def archive(section = 'Currently', options = {})
+    count       = options[:keep] || 0
+    destination = options[:destination] || 'Archive'
+    tags        = options[:tags] || []
+    bool        = options[:bool] || 'AND'
+
     section = choose_section if section.nil? || section =~ /choose/i
-    archive_all = section =~ /all/i # && !(tags.nil? || tags.empty?)
+    archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
     section = guess_section(section) unless archive_all
 
-    add_section('Archive') if destination =~ /archive/i && !sections.include?('Archive')
+    add_section('Archive') if destination =~ /^archive$/i && !sections.include?('Archive')
 
     destination = guess_section(destination)
 
     if sections.include?(destination) && (sections.include?(section) || archive_all)
-      if archive_all
-        to_archive = sections.dup
-        to_archive.delete(destination)
-        to_archive.each do |source, _v|
-          do_archive(source, destination, { count: count, tags: tags, bool: bool, label: true })
-        end
-      else
-        do_archive(section, destination, { count: count, tags: tags, bool: bool, label: true })
-      end
-
+      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
       write(doing_file)
     else
       raise 'Either source or destination does not exist'
@@ -1608,74 +1585,69 @@ class WWID
   ## @param      destination  (String) The destination section
   ## @param      opt          (Hash) Additional Options
   ##
-  def do_archive(section, destination, opt = {})
-    count = opt[:count] || 5
-    tags = opt[:tags] || []
-    bool = opt[:bool] || 'AND'
-    label = opt[:label] || false
+  def do_archive(sect, destination, opt = {})
+    count = opt[:count] || 0
+    tags  = opt[:tags] || []
+    bool  = opt[:bool] || 'AND'
+    label = opt[:label] || true
 
-    items = @content[section]['items']
-    moved_items = []
+    if sect =~ /^all$/i
+      all_sections = sections.dup
+      all_sections.delete(destination)
+    else
+      all_sections = [sect]
+    end
 
-    if tags && !tags.empty?
-      items.delete_if do |item|
-        case bool
-        when /(AND|ALL)/i
-          score = 0
-          tags.each do |tag|
-            score += 1 if item['title'] =~ /@#{tag}/i
-          end
-          res = score < tags.length
-          moved_items.push(item) if res
-          res
-        when /NONE/i
-          del = false
-          tags.each do |tag|
-            del = true if item['title'] =~ /@#{tag}/i
+    counter = 0
+
+    all_sections.each do |section|
+      items = @content[section]['items']
+
+      moved_items = []
+      if !tags.empty? || opt[:search]
+        items.delete_if do |item|
+          if (!tags.empty? && item.has_tags?(tags, bool) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+            moved_items.push(item)
+            counter += 1
+            true
+          else
+            false
           end
-          moved_items.push(item) if del
-          del
-        when /(OR|ANY)/i
-          del = true
-          tags.each do |tag|
-            del = false if item['title'] =~ /@#{tag}/i
+        end
+        moved_items.each do |item|
+          if label && section != 'Currently'
+            item['title'] =
+              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
           end
-          moved_items.push(item) if del
-          del
         end
-      end
-      moved_items.each do |item|
-        if label && section != 'Currently'
-          item['title'] =
-            item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+
+        @content[section]['items'] = items
+        @content[destination]['items'].concat(moved_items)
+        @results.push("Archived #{moved_items.length} items from #{section} to #{destination}")
+      else
+        count = items.length if count == 0 || items.length < count
+
+        @content[section]['items'] = if count.zero?
+                                       []
+                                     else
+                                       items[0..count - 1]
+                                     end
+
+        items.map! do |item|
+          if label && section != 'Currently'
+            item['title'] =
+              item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+          end
+          item
         end
-      end
-      @content[section]['items'] = moved_items
-      @content[destination]['items'] += items
-      @results.push("Archived #{items.length} items from #{section} to #{destination}")
-    else
-      count = items.length if items.length < count
-
-      @content[section]['items'] = if count.zero?
-                                     []
-                                   else
-                                     items[0..count - 1]
-                                   end
-
-      items.map! do |item|
-        if label && section != 'Currently'
-          item['title'] =
-            item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
+        if items.count > count
+          @content[destination]['items'].concat(items[count..-1])
+        else
+          @content[destination]['items'].concat(items)
         end
-        item
-      end
-      if items.count > count
-        @content[destination]['items'].concat(items[count..-1])
-      else
-        @content[destination]['items'].concat(items)
-      end
 
-      @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
+        @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.58
+  version: 1.0.62
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake