todo-jsonl 0.1.10 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e087f32b9e0ddb96664aaffcb83aab17a4cf31c75eb651bb1797fa6d7fba09
-  data.tar.gz: c298e6c64c3bd28f0d0806c6b12204e74bc7c89e6d32939a2763368cae11e17e
+  metadata.gz: 6d359c12e487b44bf92a6406c044944c6aac14f4e1e45850b021c7184feb274d
+  data.tar.gz: 84b3b6d64e208e96cb81afbad8f6b07ca2f685a13178854fbd7792c5fde9062a
 SHA512:
-  metadata.gz: 6221aaca3f2637bd59c35720f2383e9fb6ef1a59faf5604341da0d04148184e504a53bd0d45a18dcd3462141496a5c91bdc0c8bef896c559362ce0670cc1b231
-  data.tar.gz: 88c148df544f7bc2fb65a50becac172f9f216cbea27a15666add4eb05ae752834b5f5396d191778be7045f2c856034e11a5e38fb3ef210a570bed92aed75f611
+  metadata.gz: 2eb6fb53e9ab1abd698a55995f7497de9e26f65787402d79afaaf62ca3c58a84cd79d363167d3001e02df0c0eb9a7e024fdd7be37c19d159833041686d6c85fc
+  data.tar.gz: 0edda1d28b4f76aa17bbf0b6c44e11025d433022bb9fef6d1ef1671de360ba841c77dd0c47400afe9f372a0a38c3c13b1a8b85a39de813e7c68fcd146b40ce5f

data/bin/todo.rb

@@ -69,6 +69,9 @@ 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',
@@ -91,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
-    * prio <tasknumber>              toggle high priority flag
-    * due <tasknumber> <date>        set due date (in YYYY-MM-DD format)
+    * 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> [text]       toggle high priority flag, with optional note
+    * 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
@@ -112,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
 
@@ -143,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
@@ -159,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
@@ -167,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
@@ -178,30 +197,33 @@ 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
 
-def set_priority(item)
+def set_priority(item, note = nil)
   tasks = load_tasks(item)
   tasks[item][:priority] = !tasks[item][:priority]
   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
 
-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)
@@ -227,7 +249,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'
@@ -288,6 +312,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
@@ -297,20 +334,16 @@ 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)
+      raise action + ' command requires at least one parameter' if args.length < 1
+      set_priority(args.first.to_i, (args[1..-1] || []).join(' '))
     when 'due'
       raise action + ' command requires at least one parameter' if args.length < 1
       due_date(args.first.to_i, (args[1..-1] || []).join(' '))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.16
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: