todo-jsonl 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266e5f102d3397fcbe41fe5af932ca7e3245b3bca0f0c022eba7a08d42e58909
-  data.tar.gz: bd8425b2e83ec7dd8bea45e2e54adebc9e4aaf11e554b850d5dc6d3679dcb845
+  metadata.gz: 751d24c27a1e18c59b1a0cd828a8ab8c6dd9f60b15956731101cd2518db9fd1c
+  data.tar.gz: 8d5968af9ac740a09b39fb8962861caa1150ba047435d4992441c750857c508c
 SHA512:
-  metadata.gz: 478c00716781148b1fd9736dea4afbae040dd817ec5562f31db23eaa8d3069af2210f8e023ab52460723099f98e28cb87ed4694e82fdfd29c8e3a2c74f465a68
-  data.tar.gz: dcc56754c7a74b86e03411440ef9c8b5a703069dfb4e85b23a9b169a3727207ffe64caadcb74bc8c1ac2e7237ecbbd5e8389ff8eac1a26fc6f21a79539590603
+  metadata.gz: 745240133b49e0d37ccecb25813088e5f75f024151e9e01c3d1993ce8f852cb3d70ee83b79140c2e2dcdae6251246f4eb5d73ad55cd8e439f4e01113e0c99914
+  data.tar.gz: a9a94cb1f444ca22e69f3c6c3f9a78f42a57f1f61e83e43e6f12655fe854b00d5cf5d2ff95acd0b367c6c2ec87c02724196e305392a2793f9a1ec235ec97ed1c

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"
@@ -86,16 +94,17 @@ def usage
     * done <tasknumber>              mark task as completed
     * block <tasknumber>             mark task as blocked
     * 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 +112,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 +192,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 +213,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] ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
   end
   items.each do |num, task|
     state = task[:state] || 'default'
@@ -204,7 +221,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 +283,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?
@@ -266,14 +295,16 @@ def read(arguments)
       args.length == 1 ? change_state(args.first.to_i, 'blocked') : list(nil, [':blocked'])
     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,41 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies: []
-description: |2
-      Usage: todo <command> <arguments>
-
-      Commands:
-      * add <text>                     add new task
-      * start <tasknumber>             mark task as started
-      * done <tasknumber>              mark task as completed
-      * block <tasknumber>             mark task as blocked
-      * prio <tasknumber>              toggle high priority flag
-
-      * 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
-
-      * list <regex> [regex...]        list tasks (only active tasks by default)
-      * show <tasknumber>              show all task details
-      * repl                           enter read–eval–print loop mode
-      * help                           this help screen
-
-      With list command the following pre-defined regex patterns can be also used:
-      :active, :done, :blocked, :started, :new, :all
-
-      Legend:
-      new [ ], done [x], started [>], blocked [!], priority *
+description: 
 email: 
 executables:
 - todo.rb