todo-jsonl 0.1.30 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e18e67f8684606fee2693456e247af3edd78926e4d022a12f96c3b255dab3e1c
-  data.tar.gz: 93c21f98eece4e5fce236c5f485073a3d9b052be489cc30dca25a59bab2413e2
+  metadata.gz: 2691d07e42991c659c196150c96364fc4ccf5b0a40d07d4bc932c74cd6b5e5e4
+  data.tar.gz: b1c1b92535378ea04dfa9d081aa6843cd54f9bad4980316cf84d6d55a2ae3fdb
 SHA512:
-  metadata.gz: 6addcea04123ade9a05649cf9d6b9ac569a23f6210b103fc715076cadd6775c0ca738cb6a3b3733f28270d66cb1e4d7bbe21a92b20c51b4a2e032b40b7942fed
-  data.tar.gz: 8131e3ccc7e5e28168b16582bb989474b79257284a0effc9d072acfe18844de6684873e295fc99da89535ddefb8a5ab1fcf85ce3e4d968828cff6973224d1151
+  metadata.gz: 4ff802f21722a328bc911c475ee58deb6613447fbbdd3213bab6ee6755ca551b07345b252f41b2b005b036986f8361af3b6a2b813b2b28c070a775b3b252372a
+  data.tar.gz: 2b1e00730185745a326fb4e33748a1787d34c64e5ea85339dbb5b464d19062963e8df7f6da8ebe61662d6c6e6bcdd047b0b64dda4a2c9e1df8bcfb5dbf1a5795

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,
@@ -159,8 +159,8 @@ class Todo
       * 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:
-      #{@queries.keys.join(', ')}
+      With list command the following pre-defined queries can be also used:
+      #{@queries.keys.each_with_index.map { |k, i| (i == 8 ? "\n" : '') + k }.join(', ')}
 
       Due dates can be also added via tags in task title: "due:YYYY-MM-DD"
 
@@ -173,20 +173,23 @@ class Todo
 
   def setup
     @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
-
+    next_7_days = (0..6).map { |day| @today + day }
+    @due_date_days = next_7_days.map { |day| day.strftime('%A').downcase }
+    due_dates_for_queries = next_7_days.map { |day| day.strftime(DATE_FORMAT) }
     @queries = {
-      ':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
+      ':active'    => lambda { |task| /(new|started|blocked)/.match(task[:state]) },
+      ':done'      => lambda { |task| 'done' == task[:state] },
+      ':blocked'   => lambda { |task| 'blocked' == task[:state] },
+      ':started'   => lambda { |task| 'started' == task[:state] },
+      ':new'       => lambda { |task| 'new' == task[:state] },
+      ':all'       => lambda { |task| /\w+/.match(task[:state]) },
+      ':priority'  => lambda { |task| task[:priority] },
+      ':note'      => lambda { |task| task[:note] && !task[:note].empty? },
+      ':today'     => lambda { |task| due_dates_for_queries[0] == task[:due] },
+      ':tomorrow'  => lambda { |task| due_dates_for_queries[1] == task[:due] },
+      ':next7days' => lambda { |task| /(#{due_dates_for_queries.join('|')})/.match(task[:due]) },
+      ':overdue'   => lambda { |task| task[:due] && task[:due] < due_dates_for_queries[0] },
+      ':due'       => lambda { |task| task[:due] }
     }
   end
 
@@ -225,8 +228,8 @@ class Todo
 
   def add(text)
     task = {
-      state: 'new',
-      title: text,
+      state:    'new',
+      title:    text,
       modified: @today.strftime(DATE_FORMAT)
     }
     postprocess_tags(task)
@@ -247,7 +250,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)
@@ -297,21 +300,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
@@ -343,7 +345,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}"
@@ -367,40 +369,31 @@ 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 { |num| tasks.delete(num) }
     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])
+    patterns = patterns.uniq
+    tasks.select do |num, task|
+      patterns.all? do |pattern|
+        @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"
+    "\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
+      @due_date_days.map { |day| day[0..2] }.index(date.to_s.downcase)
+    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.30
+  version: 1.0.1
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-19 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: []