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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9a776b386e41f7af1402c85780ab0082f7bf8a9984f02b175cd0c5e9e5dcaa5c
4
- data.tar.gz: 7737382bca829f2c5b64ca81fb257a4166832b34c0361b82d5a71009a71927e0
3
+ metadata.gz: ce98503c379e1c769b36a26ed4f2efc9d1871c60abd67a18152db3862e1664c4
4
+ data.tar.gz: a4783a52a345f7676e08b53d9a06e4b5170ab5ff0f0d52e2ac45bcf7d6dc87f9
5
5
  SHA512:
6
- metadata.gz: ea87d615dc5e8d92e307bab0f6adb938d9b2eaaa3732a8a148de81daad1b7dff7258a45aec1e306e06912383077ca0b5d01eef7ed06bd13b3c55ef11f6d8bbba
7
- data.tar.gz: '0980e9622d44d2e894a99316a2254a55d76dcbe64b3ec9b5302539cc71ada223fd258af9a42c0b190e3a515e36e309fa56c20d5b8c7a21bb9f390a47ca16f1db'
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.88<!--END VER-->.
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 start date.
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
@@ -1,3 +1,3 @@
1
1
  module Doing
2
- VERSION = '1.0.89'
2
+ VERSION = '1.0.90'
3
3
  end
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
- warn "'add tag' and 'remove tag' can not be used together"
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
- done_date = next_entry['date'] - 60 if next_entry
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
- section = old_item['section']
1226
-
1227
- section_items = @content[section]['items'].sort_by { |entry| entry['date'] }
1228
- idx = section_items.index(old_item)
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 section_items.size > idx
1231
- section_items[idx + 1]
1235
+ if idx > 0
1236
+ items[idx - 1]
1232
1237
  else
1233
1238
  nil
1234
1239
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: doing
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.89
4
+ version: 1.0.90
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brett Terpstra