todo-jsonl 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751d24c27a1e18c59b1a0cd828a8ab8c6dd9f60b15956731101cd2518db9fd1c
-  data.tar.gz: 8d5968af9ac740a09b39fb8962861caa1150ba047435d4992441c750857c508c
+  metadata.gz: 26e087f32b9e0ddb96664aaffcb83aab17a4cf31c75eb651bb1797fa6d7fba09
+  data.tar.gz: c298e6c64c3bd28f0d0806c6b12204e74bc7c89e6d32939a2763368cae11e17e
 SHA512:
-  metadata.gz: 745240133b49e0d37ccecb25813088e5f75f024151e9e01c3d1993ce8f852cb3d70ee83b79140c2e2dcdae6251246f4eb5d73ad55cd8e439f4e01113e0c99914
-  data.tar.gz: a9a94cb1f444ca22e69f3c6c3f9a78f42a57f1f61e83e43e6f12655fe854b00d5cf5d2ff95acd0b367c6c2ec87c02724196e305392a2793f9a1ec235ec97ed1c
+  metadata.gz: 6221aaca3f2637bd59c35720f2383e9fb6ef1a59faf5604341da0d04148184e504a53bd0d45a18dcd3462141496a5c91bdc0c8bef896c559362ce0670cc1b231
+  data.tar.gz: 88c148df544f7bc2fb65a50becac172f9f216cbea27a15666add4eb05ae752834b5f5396d191778be7045f2c856034e11a5e38fb3ef210a570bed92aed75f611

data/bin/todo.rb

@@ -2,7 +2,7 @@
 
 # todo.rb - todo list manager inspired by todo.txt using the jsonl format.
 #
-# Copyright (c) 2020 Gabor Bata
+# Copyright (c) 2020-2021 Gabor Bata
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -27,8 +27,6 @@
 require 'json'
 require 'date'
 
-DATE_FORMAT = '%Y-%m-%d'
-
 COLOR_CODES = {
   black:   30,
   red:     31,
@@ -64,21 +62,24 @@ COLORS = {
   'default' => :magenta
 }
 
-QUERIES = {
-  ':active'  => 'state=(new|started|blocked)',
-  ':done'    => 'state=done',
-  ':blocked' => 'state=blocked',
-  ':started' => 'state=started',
-  ':new'     => 'state=new',
-  ':all'     => 'state=\w+'
-}
-
 TODAY = DateTime.now
+NEXT_7_DAYS = (0..6).map do |day| (TODAY.to_date + day) end
+DATE_FORMAT = '%Y-%m-%d'
+DUE_DATE_DAYS = NEXT_7_DAYS.map do |day| day.strftime('%A').downcase end
+DUE_DATES_FOR_QUERIES = NEXT_7_DAYS.map do |day| day.strftime(DATE_FORMAT) end
+DUE_DATE_DAYS_SIMPLE = ['today', 'tomorrow']
 
-DUE_DATE_DAYS = ['today', 'tomorrow']
-(2..6).each do |day|
-  DUE_DATE_DAYS.push((TODAY.to_date + day).strftime('%A').downcase)
-end
+QUERIES = {
+  ':active'    => 'state=(new|started|blocked)',
+  ':done'      => 'state=done',
+  ':blocked'   => 'state=blocked',
+  ':started'   => 'state=started',
+  ':new'       => 'state=new',
+  ':all'       => 'state=\w+',
+  ':today'     => "due=#{DUE_DATES_FOR_QUERIES[0]}",
+  ':tomorrow'  => "due=#{DUE_DATES_FOR_QUERIES[1]}",
+  ':next7days' => "due=(#{DUE_DATES_FOR_QUERIES.join('|')})"
+}
 
 PRIORITY_FLAG = '*'
 
@@ -93,8 +94,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 +196,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,9 +210,10 @@ 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]}"
+    normalized_task = "state=#{task[:state]} due=#{task[:due]} #{task[:title]}"
     match = true
     patterns.each do |pattern|
       match = false unless /#{QUERIES[pattern] || pattern}/ix.match(normalized_task)
@@ -213,7 +221,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'], task[:due] || 'n/a', 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 +235,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 +294,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.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: