todo-jsonl 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9f0379dadc07a6aa67bc1dc0662fcb6df0b4183f55de8abbda1020e8393bfc
-  data.tar.gz: c61ac4593f27a6bb737fe2c419fb28b356eed555291c68b33dd17a7a2589ce8b
+  metadata.gz: 2b0c251bf65b4b67f7e2650f10b6e898047a8dc1b5fcd89f1ebc364b27334f07
+  data.tar.gz: 86d3647f960571d3a7b5c9f33c55352a2852c6c193696eee090aeb93854009f8
 SHA512:
-  metadata.gz: ce2c81b1964521382cfef561aa92e7c954a4537664966243132d9d6b8752593bcc8fe4386ff7e565e751856697ca08e1a12a798b26cb2f83856db78adea4e2a2
-  data.tar.gz: 6235a7b73886fd6a9a8944287c8c47f012797affac60f492eb7551dd19e4690f06ad7986d63523474cf730d74507ab0caae03de5af6b296ba9613788ed408581
+  metadata.gz: 1e6a0153c341b7e2f7593cc2cd651e26493ea885718392d237f609c3f7b4035d538a2db20b5ba89b56639d14fafb06e7d225bcb417edf5fd5918e26574122174
+  data.tar.gz: 47daf98ef96b84241eeca49cbecd2ff33a4ad53663fdcbfaeba1377cabfb504b1273c71a90a462396bcec74e44f2deb4e2f37490bc1ae1a559e889f615946b61

data/bin/todo.rb

@@ -69,7 +69,7 @@ class Todo
   DUE_DATE_TAG_PATTERN = /(^| )due:([a-zA-Z0-9-]+)/
   CONTEXT_TAG_PATTERN = /(^| )[@+][\w-]+/
   PRIORITY_FLAG = '*'
-  TODO_FILE = "#{ENV['HOME']}/todo.jsonl"
+  TODO_FILE = File.join(Dir.home, 'todo.jsonl')
 
   def execute(arguments)
     begin
@@ -107,8 +107,8 @@ class Todo
         raise action + ' command requires at least two parameters' if args.length < 2
         add_note(args.first.to_i, args[1..-1].join(' '))
       when 'delnote'
-        raise action + ' command requires exactly one parameter' if args.length != 1
-        delete_note(args.first.to_i)
+        raise action + ' command requires one or two parameters' if args.length < 1 || args.length > 2
+        delete_note(args.first.to_i, args[1])
       when 'list'
         list(nil, args)
       when 'show'
@@ -126,7 +126,7 @@ class Todo
       else
         list(nil, arguments)
       end
-    rescue => error
+    rescue StandardError => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
     self
@@ -151,7 +151,7 @@ class Todo
       * rename <tasknumber> <text>     rename task
       * del <tasknumber>               delete task
       * note <tasknumber> <text>       add note to task
-      * delnote <tasknumber>           delete all notes from task
+      * delnote <tasknumber> [number]  delete a specific or all notes from task
 
       * list <regex> [regex...]        list tasks (only active tasks by default)
       * show <tasknumber>              show all task details
@@ -159,13 +159,14 @@ class Todo
       * cleanup <regex> [regex...]     cleanup completed tasks by regex
       * help                           this help screen
 
-      With list command the following pre-defined regex patterns can be also used:
-      #{@queries.keys.join(', ')}
+      With list command the following pre-defined queries can be also used:
+      #{@queries.keys.each_with_index.map { |k, i| (i == 8 ? "\n" : '') + k }.join(', ')}
 
       Due dates can be also added via tags in task title: "due:YYYY-MM-DD"
+      In addition to formatted dates, you can use date synonyms:
+      "due:today", "due:tomorrow", and day names e.g. "due:monday" or "due:tue"
 
-      Legend:
-      #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
+      Legend: #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
 
       Todo file: #{TODO_FILE}
     USAGE
@@ -183,9 +184,13 @@ class Todo
       ':started'   => lambda { |task| 'started' == task[:state] },
       ':new'       => lambda { |task| 'new' == task[:state] },
       ':all'       => lambda { |task| /\w+/.match(task[:state]) },
+      ':priority'  => lambda { |task| task[:priority] },
+      ':note'      => lambda { |task| task[:note] && !task[:note].empty? },
       ':today'     => lambda { |task| due_dates_for_queries[0] == task[:due] },
       ':tomorrow'  => lambda { |task| due_dates_for_queries[1] == task[:due] },
-      ':next7days' => lambda { |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) }
+      ':next7days' => lambda { |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) },
+      ':overdue'   => lambda { |task| task[:due] && task[:due] < due_dates_for_queries[0] },
+      ':due'       => lambda { |task| task[:due] }
     }
   end
 
@@ -207,9 +212,7 @@ class Todo
 
   def write_tasks(tasks)
     File.open(TODO_FILE, 'w:UTF-8') do |file|
-      tasks.keys.sort.each do |key|
-        file.write(JSON.generate(tasks[key]) + "\n")
-      end
+      tasks.keys.sort.each { |key| file.write(JSON.generate(tasks[key]) + "\n") }
     end
   end
 
@@ -223,15 +226,9 @@ class Todo
   end
 
   def add(text)
-    task = {
-      state:    'new',
-      title:    text,
-      modified: @today.strftime(DATE_FORMAT)
-    }
+    task = { state: 'new', title: text, modified: @today.strftime(DATE_FORMAT) }
     postprocess_tags(task)
-    File.open(TODO_FILE, 'a:UTF-8') do |file|
-      file.write(JSON.generate(task) + "\n")
-    end
+    File.open(TODO_FILE, 'a:UTF-8') { |file| file.write(JSON.generate(task) + "\n") }
     list
   end
 
@@ -301,7 +298,12 @@ class Todo
     patterns ||= []
     patterns += [':active'] if (patterns & [':active', ':done', ':blocked', ':started', ':new', ':all']).empty?
     items = filter_tasks(tasks, patterns).sort_by do |num, task|
-      [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
+      [
+        task[:priority] && task[:state] != 'done' ? 0 : 1,
+        ORDER[task[:state] || 'default'],
+        task[:state] != 'done' ? task[:due] || 'n/a' : task[:modified],
+        num
+      ]
     end
     items.each do |num, task|
       state = task[:state] || 'default'
@@ -322,7 +324,7 @@ class Todo
         end
         due_date = ' ' + due_date
       end
-      puts "#{num.to_s.rjust(task_indent, ' ')}:#{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
@@ -334,17 +336,25 @@ class Todo
     end)
   end
 
-  def delete_note(item)
+  def delete_note(item, num = nil)
     update_task(item, :show, lambda do |task|
-      task.delete(:note)
+      if num.to_s.empty?
+        task.delete(:note)
+      else
+        raise "#{num.to_i}: Note does not exist" if num.to_i <= 0 || task[:note].to_a.size < num.to_i
+        task[:note].delete_at(num.to_i - 1)
+        task.delete(:note) if task[:note].empty?
+      end
     end)
   end
 
   def show(item, tasks = nil)
     tasks ||= load_tasks(item)
-    tasks[item].each do |key, value|
-      val = value.kind_of?(Array) ? "\n" + value.join("\n") : value
-      puts "#{colorize(key.to_s.rjust(10, ' ') + ':', :cyan)} #{val}"
+    tasks[item].each do |k, v|
+      v = "\n" + v.each_with_index.
+        map { |n, i| v.size > 1 ? "#{(i + 1).to_s.rjust(v.size.to_s.size)}: #{n}" : n }.
+        join("\n") if v.is_a?(Array)
+      puts "#{colorize(k.to_s.rjust(10) + ':', :cyan)} #{v}"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: