todo-jsonl 0.1.28 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2869302296a5a0ab3af889b0a76926cfba6d59552d5e4103524dae1ae3e7fd50
-  data.tar.gz: f2d7d03e8b62139d3197386c44391caf4a9d4fae545012389272cebdca61c3d9
+  metadata.gz: 89f9cb1d9f24fe4077faebac43c8fe85041021f560a9cd812e67acace53441cc
+  data.tar.gz: cddf8951cc9afbdea4ee6831f3c86fc5419a4f00582a2b1292007bba15b9cf13
 SHA512:
-  metadata.gz: 40c72337ffd6a818adf28ef001cbd3b4f365af92d1fecd9a36ea361522a2125d83500ed76d4633df228c2c87a987083b08541452e7129af914452e7ca6652563
-  data.tar.gz: 6f42e59df9b34c140f3c6bba11010f0b6a3f7a3c45d1c7b23d5ded213ee2562e62a963b3e889a6886b97ff991e49e78af6efccf898fd951220c1cad8bcb2f66d
+  metadata.gz: 9e90bb2be2db37e6bfdcee15f7953112bba1db7804562dd4ab697a033a7d38ec4cd495abb394320263ff2a76fb5ff23c0886eb8ae381959a170828a0d7d83d9f
+  data.tar.gz: ab376c488d6a86676ee134154ef62e7c63f801d3002ef1df28ec2aee521f535730739ff4a13847dd0d77ad19bab0b6b36d5ce7732d6b317696e125293fa95d28

data/bin/todo.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-# todo.rb - todo list manager inspired by todo.txt using the jsonl format.
+# todo.rb - todo list manager on the command-line
+# inspired by todo.txt using the jsonl format.
 #
 # Copyright (c) 2020-2021 Gabor Bata
 #
@@ -28,7 +29,6 @@ require 'json'
 require 'date'
 
 class Todo
-
   COLOR_CODES = {
     black:   30,
     red:     31,
@@ -129,6 +129,7 @@ class Todo
     rescue => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
+    self
   end
 
   private
@@ -175,17 +176,16 @@ class Todo
     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
-
     @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
 
@@ -246,7 +246,7 @@ class Todo
     end
   end
 
-  def append(item, text = '')
+  def append(item, text)
     update_task(item, :list, lambda do |task|
       task[:title] = [task[:title], text].join(' ')
       postprocess_tags(task)
@@ -296,21 +296,20 @@ class Todo
   end
 
   def list(tasks = nil, patterns = nil)
-    tasks = tasks || load_tasks
+    tasks ||= load_tasks
     task_indent = [tasks.keys.max.to_s.size, 4].max
-    patterns = patterns.nil? || patterns.empty? ? [':active'] : patterns
-    items = filter_tasks(tasks, patterns)
-    items = items.sort_by do |num, task|
+    patterns ||= []
+    patterns += [':active'] if (patterns & [':active', ':done', ':blocked', ':started', ':new', ':all']).empty?
+    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
@@ -342,7 +341,7 @@ class Todo
   end
 
   def show(item, tasks = nil)
-    tasks = tasks || load_tasks(item)
+    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}"
@@ -358,7 +357,7 @@ class Todo
         execute(command == 'repl' ? [] : command.split(/\s+/))
       end
       print "\ntodo> "
-      command = STDIN.gets.chomp
+      command = STDIN.gets.chomp.strip
     end
   end
 
@@ -366,7 +365,7 @@ class Todo
     tasks = load_tasks
     patterns = [':done'] + patterns.to_a
     items = filter_tasks(tasks, patterns)
-    items.keys.each do |num| tasks.delete(num) end
+    items.each_key do |num| tasks.delete(num) end
     write_tasks(tasks)
     puts "Deleted #{items.size} todo(s)"
   end
@@ -374,33 +373,25 @@ 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 = patterns.uniq.all? do |pattern|
+        @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
       end
       items[num] = task if match
     end
-    return items
+    items
   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)
-    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 + day_index).strftime(DATE_FORMAT)
-    else
-      due = date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
-    end
-    return due
+    return (@today + day_index).strftime(DATE_FORMAT) if day_index
+    date.nil? || date.empty? ? nil : Date.strptime(date, DATE_FORMAT).strftime(DATE_FORMAT)
   end
-
 end
 
 Todo.new.execute(ARGV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.33
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -42,5 +42,6 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: todo list manager inspired by todo.txt using the jsonl format
+summary: todo list manager on the command-line inspired by todo.txt using the jsonl
+  format
 test_files: []