doing 1.0.84 → 1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11e6c75768b8dc2db3a36c5cdd572ad03eb884e118848ebbe413df2988a53df
-  data.tar.gz: a3f45b396e4c6b06bab65d24007f0437e72687c6811f559ece8f6c5ca2e7bbba
+  metadata.gz: f11196376a7860f14164c80a107ce4151b18399f785cd607ba4f3a27205828fb
+  data.tar.gz: 1033e528416e1e3660db44ae55973009aa9b766f2566c0ff6e4bb942fdce4c05
 SHA512:
-  metadata.gz: 7be6844f9f6caa072014afeded310cbaddf2a15380fde5498aea0f980dd5e8448ca44f5c5d9692a2075818f632bbbd19cce93e0db338c621a487abed8259f555
-  data.tar.gz: d0af857fee4113e2055af031059901b56e2ff94e849f9d3a0d167d8edde0519e4d6a6ebdeef55050ee313ed628ba6fa2fbd17e73cfc66143e57e7a2c42f93c8f
+  metadata.gz: db7dc195eedf329ec7aad7e29830cf0d42c57178570a4675ce607e29761f733d2371b390f8c8ea73425a86240a28a91f7e05842ad9b49dd89257affbca12e5e6
+  data.tar.gz: 2b992ffea5a41c6f81ab7b5b1fb9b244197cca7eb1d7bbbae1eb6f9911db6ee16293b19e32c8c0b31cd03a3e181c4df9f8e1de893cc37c479fa2bdfd4accf6c4

data/README.md

@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.83<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.84<!--END VER-->.
 
     $ [sudo] gem install doing
 

data/bin/doing

@@ -333,10 +333,6 @@ command :later do |c|
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
 
-  c.desc 'Edit entry with specified app'
-  c.arg_name 'APP'
-  c.flag %i[a app]
-
   c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
   c.arg_name 'DATE_STRING'
   c.flag %i[b back]
@@ -353,7 +349,7 @@ command :later do |c|
       date = Time.now
     end
 
-    if options[:e] || (args.empty? && $stdin.stat.size.zero?)
+    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = args.empty? ? '' : args.join(' ')
@@ -456,7 +452,7 @@ command %i[done did] do |c|
       section = wwid.config['current_section']
     end
 
-    if options[:e]
+    if options[:editor]
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = ''
@@ -1321,7 +1317,7 @@ command :last do |c|
 
     end
 
-    if options[:e]
+    if options[:editor]
       wwid.edit_last(section: options[:s], options: { search: options[:search], tag: tags, tag_bool: options[:bool] })
     else
       puts wwid.last(times: true, section: options[:s],
@@ -1554,6 +1550,11 @@ command :archive do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Archive entries older than date
+    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
   c.action do |_global_options, options, args|
     if args.empty?
       section = wwid.current_section
@@ -1583,6 +1584,7 @@ command :archive do |c|
                       'AND'
                      end
     opts = {
+      before: options[:before],
       bool: options[:bool],
       destination: options[:to],
       keep: options[:keep],
@@ -1615,6 +1617,11 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Rotate entries older than date
+    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
   c.action do |_global_options, options, args|
     if options[:section] && options[:section] !~ /^all$/i
       options[:section] = wwid.guess_section(options[:section])
@@ -1641,11 +1648,11 @@ command :open do |c|
   if `uname` =~ /Darwin/
     c.desc 'Open with app name'
     c.arg_name 'APP_NAME'
-    c.flag [:a]
+    c.flag %i[a app]
 
     c.desc 'Open with app bundle id'
     c.arg_name 'BUNDLE_ID'
-    c.flag [:b]
+    c.flag %i[b bundle_id]
   end
   c.desc "Open with $EDITOR (#{ENV['EDITOR']})"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -1656,11 +1663,11 @@ command :open do |c|
       k.instance_of?(String) || v.nil? || v == false
     end
     if `uname` =~ /Darwin/
-      if options[:a]
+      if options[:app]
         system %(open -a "#{options[:a]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:b]
+      elsif options[:bundle_id]
         system %(open -b "#{options[:b]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:e]
+      elsif options[:editor]
         exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
         system %($EDITOR "#{File.expand_path(wwid.doing_file)}")

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.84'
+  VERSION = '1.0.85'
 end

data/lib/doing/wwid.rb

@@ -1100,7 +1100,6 @@ class WWID
         items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
         idx = 0
         done_date = Time.now
-        next_start = Time.now
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
@@ -1119,8 +1118,8 @@ class WWID
               end
             else
               if opt[:sequential]
-                done_date = next_start - 1
-                next_start = item['date']
+                next_entry = next_item(item)
+                done_date = next_entry['date'] - 60 if next_entry
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1209,6 +1208,24 @@ class WWID
     return new_item
   end
 
+  ##
+  ## @brief      Get next item in the index
+  ##
+  ## @param      old_item
+  ##
+  def next_item(old_item)
+    section = old_item['section']
+
+    section_items = @content[section]['items'].sort_by { |entry| entry['date'] }
+    idx = section_items.index(old_item)
+
+    if section_items.size > idx
+      section_items[idx + 1]
+    else
+      nil
+    end
+  end
+
   ##
   ## @brief      Delete an item from the index
   ##
@@ -1478,7 +1495,7 @@ class WWID
   ##
   ## @param      file  (String) The filepath to write to
   ##
-  def write(file = nil)
+  def write(file = nil, backup: true)
     output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
 
     @content.each do |title, section|
@@ -1490,7 +1507,7 @@ class WWID
       $stdout.puts output
     else
       file = File.expand_path(file)
-      if File.exist?(file)
+      if File.exist?(file) && backup
         # Create a backup copy for the undo command
         FileUtils.cp(file, "#{file}~")
       end
@@ -1549,9 +1566,15 @@ class WWID
       new_content[section]['items'] = []
 
       moved_items = []
-      if !tags.empty? || opt[:search]
+      if !tags.empty? || opt[:search] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
         items.delete_if do |item|
-          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
             moved_items.push(item)
             counter += 1
             true
@@ -1587,10 +1610,15 @@ class WWID
 
     write(@doing_file)
 
-    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d%H:%M')}\\1")
-    @content = new_content
+    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d')}\\1")
+    if File.exist?(file)
+      init_doing_file(file)
+      @content.deep_merge(new_content)
+    else
+      @content = new_content
+    end
 
-    write(file)
+    write(file, backup: false)
   end
 
   ##
@@ -2012,7 +2040,7 @@ class WWID
     destination = guess_section(destination)
 
     if sections.include?(destination) && (sections.include?(section) || archive_all)
-      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
+      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
       write(doing_file)
     else
       exit_now! 'Either source or destination does not exist'
@@ -2045,9 +2073,15 @@ class WWID
       items = @content[section]['items'].dup
 
       moved_items = []
-      if !tags.empty? || opt[:search]
+      if !tags.empty? || opt[:search] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
         items.delete_if do |item|
-          if (!tags.empty? && item.has_tags?(tags, bool) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
             moved_items.push(item)
             counter += 1
             true

metadata

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