todo-jsonl 0.1.17 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66be9ecc38d960f5207cc45621ea59daf90513823b96082f2d27c7062742c270
-  data.tar.gz: 77fdb42c6675a963a1360e9375e03b0b0d4c7fa2fca1d0721f3337da2276685c
+  metadata.gz: 1c785fb535af9ce8e4aa7104e57c66133f6bf201ffb6bc28372d2b386decc4e1
+  data.tar.gz: 6ce70f3e7160c997921bcdbacb442d9e04330019265e60ad4accab1a1cf386ab
 SHA512:
-  metadata.gz: af9f2d586cf93b6642e3f1f99f62e2460e2bbfe1d8a5c659c4835e4c84421733674ce58961581129c75d9b334aac581ae2f92a56f7022f2cdffdfb7f55779806
-  data.tar.gz: 91fe599991ade9a1eccc8fae0ef841b1845d1f47b98bef6f9bc98314120552a86cae1b6c411c715f79525557d8170c5d311f140c26c87fc234990c719a00949e
+  metadata.gz: 18781618d8824776f157cce55015bdd49cd4d68791a6c4f24d86d9f66acb331ef4f2e2b22b1f8577e1f92f32bb232dbb061afa66f8f59aa7bc07bb0bc6d29083
+  data.tar.gz: e0544156459535841c4be51378071f40dda66f945733acf927328930699d0bd3d5b111996ea73cfd5f89f13418617a037d5e418f255093ac95f2d2689ce49da5

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 regexp
       * help                           this help screen
 
       With list command the following pre-defined regex patterns can be also used:
@@ -165,8 +171,8 @@ class Todo
   end
 
   def setup
-    @today = Time.now
-    next_7_days = (0..6).map do |day| (@today.to_date + day) end
+    @today = Date.today
+    next_7_days = (0..6).map do |day| @today + day end
     @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
 
@@ -281,7 +287,7 @@ class Todo
     list(tasks)
   end
 
-  def due_date(item, date = '', task = nil)
+  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?
@@ -291,18 +297,10 @@ class Todo
   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
+    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
@@ -316,7 +314,7 @@ class Todo
       priority_flag = task[:priority] ? colorize(PRIORITY_FLAG, :red) : ' '
       due_date = ''
       if task[:due] && state != 'done'
-        date_diff = (Date.parse(task[:due]) - @today.to_date).to_i
+        date_diff = (Date.strptime(task[:due], DATE_FORMAT) - @today).to_i
         if date_diff < 0
           due_date = colorize("(#{date_diff.abs}d overdue)", :red)
         elsif date_diff == 0 || date_diff == 1
@@ -369,6 +367,28 @@ class Todo
     end
   end
 
+  def cleanup(patterns)
+    tasks = load_tasks
+    patterns = [@queries[':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
@@ -379,14 +399,13 @@ class Todo
       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)
+      due = (@today + day_index).strftime(DATE_FORMAT)
     else
-      due = date.nil? || date.empty? ? nil : Date.parse(date).strftime(DATE_FORMAT)
+      due = date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
     end
     return due
   end
 
 end
 
-todo = Todo.new
-todo.execute(ARGV)
+Todo.new.execute(ARGV)

metadata

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