doing 1.0.89 → 1.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a776b386e41f7af1402c85780ab0082f7bf8a9984f02b175cd0c5e9e5dcaa5c
-  data.tar.gz: 7737382bca829f2c5b64ca81fb257a4166832b34c0361b82d5a71009a71927e0
+  metadata.gz: ce98503c379e1c769b36a26ed4f2efc9d1871c60abd67a18152db3862e1664c4
+  data.tar.gz: a4783a52a345f7676e08b53d9a06e4b5170ab5ff0f0d52e2ac45bcf7d6dc87f9
 SHA512:
-  metadata.gz: ea87d615dc5e8d92e307bab0f6adb938d9b2eaaa3732a8a148de81daad1b7dff7258a45aec1e306e06912383077ca0b5d01eef7ed06bd13b3c55ef11f6d8bbba
-  data.tar.gz: '0980e9622d44d2e894a99316a2254a55d76dcbe64b3ec9b5302539cc71ada223fd258af9a42c0b190e3a515e36e309fa56c20d5b8c7a21bb9f390a47ca16f1db'
+  metadata.gz: e2166477e4557597bbc5ad81bb94b73a2ec6c1c4ebdb98ac3d7ef860ddb9e6baf1998dd61accc9d336bd59003a77f7486b31edd1c818bab24b9e9ddb44608c7f
+  data.tar.gz: bfba29c14482747cf3150d31d44ccf43038e41c40876b37ebbb2c8c5e1aeb0dc3c0365125c0ef6a53e79d790893c4670a97e55051b06b3292ec4d2040799f15f

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

data/bin/doing

@@ -604,7 +604,7 @@ command :finish do |c|
   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.
+  Automatically generate completion dates 1 minute before next item (in any section) began.
   --auto overrides the --date and --back parameters.)
   c.switch [:auto], negatable: false, default_value: false
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.89'
+  VERSION = '1.0.90'
 end

data/lib/doing/wwid.rb

@@ -841,7 +841,6 @@ class WWID
     end
 
     res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
-    `echo '#{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}' >> test.txt`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -886,8 +885,7 @@ class WWID
         when /(add|remove) tag/
           type = action =~ /^add/ ? 'add' : 'remove'
           if opt[:tag]
-            warn "'add tag' and 'remove tag' can not be used together"
-            Process.exit 1
+            exit_now! "'add tag' and 'remove tag' can not be used together"
           end
           print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
           tag = STDIN.gets
@@ -1127,7 +1125,12 @@ class WWID
             else
               if opt[:sequential]
                 next_entry = next_item(item)
-                done_date = next_entry['date'] - 60 if next_entry
+
+                if next_entry.nil?
+                  done_date = Time.now
+                else
+                  done_date = next_entry['date'] - 60
+                end
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1222,13 +1225,15 @@ class WWID
   ## @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)
+    combined = { 'items' => [] }
+    @content.each do |_k, v|
+      combined['items'] += v['items']
+    end
+    items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
+    idx = items.index(old_item)
 
-    if section_items.size > idx
-      section_items[idx + 1]
+    if idx > 0
+      items[idx - 1]
     else
       nil
     end

metadata

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