todo-jsonl 0.1.9 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889bafbe16e82bf4bc1d64a7cc4991a582693677c02a1a6ace65bdd04f20f4b6
-  data.tar.gz: 67def741aa050ac753c55af39488712aa3aed696f17c28366020233a59673810
+  metadata.gz: eac1c59e2d905a14881aae2903048c63b0b3ff796a1d8511cff286e0d64052fa
+  data.tar.gz: b7105e1b10437375614ea5f696533613100a81eaa57cc11590a1248b2f1ad082
 SHA512:
-  metadata.gz: 5de24eee9c08a01b1abfe1315bbc75444d0d7fa26e0f3c6c99f25911104ec5b3d428e4ae13c23cb3f7d6b931c6b059759b870b65af33ff795786676545813e2c
-  data.tar.gz: 4b10d821af4c52d466f621cc77961551556f915f063032b5e7525c8f5d3fff84b838d1564eeabf899c1480e64235654d1ca669922552ddb53bc4be6941033aab
+  metadata.gz: ef12c1dd2fd26e691a68b8e7934e431cc3cca2eb6542c03671481ecfdbcc29515b133b9db45d103e7cf554da9b12be20139463254192fb55a8fb381fc97345fc
+  data.tar.gz: bcabeafc8735514c3b4f4f19e2c70a970588b7bff168f1f1e928a1b06a79726527cb9df4d3a7250648d256de9749290b70a712bb19f01479481531884536570a

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,19 +62,28 @@ 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
-DUE_DATE_DAYS = (0..6).map do |day| (TODAY.to_date + day).strftime('%A').downcase end
+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_TAG_PATTERN = /(^| )due:([a-zA-Z0-9-]+)/
+CONTEXT_TAG_PATTERN = /(^| )[@+][\w-]+/
+
+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 = '*'
 
 TODO_FILE = "#{ENV['HOME']}/todo.jsonl"
@@ -87,12 +94,12 @@ def usage
 
     Commands:
     * add <text>                     add new task
-    * 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
+    * start <tasknumber> [text]      mark task as started, with optional note
+    * done <tasknumber> [text]       mark task as completed, with optional note
+    * block <tasknumber> [text]      mark task as blocked, with optional note
+    * reset <tasknumber> [text]      reset task to new state, with optional note
     * prio <tasknumber>              toggle high priority flag
-    * due <tasknumber> <date>        set due date (in YYYY-MM-DD format)
+    * due <tasknumber> [date]        set/unset due date (in YYYY-MM-DD format)
 
     * append <tasknumber> <text>     append text to task title
     * rename <tasknumber> <text>     rename task
@@ -108,8 +115,12 @@ def usage
     With list command the following pre-defined regex patterns can be also used:
     #{QUERIES.keys.join(', ')}
 
+    Due dates can be also added via tags in task title: "due:YYYY-MM-DD"
+
     Legend:
     #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
+
+    Todo file: #{TODO_FILE}
   USAGE
 end
 
@@ -139,12 +150,22 @@ def write_tasks(tasks)
   end
 end
 
+def postprocess_tags(task)
+  match_data = task[:title].match(DUE_DATE_TAG_PATTERN)
+  if match_data
+    task[:title] = task[:title].gsub(DUE_DATE_TAG_PATTERN, '')
+    task[:due] = convert_due_date(match_data[2])
+  end
+  raise 'title must not be empty' if task[:title].empty?
+end
+
 def add(text)
   task = {
     state: 'new',
     title: text,
     modified: Time.now.strftime(DATE_FORMAT)
   }
+  postprocess_tags(task)
   File.open(TODO_FILE, 'a:UTF-8') do |file|
     file.write(JSON.generate(task) + "\n")
   end
@@ -155,6 +176,7 @@ def append(item, text = '')
   tasks = load_tasks(item)
   tasks[item][:title] = [tasks[item][:title], text].join(' ')
   tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
+  postprocess_tags(tasks[item])
   write_tasks(tasks)
   list(tasks)
 end
@@ -163,6 +185,7 @@ def rename(item, text)
   tasks = load_tasks(item)
   tasks[item][:title] = text
   tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
+  postprocess_tags(tasks[item])
   write_tasks(tasks)
   list(tasks)
 end
@@ -174,10 +197,14 @@ def delete(item)
   list
 end
 
-def change_state(item, state)
+def change_state(item, state, note = nil)
   tasks = load_tasks(item)
   tasks[item][:state] = state
   tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
+  if !note.nil? && !note.empty?
+    tasks[item][:note] ||= []
+    tasks[item][:note].push(note)
+  end
   write_tasks(tasks)
   list(tasks)
 end
@@ -190,14 +217,9 @@ def set_priority(item)
   list(tasks)
 end
 
-def due_date(item, date = '')
+def due_date(item, date = '', task = nil)
   tasks = load_tasks(item)
-  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][:due] = convert_due_date(date)
   tasks[item][:modified] = Time.now.strftime(DATE_FORMAT)
   write_tasks(tasks)
   list(tasks)
@@ -209,7 +231,7 @@ def list(tasks = nil, patterns = nil)
   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)
@@ -223,7 +245,9 @@ def list(tasks = nil, patterns = nil)
     state = task[:state] || 'default'
     color = COLORS[state]
     display_state = colorize(STATES[state], color)
-    title = task[:title].gsub(/@\w+/) { |tag| colorize(tag, :cyan) }
+    title = task[:title].gsub(CONTEXT_TAG_PATTERN) do |tag|
+      (tag.start_with?(' ') ? ' ' : '') + colorize(tag.strip, :cyan)
+    end
     priority_flag = task[:priority] ? colorize(PRIORITY_FLAG, :red) : ' '
     due_date = ''
     if task[:due] && state != 'done'
@@ -284,6 +308,19 @@ def colorize(text, color)
   "\e[#{COLOR_CODES[color]}m#{text}\e[0m"
 end
 
+def convert_due_date(date = '')
+  due = nil
+  day_index = DUE_DATE_DAYS.index(date.to_s.downcase) ||
+    DUE_DATE_DAYS_SIMPLE.index(date.to_s.downcase) ||
+    DUE_DATE_DAYS.map do |day| day[0..2] end.index(date.to_s.downcase)
+  if day_index
+    due = (TODAY.to_date + day_index).strftime(DATE_FORMAT)
+  else
+    due = date.nil? || date.empty? ? nil : Date.parse(date).strftime(DATE_FORMAT)
+  end
+  return due
+end
+
 def read(arguments)
   begin
     action = arguments.first
@@ -293,17 +330,13 @@ def read(arguments)
       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'])
+      args.length > 0 ? change_state(args.first.to_i, 'started', args[1..-1].join(' ')) : 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'])
+      args.length > 0 ? change_state(args.first.to_i, 'done', args[1..-1].join(' ')) : 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'])
+      args.length > 0 ? change_state(args.first.to_i, 'blocked', args[1..-1].join(' ')) : 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'])
+      args.length > 0 ? change_state(args.first.to_i, 'new', args[1..-1].join(' ')) : list(nil, [':new'])
     when 'prio'
       raise action + ' command requires exactly one parameter' if args.length != 1
       set_priority(args.first.to_i)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.15
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: