todo-jsonl 0.1.29 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af368dfb4ac9e0f8e6448e005bb7242c509d6bf0ce1e97bdc8783629c3dd77f
-  data.tar.gz: dc5f0da8574ea5bda98627c122e9a0bdc7c3d661cba879c4ac09bff3cdb075ba
+  metadata.gz: 1f9f0379dadc07a6aa67bc1dc0662fcb6df0b4183f55de8abbda1020e8393bfc
+  data.tar.gz: c61ac4593f27a6bb737fe2c419fb28b356eed555291c68b33dd17a7a2589ce8b
 SHA512:
-  metadata.gz: 1d0b4562ca3af2722f5fb2eb594f248ccaf2b69b18eb2a7f2e19f386da1f60352260631a7afd53e5cf375a3f7c37297a85808a701870b0c2eb73efe9797416e8
-  data.tar.gz: 030be81b91d66d0d084dff2c805df49cc1f2705aa020d607a06003d542a139e0f6b6708d307a6e448e14c0ca76b135878e643c5ab54132ac457be506cea43b4f
+  metadata.gz: ce2c81b1964521382cfef561aa92e7c954a4537664966243132d9d6b8752593bcc8fe4386ff7e565e751856697ca08e1a12a798b26cb2f83856db78adea4e2a2
+  data.tar.gz: 6235a7b73886fd6a9a8944287c8c47f012797affac60f492eb7551dd19e4690f06ad7986d63523474cf730d74507ab0caae03de5af6b296ba9613788ed408581

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,
@@ -173,20 +173,19 @@ 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]) },
+      ':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]) }
     }
   end
 
@@ -225,8 +224,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 +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)
@@ -297,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
@@ -343,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}"
@@ -359,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
 
@@ -367,40 +365,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.29
+  version: 1.0.0
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 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: []