todo-jsonl 0.1.21 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c21f9ba1d360f6a7d30edf43d125eb6e99ff98eb8b71d2d36c9bb0ae14283e6
-  data.tar.gz: f2e1bea4d40ff4a612f8ec5976f778e4a339fac49c627c9e85996b928838cdda
+  metadata.gz: 2af368dfb4ac9e0f8e6448e005bb7242c509d6bf0ce1e97bdc8783629c3dd77f
+  data.tar.gz: dc5f0da8574ea5bda98627c122e9a0bdc7c3d661cba879c4ac09bff3cdb075ba
 SHA512:
-  metadata.gz: cd44f645cfc6ace0d7b9c6a799cff82c93e95d110c9364c6efb41e5c93f795191808b991c7091847440e9b3a7c00cbc0b301cdc7b21e4b85b51dbac5b3223706
-  data.tar.gz: ecba51031774954abe6deb57f5971fed0b9b0786066cd14d8a32d29d849da72f43c7ce305aa9c3e4da9d7b24e7e1d17a02fc49195301e66a4d70fd82af248bcb
+  metadata.gz: 1d0b4562ca3af2722f5fb2eb594f248ccaf2b69b18eb2a7f2e19f386da1f60352260631a7afd53e5cf375a3f7c37297a85808a701870b0c2eb73efe9797416e8
+  data.tar.gz: 030be81b91d66d0d084dff2c805df49cc1f2705aa020d607a06003d542a139e0f6b6708d307a6e448e14c0ca76b135878e643c5ab54132ac457be506cea43b4f

data/bin/todo.rb

@@ -120,12 +120,16 @@ class Todo
       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
     rescue => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
+    self
   end
 
   private
@@ -152,6 +156,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:
@@ -173,15 +178,15 @@ class Todo
     due_dates_for_queries = next_7_days.map do |day| day.strftime(DATE_FORMAT) end
 
     @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('|')})"
+      ':active'    => lambda do |task| /(new|started|blocked)/.match(task[:state]) end,
+      ':done'      => lambda do |task| 'done' == task[:state] end,
+      ':blocked'   => lambda do |task| 'blocked' == task[:state] end,
+      ':started'   => lambda do |task| 'started' == task[:state] end,
+      ':new'       => lambda do |task| 'new' == task[:state] end,
+      ':all'       => lambda do |task| /\w+/.match(task[:state]) end,
+      ':today'     => lambda do |task| due_dates_for_queries[0] == task[:due] end,
+      ':tomorrow'  => lambda do |task| due_dates_for_queries[1] == task[:due] end,
+      ':next7days' => lambda do |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) end
     }
   end
 
@@ -197,9 +202,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
 
@@ -233,22 +236,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)
@@ -259,52 +269,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
@@ -334,24 +330,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}"
@@ -371,11 +363,32 @@ 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|
+      match = true
+      patterns.each do |pattern|
+        match = false unless @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
+      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.21
+  version: 0.1.29
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: