todo-jsonl 0.1.24 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f947add722dd8daa2e1c9e95b28e88ca906adb71c27af00ef251702c75c868e8
-  data.tar.gz: ec96ca95d021e7eb4ed2ebb2e4738d08a19291e54c366873843b5c6a66108347
+  metadata.gz: 9ef8eba60ead95705dc2479f4f40fc9e25989b99b25a429de36c6703dca61196
+  data.tar.gz: 9e161dd022343525a4d1e4fd94c214763edc9a57796f3955a510082acda95515
 SHA512:
-  metadata.gz: 5bb56460d8dd36f2643e13f0c5d4c969c4a3ebdfb887da54dabf07771ad9fbf80cbd5c115e8b058cc837aaa690ecb54850183e25d6609d4387b6335bffc0e5df
-  data.tar.gz: 8abecd75607bc3208ddc5a73bc13cf7a1f3921a9c9275e0d067ee9c0b12c22cc7280701943c0f11d417daa1cf3cbcb3541704c2c5ec9c99ea6ada8ffe9372642
+  metadata.gz: ba7a785128d5f7fddac436e7d2b069f3b96f69fd8f37240e06f8b2382d113391cafaf64b9cb4a48ce0260ef305b292039a40f065c8ff0188509273cad01e79c3
+  data.tar.gz: a7d648320d0ff43680a3f6707094749b8f2f117798aafb6c0a0b94a6e625ee48d4f747b79d531fb00fb7d701094141d6a5c4a814895f240ce9fa51a1acfa6a0a

data/bin/todo.rb

@@ -129,6 +129,7 @@ class Todo
     rescue => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
+    self
   end
 
   private
@@ -155,7 +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 regexp
+      * 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:
@@ -177,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
 
@@ -201,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
 
@@ -237,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)
@@ -263,55 +269,47 @@ 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)
     tasks = tasks || load_tasks
     task_indent = [tasks.keys.max.to_s.size, 4].max
-    patterns = patterns.nil? || patterns.empty? ? [@queries[':active']] : patterns
-    items = filter_tasks(tasks, patterns)
-    items = items.sort_by do |num, task|
+    patterns = patterns.nil? || patterns.empty? ? [':active'] : patterns
+    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]
     end
     items.each do |num, task|
       state = task[:state] || 'default'
-      color = COLORS[state]
-      display_state = colorize(STATES[state], color)
+      display_state = colorize(STATES[state], COLORS[state])
       title = task[:title].gsub(CONTEXT_TAG_PATTERN) do |tag|
         (tag.start_with?(' ') ? ' ' : '') + colorize(tag.strip, :cyan)
       end
-      priority_flag = task[:priority] ? colorize(PRIORITY_FLAG, :red) : ' '
+      priority_flag = task[:priority] && state != 'done' ? colorize(PRIORITY_FLAG, :red) : ' '
       due_date = ''
       if task[:due] && state != 'done'
         date_diff = (Date.strptime(task[:due], DATE_FORMAT) - @today).to_i
@@ -330,24 +328,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}"
@@ -363,13 +357,13 @@ class Todo
         execute(command == 'repl' ? [] : command.split(/\s+/))
       end
       print "\ntodo> "
-      command = STDIN.gets.chomp
+      command = STDIN.gets.chomp.strip
     end
   end
 
   def cleanup(patterns)
     tasks = load_tasks
-    patterns = [@queries[':done']] + patterns.to_a
+    patterns = [':done'] + patterns.to_a
     items = filter_tasks(tasks, patterns)
     items.keys.each do |num| tasks.delete(num) end
     write_tasks(tasks)
@@ -379,10 +373,9 @@ class Todo
   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)
+        match = false unless @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
       end
       items[num] = task if match
     end
@@ -390,10 +383,10 @@ class Todo
   end
 
   def colorize(text, color)
-    "\e[#{COLOR_CODES[color]}m#{text}\e[0m"
+    "\e[#{COLOR_CODES[color] || 37}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.24
+  version: 0.1.31
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: