todo-jsonl 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bfdc7f1aa08b2e153cb2db14f20487511c3dd4064b5f11164d5f6f503b65ba2
-  data.tar.gz: 6cc8401c245972537c76589ed4cab56b712006216bf1a442269ccb5aa2961cf0
+  metadata.gz: 8e4b32533e988a9c46ea11df68063b0ce2eefcc1941ea9871471264aa45a3eb7
+  data.tar.gz: 96c5880a633cb3e9aaea2e9b39b6e74e542e594d6f4fac98b7018161330bbe9a
 SHA512:
-  metadata.gz: 434b78f9f7f72bfbf127d57e24ab1a48558495e2f79a807554ddfe49197ea20174c68e09ea705215a222ac1acfbcc5114a719dfc301aa96f4f6a5969848c88f4
-  data.tar.gz: 99a3bf80d303e66da13b92a6fa95ec5a31db4623f2fbe9a28f8a7b2b623e858312b397777cb6d297fe2b8e7f96e9f218a961bf6c5606194240c1aa26ec568c08
+  metadata.gz: d246676dd37231499da9d52eee2f5abdaf9d85790c63afc3a4814b6b91cbfb5efda9cb595c365fdb0cf96bdcbbe5751cb05f433c9e6e9d6ce36b120773b88a19
+  data.tar.gz: 114c0e82ad9929615de9405531176f2bfe0969e05b7f4deb27a4002406d37abe253d7824519cc5955f98a75b986f7cccbb16841fc90bad043b3e59c1afd709f7

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 = '*'
 
@@ -95,7 +96,7 @@ def usage
     * 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
@@ -113,6 +114,8 @@ def usage
 
     Legend:
     #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
+
+    Todo file: #{TODO_FILE}
   USAGE
 end
 
@@ -195,7 +198,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)
@@ -204,9 +212,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)
@@ -228,13 +237,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
@@ -287,33 +296,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.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: