doing 1.0.89 → 1.0.90
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/bin/doing +1 -1
- data/lib/doing/version.rb +1 -1
- data/lib/doing/wwid.rb +15 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ce98503c379e1c769b36a26ed4f2efc9d1871c60abd67a18152db3862e1664c4
|
4
|
+
data.tar.gz: a4783a52a345f7676e08b53d9a06e4b5170ab5ff0f0d52e2ac45bcf7d6dc87f9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e2166477e4557597bbc5ad81bb94b73a2ec6c1c4ebdb98ac3d7ef860ddb9e6baf1998dd61accc9d336bd59003a77f7486b31edd1c818bab24b9e9ddb44608c7f
|
7
|
+
data.tar.gz: bfba29c14482747cf3150d31d44ccf43038e41c40876b37ebbb2c8c5e1aeb0dc3c0365125c0ef6a53e79d790893c4670a97e55051b06b3292ec4d2040799f15f
|
data/README.md
CHANGED
@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
|
|
27
27
|
|
28
28
|
## Installation
|
29
29
|
|
30
|
-
The current version of `doing` is <!--VER-->1.0.
|
30
|
+
The current version of `doing` is <!--VER-->1.0.89<!--END VER-->.
|
31
31
|
|
32
32
|
$ [sudo] gem install doing
|
33
33
|
|
data/bin/doing
CHANGED
@@ -604,7 +604,7 @@ command :finish do |c|
|
|
604
604
|
c.switch %i[u unfinished], negatable: false, default_value: false
|
605
605
|
|
606
606
|
c.desc %(Auto-generate finish dates from next entry's start time.
|
607
|
-
Automatically generate completion dates 1 minute before next
|
607
|
+
Automatically generate completion dates 1 minute before next item (in any section) began.
|
608
608
|
--auto overrides the --date and --back parameters.)
|
609
609
|
c.switch [:auto], negatable: false, default_value: false
|
610
610
|
|
data/lib/doing/version.rb
CHANGED
data/lib/doing/wwid.rb
CHANGED
@@ -841,7 +841,6 @@ class WWID
|
|
841
841
|
end
|
842
842
|
|
843
843
|
res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
|
844
|
-
`echo '#{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}' >> test.txt`
|
845
844
|
selected = []
|
846
845
|
res.split(/\n/).each do |item|
|
847
846
|
idx = item.match(/^(\d+)\)/)[1].to_i
|
@@ -886,8 +885,7 @@ class WWID
|
|
886
885
|
when /(add|remove) tag/
|
887
886
|
type = action =~ /^add/ ? 'add' : 'remove'
|
888
887
|
if opt[:tag]
|
889
|
-
|
890
|
-
Process.exit 1
|
888
|
+
exit_now! "'add tag' and 'remove tag' can not be used together"
|
891
889
|
end
|
892
890
|
print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
|
893
891
|
tag = STDIN.gets
|
@@ -1127,7 +1125,12 @@ class WWID
|
|
1127
1125
|
else
|
1128
1126
|
if opt[:sequential]
|
1129
1127
|
next_entry = next_item(item)
|
1130
|
-
|
1128
|
+
|
1129
|
+
if next_entry.nil?
|
1130
|
+
done_date = Time.now
|
1131
|
+
else
|
1132
|
+
done_date = next_entry['date'] - 60
|
1133
|
+
end
|
1131
1134
|
elsif opt[:took]
|
1132
1135
|
if item['date'] + opt[:took] > Time.now
|
1133
1136
|
item['date'] = Time.now - opt[:took]
|
@@ -1222,13 +1225,15 @@ class WWID
|
|
1222
1225
|
## @param old_item
|
1223
1226
|
##
|
1224
1227
|
def next_item(old_item)
|
1225
|
-
|
1226
|
-
|
1227
|
-
|
1228
|
-
|
1228
|
+
combined = { 'items' => [] }
|
1229
|
+
@content.each do |_k, v|
|
1230
|
+
combined['items'] += v['items']
|
1231
|
+
end
|
1232
|
+
items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
|
1233
|
+
idx = items.index(old_item)
|
1229
1234
|
|
1230
|
-
if
|
1231
|
-
|
1235
|
+
if idx > 0
|
1236
|
+
items[idx - 1]
|
1232
1237
|
else
|
1233
1238
|
nil
|
1234
1239
|
end
|