todo-jsonl 0.1.19 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd0447c1a7546c396ad8c792f7b7da0d2a72dcf9bf0d20aefd554cffb4c40cb
-  data.tar.gz: 49428f5380ed3c56b4c548e80661c77a1a83e6129a69dae7292457f423532390
+  metadata.gz: d47bb16f60f84f6c3e55951169bdb0871f915b7a6948844897fa8a150df05456
+  data.tar.gz: '09600be32199c25bc946036ee947290c7c77472d00933fee39c67d9bd2dc0649'
 SHA512:
-  metadata.gz: 0cdc1df93f9b9c194fbe48486dc0b6d92b8f2613af3d2b9d398ac2bd2b0478025ce8a495e98c1860888cbe7335d33997ce23ef5e7b9d1c2be53bbaf400a6e967
-  data.tar.gz: 8d04c7605fdc2e96ec5b8adcd88b115e805a5441cc32ec50b3c7839beb350e1fb215f07874f34a14301ffd8b36cfe6f1f735731e65e17b8d98235a56e6c61052
+  metadata.gz: 3ae62a56b667ebcb55e661d1ac64cd4c2b62db7d7d4f106c79a034ca58264d4d7c3ea20a4d262e4386806baa88d472c88dcc5a6946c4d3ca8eb01bbc3d99363e
+  data.tar.gz: ede2f1f9f155ce5ff5acacdd784b030c01e11f14a4ef6d85e5223663dc3a0dea5a2ab8a3eac95f498808747fa9588723d1feef36828e4657ee23cd41736aa4e0

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:
@@ -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
 
@@ -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,78 +235,68 @@ 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)
+    send(post_action, tasks) if post_action
+  end
+
+  def append(item, text = '')
+    update_task item, :list, lambda { |task|
+      task[:title] = [task[:title], text].join(' ')
+      postprocess_tags(task)
+    }
   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 { |task|
+      task[:title] = text
+      postprocess_tags(task)
+    }
   end
 
   def delete(item)
     tasks = load_tasks(item)
     tasks.delete(item)
     write_tasks(tasks)
-    list
+    list(tasks)
   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 { |task|
+      task[:state] = state
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      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 { |task|
+      task[:priority] = !task[:priority]
+      task.delete(:priority) if !task[:priority]
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      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 { |task|
+      task[:due] = convert_due_date(date)
+      task.delete(:due) if task[:due].nil?
+    }
   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
@@ -316,7 +310,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
@@ -332,24 +326,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 { |task|
+      task[:note] ||= []
+      task[:note].push(text)
+    }
   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 { |task|
+      task.delete(:note)
+    }
   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,19 +359,41 @@ 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) ||
       @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

metadata

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