todo-jsonl 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d377d1c1d58686c97a60bec10e9267eda9bb05204cacfaa9cb63af9d84dd6ab4
-  data.tar.gz: dd458140d3c0267c6e3f5508823eb28cd3e99b719da41ba7e4721005a5e1e896
+  metadata.gz: 1ce5f15989aea79c3d9cea13d312faec53a31fbfc92593bdabaea225d9e9fb70
+  data.tar.gz: ffb39beeaa6f6a9b4e1e1c053c98e8e473d687d4cdde406e577b1339fece18a4
 SHA512:
-  metadata.gz: 2d65cc701711b1fff15a3e630554ddf0e48d0455717d24a179ec504d17b7d0b690736e4c58a8cff614d1813782350d64cba7411b38f8c29fcb1c52162481b73e
-  data.tar.gz: 40132a85f1a25e96a44c1ff45aa98a2a4602562cefcad8b7870b0f87fa9da3260b8c4f554ec1eb9471e920411655174df1f447e31641b5c8794d69c5896cebb3
+  metadata.gz: 71ac2951cad1bc62ccaf9aead3aece8b33c1a7139f5f21eee214b1994a94aacf67f61a1b3619db26f1cb539a30371f9a33bd9838e0de15b474a525a98ff3b733
+  data.tar.gz: 016e953216f6360811ba62ada07389ff8788258d03449db38dca10c730bdb90b5ceb30ec31768a387ac5f1db8077155e135fef1fc7ea50c137c5d33d8702fcaa

data/bin/todo.rb

@@ -93,14 +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
+    * 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
@@ -203,6 +204,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 +215,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'
@@ -233,7 +235,7 @@ def list(tasks = nil, patterns = nil)
       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 +288,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'
-      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.3
+  version: 0.1.8
 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: