todo-jsonl 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a389a0b7225f800d916b58f952227d7172f6df9fbeb94a832f8b35e8d6310b3
-  data.tar.gz: 23f27f59ae81ac5b1aca3d8b5234a8eaeb84141eb08d53e713a72032c9a004f0
+  metadata.gz: 0bfdc7f1aa08b2e153cb2db14f20487511c3dd4064b5f11164d5f6f503b65ba2
+  data.tar.gz: 6cc8401c245972537c76589ed4cab56b712006216bf1a442269ccb5aa2961cf0
 SHA512:
-  metadata.gz: 11d560696887b3ec7269992d0965586b26e167283b9612a1505ebe2d8797163e4ef83cf01f7364ade432af9e292ee65b00dde3681553cd5d2511bf18928ec0ea
-  data.tar.gz: f3ca3d8c038f6efe379af9d9536781493018743686a956adaf1cbe18362838ed7585a0462c7f60da20b7a914be041535cbc9030c29fe7249fe4c3b8818e2d70e
+  metadata.gz: 434b78f9f7f72bfbf127d57e24ab1a48558495e2f79a807554ddfe49197ea20174c68e09ea705215a222ac1acfbcc5114a719dfc301aa96f4f6a5969848c88f4
+  data.tar.gz: 99a3bf80d303e66da13b92a6fa95ec5a31db4623f2fbe9a28f8a7b2b623e858312b397777cb6d297fe2b8e7f96e9f218a961bf6c5606194240c1aa26ec568c08

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,17 +93,19 @@ 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
 
     * 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
-    * repl                           enter read–eval–print loop mode
+    * repl                           enter read-eval-print loop mode
     * help                           this help screen
 
     With list command the following pre-defined regex patterns can be also used:
@@ -103,7 +113,7 @@ def usage
 
     Legend:
     #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
-   USAGE
+  USAGE
 end
 
 def load_tasks(item_to_check = nil)
@@ -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
@@ -254,7 +284,7 @@ end
 def read(arguments)
   begin
     action = arguments.first
-    args = arguments[1..-1]
+    args = arguments[1..-1] || []
     case action
     when 'add'
       add(args.join(' ')) unless args.nil? || args.empty?
@@ -264,16 +294,20 @@ def read(arguments)
       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
+    when 'due'
+      due_date(args.first.to_i, (args[1..-1] || []).join(' ')) unless args.length < 1
     when 'append'
-      append(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      append(args.first.to_i, args[1..-1].join(' ')) unless args.length < 2
     when 'rename'
-      rename(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      rename(args.first.to_i, args[1..-1].join(' ')) unless args.length < 2
     when 'del'
       delete(args.first.to_i) if args.length == 1
     when 'note'
-      add_note(args.first.to_i, args[1..-1].join(' ')) unless args.length < 1
+      add_note(args.first.to_i, args[1..-1].join(' ')) unless args.length < 2
     when 'delnote'
       delete_note(args.first.to_i) if args.length == 1
     when 'list'

metadata

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