todo-jsonl 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4b32533e988a9c46ea11df68063b0ce2eefcc1941ea9871471264aa45a3eb7
-  data.tar.gz: 96c5880a633cb3e9aaea2e9b39b6e74e542e594d6f4fac98b7018161330bbe9a
+  metadata.gz: bb612ac4efe61a2da25f5438e4e158612ca1d1837484a5338d8768e527fd9e71
+  data.tar.gz: '079821ed0936b0a250133b18304a1110d59b3fa5f5e008c228ae4c9d01a98799'
 SHA512:
-  metadata.gz: d246676dd37231499da9d52eee2f5abdaf9d85790c63afc3a4814b6b91cbfb5efda9cb595c365fdb0cf96bdcbbe5751cb05f433c9e6e9d6ce36b120773b88a19
-  data.tar.gz: 114c0e82ad9929615de9405531176f2bfe0969e05b7f4deb27a4002406d37abe253d7824519cc5955f98a75b986f7cccbb16841fc90bad043b3e59c1afd709f7
+  metadata.gz: d6a531a29f85db3d3af7baa47f4b26485639db66eebbe028d3327375ff0ebf5d68958a6713a82bb6ae10c3e5beb305d374273ccc82529e4eccc4c0494bfec95f
+  data.tar.gz: 250acb20cb6edf8b5cfac5fc3b568f5cfc2f72245e0884618c7d8143c5a63e81bed6dfa699aa833d4fc96bff9ac62475e2f65647c3e3f9f342725b623d0101b5

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
+    * 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
@@ -112,6 +115,8 @@ 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}
 
@@ -145,12 +150,22 @@ def write_tasks(tasks)
   end
 end
 
+def postprocess_tags(task)
+  title = task[:title]
+  match_data = title.match(DUE_DATE_TAG_PATTERN)
+  if match_data
+    task[:title] = title.gsub(DUE_DATE_TAG_PATTERN, '')
+    task[:due] = convert_due_date(match_data[2])
+  end
+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
@@ -161,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
@@ -169,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
@@ -180,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
@@ -196,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)
@@ -229,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'
@@ -290,6 +308,17 @@ 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)
+  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
@@ -299,17 +328,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.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: