todo-jsonl 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31bdcebfb49f7f05d6a424395c278500e1fead78ee0147cf227766a0e23d8fff
-  data.tar.gz: 4d9a84565ccc806e360e9798bedab32054adddd1785dc2be12db0135700fab8e
+  metadata.gz: 889bafbe16e82bf4bc1d64a7cc4991a582693677c02a1a6ace65bdd04f20f4b6
+  data.tar.gz: 67def741aa050ac753c55af39488712aa3aed696f17c28366020233a59673810
 SHA512:
-  metadata.gz: 61aeb4750cc4ac098f7e02455ad290bbc4c7678fa5125f9cb1d628d7f3ac532717de2cf7f0b05c9f1b36a2c4609439b57112052f853d48e381d7f04b9650551c
-  data.tar.gz: 76b8984917bc16e61124ac416291fa3cfb9fa6bb72f1db725f7b614b4b68030d20417fb724291559295ad7e9fdd65de605ac98a09b7d086b46a64bf55b3addae
+  metadata.gz: 5de24eee9c08a01b1abfe1315bbc75444d0d7fa26e0f3c6c99f25911104ec5b3d428e4ae13c23cb3f7d6b931c6b059759b870b65af33ff795786676545813e2c
+  data.tar.gz: 4b10d821af4c52d466f621cc77961551556f915f063032b5e7525c8f5d3fff84b838d1564eeabf899c1480e64235654d1ca669922552ddb53bc4be6941033aab

data/bin/todo.rb

@@ -74,11 +74,8 @@ QUERIES = {
 }
 
 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
+DUE_DATE_DAYS = (0..6).map do |day| (TODAY.to_date + day).strftime('%A').downcase end
+DUE_DATE_DAYS_SIMPLE = ['today', 'tomorrow']
 
 PRIORITY_FLAG = '*'
 
@@ -93,8 +90,9 @@ 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
+    * due <tasknumber> <date>        set due date (in YYYY-MM-DD format)
 
     * append <tasknumber> <text>     append text to task title
     * rename <tasknumber> <text>     rename task
@@ -194,7 +192,12 @@ end
 
 def due_date(item, date = '')
   tasks = load_tasks(item)
-  tasks[item][:due] = date.nil? || date.empty? ? nil : Date.parse(date).strftime(DATE_FORMAT)
+  day_index = DUE_DATE_DAYS.index(date.to_s.downcase) || DUE_DATE_DAYS_SIMPLE.index(date.to_s.downcase)
+  if day_index
+    tasks[item][:due] = (TODAY.to_date + day_index).strftime(DATE_FORMAT)
+  else
+    tasks[item][:due] = date.nil? || date.empty? ? nil : Date.parse(date).strftime(DATE_FORMAT)
+  end
   tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
   write_tasks(tasks)
   list(tasks)
@@ -203,6 +206,7 @@ end
 def list(tasks = nil, patterns = nil)
   items = {}
   tasks = tasks || load_tasks
+  task_indent = [tasks.keys.max.to_s.size, 4].max
   patterns = patterns.nil? || patterns.empty? ? [QUERIES[':active']] : patterns
   tasks.each do |num, task|
     normalized_task = "state=#{task[:state]} #{task[:title]}"
@@ -213,7 +217,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'
@@ -227,13 +231,13 @@ def list(tasks = nil, patterns = nil)
       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)
+        due_date = colorize("(#{DUE_DATE_DAYS_SIMPLE[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}"
+    puts "#{num.to_s.rjust(task_indent, ' ')}:#{priority_flag}#{display_state} #{title}#{due_date}"
   end
   puts 'No todos found' if items.empty?
 end
@@ -286,31 +290,46 @@ 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'
+      raise action + ' command can receive only one task number' if args.length > 1
       args.length == 1 ? change_state(args.first.to_i, 'started') : list(nil, [':started'])
     when 'done'
+      raise action + ' command can receive only one task number' if args.length > 1
       args.length == 1 ? change_state(args.first.to_i, 'done') : list(nil, [':done'])
     when 'block'
+      raise action + ' command can receive only one task number' if args.length > 1
       args.length == 1 ? change_state(args.first.to_i, 'blocked') : list(nil, [':blocked'])
+    when 'reset'
+      raise action + ' command can receive only one task number' if args.length > 1
+      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'
-      due_date(args.first.to_i, (args[1..-1] || []).join(' ')) unless args.length < 1
+      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 < 2
+      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 < 2
+      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 < 2
+      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.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: