todo-jsonl 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39c4196d7a61cdddc60d741fd7f872748fee16e6dfac6b0005ad9d790927a6b0
-  data.tar.gz: ee8ca459774e1df288db13e31cc9883cadb6d5cfabbccb68f4f5174d57e9c35b
+  metadata.gz: 7aab10deef9e956db5b18eaed5938749e225e3fdb99764c119fabe7bfa16969f
+  data.tar.gz: 682cf59b330c12e2276e350dba4112e34a56edbf0274276eabb12be81c3b406d
 SHA512:
-  metadata.gz: b84db7afa428f64e5028be1e06da854d26c233c0ae85d95df0d7a47f4f645392fd5289580f9342d39642e895e902c84f6896d80747c6f91466a9b614b19d724b
-  data.tar.gz: 8ce70a368b56dc5df598188e23e0406224258ccfc8066630c0cab7829c0651fba188eb03066e4545eef9e371089c796ef39be1bf110be485b92509d7ef79e69c
+  metadata.gz: 9f4e3193f34df98c4cc50b86722246724cb31dd3d54d754435db5d80a0ac0300a026d5e09c479061a1f8fd65f40773dff5d175184078c573c1d102344a5dd7f7
+  data.tar.gz: 824d0796aa292733ef672d2998377975b3b55a43021224213fa9b78af52fb3dc96842db1d7c00dfe727d6ea593d2bfb694e4072234932d5aff1a53919d48a615

data/bin/todo.rb

@@ -25,6 +25,7 @@
 # SOFTWARE.
 
 require 'json'
+require 'date'
 
 DATE_FORMAT = '%Y-%m-%d'
 
@@ -72,6 +73,13 @@ QUERIES = {
   ':all'     => 'state=\w+'
 }
 
+TODAY = DateTime.now
+
+DUE_DATE_DAYS = ['today', 'tomorrow']
+(2..6).each do |day|
+  DUE_DATE_DAYS.push((TODAY.to_date + day).strftime('%A').downcase)
+end
+
 PRIORITY_FLAG = '*'
 
 TODO_FILE = "#{ENV['HOME']}/todo.jsonl"
@@ -85,13 +93,15 @@ def usage
     * start <tasknumber>             mark task as started
     * done <tasknumber>              mark task as completed
     * block <tasknumber>             mark task as blocked
+    * reset <tasknumber>             reset task to new state
     * prio <tasknumber>              toggle high priority flag
+    * due <tasknumber> <date>        set due date (in YYYY-MM-DD format)
 
     * append <tasknumber> <text>     append text to task title
     * rename <tasknumber> <text>     rename task
     * del <tasknumber>               delete task
     * note <tasknumber> <text>       add note to task
-    * delnote <tasknumber> <text>    delete all notes from task
+    * delnote <tasknumber>           delete all notes from task
 
     * list <regex> [regex...]        list tasks (only active tasks by default)
     * show <tasknumber>              show all task details
@@ -183,6 +193,14 @@ def set_priority(item)
   list(tasks)
 end
 
+def due_date(item, date = '')
+  tasks = load_tasks(item)
+  tasks[item][:due] = date.nil? || date.empty? ? nil : Date.parse(date).strftime(DATE_FORMAT)
+  tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
+  write_tasks(tasks)
+  list(tasks)
+end
+
 def list(tasks = nil, patterns = nil)
   items = {}
   tasks = tasks || load_tasks
@@ -196,7 +214,7 @@ def list(tasks = nil, patterns = nil)
     items[num] = task if match
   end
   items = items.sort_by do |num, task|
-    [task[:priority] ? 0 : 1, ORDER[task[:state] || 'default'], num]
+    [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
   end
   items.each do |num, task|
     state = task[:state] || 'default'
@@ -204,7 +222,19 @@ def list(tasks = nil, patterns = nil)
     display_state = colorize(STATES[state], color)
     title = task[:title].gsub(/@\w+/) { |tag| colorize(tag, :cyan) }
     priority_flag = task[:priority] ? colorize(PRIORITY_FLAG, :red) : ' '
-    puts "#{num.to_s.rjust(4, ' ')}:#{priority_flag}#{display_state} #{title}"
+    due_date = ''
+    if task[:due] && state != 'done'
+      date_diff = (Date.parse(task[:due]) - TODAY.to_date).to_i
+      if date_diff < 0
+        due_date = colorize("(#{date_diff.abs}d overdue)", :red)
+      elsif date_diff == 0 || date_diff == 1
+        due_date = colorize("(#{DUE_DATE_DAYS[date_diff]})", :yellow)
+      else
+        due_date = colorize("(#{DUE_DATE_DAYS[date_diff] || task[:due]})", :magenta) if date_diff > 1
+      end
+      due_date = ' ' + due_date
+    end
+    puts "#{num.to_s.rjust(4, ' ')}:#{priority_flag}#{display_state} #{title}#{due_date}"
   end
   puts 'No todos found' if items.empty?
 end
@@ -257,29 +287,42 @@ def read(arguments)
     args = arguments[1..-1] || []
     case action
     when 'add'
-      add(args.join(' ')) unless args.nil? || args.empty?
+      raise action + ' command requires at least one parameter' if args.nil? || args.empty?
+      add(args.join(' '))
     when 'start'
       args.length == 1 ? change_state(args.first.to_i, 'started') : list(nil, [':started'])
     when 'done'
       args.length == 1 ? change_state(args.first.to_i, 'done') : list(nil, [':done'])
     when 'block'
       args.length == 1 ? change_state(args.first.to_i, 'blocked') : list(nil, [':blocked'])
+    when 'reset'
+      args.length == 1 ? change_state(args.first.to_i, 'new') : list(nil, [':new'])
     when 'prio'
-      set_priority(args.first.to_i) if args.length == 1
+      raise action + ' command requires exactly one parameter' if args.length != 1
+      set_priority(args.first.to_i)
+    when 'due'
+      raise action + ' command requires at least one parameter' if args.length < 1
+      due_date(args.first.to_i, (args[1..-1] || []).join(' '))
     when 'append'
-      append(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      raise action + ' command requires at least two parameters' if args.length < 2
+      append(args.first.to_i, args[1..-1].join(' '))
     when 'rename'
-      rename(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      raise action + ' command requires at least two parameters' if args.length < 2
+      rename(args.first.to_i, args[1..-1].join(' '))
     when 'del'
-      delete(args.first.to_i) if args.length == 1
+      raise action + ' command requires exactly one parameter' if args.length != 1
+      delete(args.first.to_i)
     when 'note'
-      add_note(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      raise action + ' command requires at least two parameters' if args.length < 2
+      add_note(args.first.to_i, args[1..-1].join(' '))
     when 'delnote'
-      delete_note(args.first.to_i) if args.length == 1
+      raise action + ' command requires exactly one parameter' if args.length != 1
+      delete_note(args.first.to_i)
     when 'list'
       list(nil, args)
     when 'show'
-      show(args.first.to_i) if args.length == 1
+      raise action + ' command requires exactly one parameter' if args.length != 1
+      show(args.first.to_i)
     when 'help'
       puts usage
     when 'repl'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: