todo-jsonl 0.1.20 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39cdc12b9d904368b86e79438a242689700825c668b0ca69aedba68025c9c9f
-  data.tar.gz: f219916b78035ba1daab7211c4318dc7063123a10f9fdcbc6aae91e62265b2b0
+  metadata.gz: 2869302296a5a0ab3af889b0a76926cfba6d59552d5e4103524dae1ae3e7fd50
+  data.tar.gz: f2d7d03e8b62139d3197386c44391caf4a9d4fae545012389272cebdca61c3d9
 SHA512:
-  metadata.gz: 4bb6565bd2a1d4890f3c06fa9b88b7a711d48f1f02fad0b8fcac306c8348a1b65635b9e48245d12abfee95c1eb465ab1790593e3b746c0dc5508d7e97524df23
-  data.tar.gz: d1d9bdcebc0c579ca4e15e1aeb6723885766c5b8790accf284d7619f507e3f4d613ef2cca98c8b7d6e25e43e4bdb55523a28a5616ba1ed95ca1a763ed50bb459
+  metadata.gz: 40c72337ffd6a818adf28ef001cbd3b4f365af92d1fecd9a36ea361522a2125d83500ed76d4633df228c2c87a987083b08541452e7129af914452e7ca6652563
+  data.tar.gz: 6f42e59df9b34c140f3c6bba11010f0b6a3f7a3c45d1c7b23d5ded213ee2562e62a963b3e889a6886b97ff991e49e78af6efccf898fd951220c1cad8bcb2f66d

data/bin/todo.rb

@@ -115,9 +115,14 @@ class Todo
         raise action + ' command requires exactly one parameter' if args.length != 1
         show(args.first.to_i)
       when 'help'
+        raise action + ' command has no parameters' if args.length > 0
         puts usage
       when 'repl'
+        raise action + ' command has no parameters' if args.length > 0
         start_repl
+      when 'cleanup'
+        raise action + ' command requires at least one parameter' if args.nil? || args.empty?
+        cleanup(args)
       else
         list(nil, arguments)
       end
@@ -150,6 +155,7 @@ class Todo
       * list <regex> [regex...]        list tasks (only active tasks by default)
       * show <tasknumber>              show all task details
       * repl                           enter read-eval-print loop mode
+      * 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:
@@ -195,9 +201,7 @@ class Todo
         end
       end
     end
-    if item_to_check && !tasks.has_key?(item_to_check)
-      raise "#{item_to_check}: No such todo"
-    end
+    raise "#{item_to_check}: No such todo" if item_to_check && !tasks.has_key?(item_to_check)
     tasks
   end
 
@@ -231,22 +235,29 @@ class Todo
     list
   end
 
-  def append(item, text = '')
+  def update_task(item, post_action, update_function)
     tasks = load_tasks(item)
-    tasks[item][:title] = [tasks[item][:title], text].join(' ')
+    update_function.call(tasks[item])
     tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    postprocess_tags(tasks[item])
     write_tasks(tasks)
-    list(tasks)
+    case post_action
+    when :show then show(item, tasks)
+    when :list then list(tasks)
+    end
+  end
+
+  def append(item, text = '')
+    update_task(item, :list, lambda do |task|
+      task[:title] = [task[:title], text].join(' ')
+      postprocess_tags(task)
+    end)
   end
 
   def rename(item, text)
-    tasks = load_tasks(item)
-    tasks[item][:title] = text
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    postprocess_tags(tasks[item])
-    write_tasks(tasks)
-    list(tasks)
+    update_task(item, :list, lambda do |task|
+      task[:title] = text
+      postprocess_tags(task)
+    end)
   end
 
   def delete(item)
@@ -257,52 +268,38 @@ class Todo
   end
 
   def change_state(item, state, note = nil)
-    tasks = load_tasks(item)
-    tasks[item][:state] = state
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    if !note.nil? && !note.empty?
-      tasks[item][:note] ||= []
-      tasks[item][:note].push(note)
-    end
-    write_tasks(tasks)
-    list(tasks)
+    update_task(item, :list, lambda do |task|
+      task[:state] = state
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      end
+    end)
   end
 
   def set_priority(item, note = nil)
-    tasks = load_tasks(item)
-    tasks[item][:priority] = !tasks[item][:priority]
-    tasks[item].delete(:priority) if !tasks[item][:priority]
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    if !note.nil? && !note.empty?
-      tasks[item][:note] ||= []
-      tasks[item][:note].push(note)
-    end
-    write_tasks(tasks)
-    list(tasks)
+    update_task(item, :list, lambda do |task|
+      task[:priority] = !task[:priority]
+      task.delete(:priority) if !task[:priority]
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      end
+    end)
   end
 
   def due_date(item, date = '')
-    tasks = load_tasks(item)
-    tasks[item][:due] = convert_due_date(date)
-    tasks[item].delete(:due) if tasks[item][:due].nil?
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    list(tasks)
+    update_task(item, :list, lambda do |task|
+      task[:due] = convert_due_date(date)
+      task.delete(:due) if task[:due].nil?
+    end)
   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]} due=#{task[:due]} #{task[:title]}"
-      match = true
-      patterns.each do |pattern|
-        match = false unless /#{@queries[pattern] || pattern}/ix.match(normalized_task)
-      end
-      items[num] = task if match
-    end
+    patterns = patterns.nil? || patterns.empty? ? [':active'] : patterns
+    items = filter_tasks(tasks, patterns)
     items = items.sort_by do |num, task|
       [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
     end
@@ -332,24 +329,20 @@ class Todo
   end
 
   def add_note(item, text)
-    tasks = load_tasks(item)
-    tasks[item][:note] ||= []
-    tasks[item][:note].push(text)
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    show(item)
+    update_task(item, :show, lambda do |task|
+      task[:note] ||= []
+      task[:note].push(text)
+    end)
   end
 
   def delete_note(item)
-    tasks = load_tasks(item)
-    tasks[item].delete(:note)
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    show(item)
+    update_task(item, :show, lambda do |task|
+      task.delete(:note)
+    end)
   end
 
-  def show(item)
-    tasks = load_tasks(item)
+  def show(item, tasks = nil)
+    tasks = 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}"
@@ -369,11 +362,33 @@ class Todo
     end
   end
 
+  def cleanup(patterns)
+    tasks = load_tasks
+    patterns = [':done'] + patterns.to_a
+    items = filter_tasks(tasks, patterns)
+    items.keys.each do |num| tasks.delete(num) end
+    write_tasks(tasks)
+    puts "Deleted #{items.size} todo(s)"
+  end
+
+  def filter_tasks(tasks, patterns)
+    items = {}
+    tasks.each do |num, task|
+      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)
+      end
+      items[num] = task if match
+    end
+    return items
+  end
+
   def colorize(text, color)
     "\e[#{COLOR_CODES[color]}m#{text}\e[0m"
   end
 
-  def convert_due_date(date = '')
+  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) ||

metadata

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