doing 1.0.60 → 1.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd894959b5ebbff0cd1f08537ec0b754f5a1cc85bce8dbda3f59788ac4f0c230
-  data.tar.gz: eb490a0bdaf48e7197dd1f2257d13142b6e2ec7629bf923aeb87a42c57dc0ec0
+  metadata.gz: 406fa23f47c83c1b9b3c8fa1cd0e193761c0b13e7ec31f75fdf43b1375769d18
+  data.tar.gz: 2c7f30f6acfac0fb33266dd62ce204099c0358cef88e19de8f26c9e9a4f866f2
 SHA512:
-  metadata.gz: 762db76fac95e65bf0d684ac0f88d7ce7e0af7b22fd77792424d73f237d0501e111f4b2d892f74a6f7ca0564470f1a823c4f6843b1def0496502bf3f7f5d2ac0
-  data.tar.gz: 9df0af7494c8a550119249dc6f30d5d6208e6adcea50dc1cd41b12749447eb042450eb29a144ef82a0235db99b71d4b5e0dc9aa23f331932be88cf157bb817b3
+  metadata.gz: 547c64a9fbfdb026a0ecaf1b4b0ae203306907ddbdc7cff76062b82312293e36eb170b8874f3aa643e19a8f2d3310aea472f23b12128b7b9eeb300956210ca68
+  data.tar.gz: 37d3819348c3167b6c77a34f8e7e2311015c3975e8595303e04c1d89cb28d7d8a83d7dfea810440b846621d90fd8e7bd1538dd9e3f607a2002284d1405474de8

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.59<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.60<!--END VER-->.
 
     $ [sudo] gem install doing
 

data/bin/doing

@@ -1230,14 +1230,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 +1249,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.60'
+  VERSION = '1.0.61'
 end

data/lib/doing/wwid.rb

@@ -1551,31 +1551,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'
@@ -1589,74 +1582,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.60
+  version: 1.0.61
 platform: ruby
 authors:
 - Brett Terpstra