todo-jsonl 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef8eba60ead95705dc2479f4f40fc9e25989b99b25a429de36c6703dca61196
-  data.tar.gz: 9e161dd022343525a4d1e4fd94c214763edc9a57796f3955a510082acda95515
+  metadata.gz: 70b3b87cee25e9b7f3b98d8c4fabfa9314953ab473fa845af8d5ac3865416bf3
+  data.tar.gz: fc60551fd9ad077cbb794c91dc94595cc8969eaeede825d42bf425b1654113f4
 SHA512:
-  metadata.gz: ba7a785128d5f7fddac436e7d2b069f3b96f69fd8f37240e06f8b2382d113391cafaf64b9cb4a48ce0260ef305b292039a40f065c8ff0188509273cad01e79c3
-  data.tar.gz: a7d648320d0ff43680a3f6707094749b8f2f117798aafb6c0a0b94a6e625ee48d4f747b79d531fb00fb7d701094141d6a5c4a814895f240ce9fa51a1acfa6a0a
+  metadata.gz: ee42c84380d64142ba3f64a9ea7deee06f874f3a9f6a9ac4142fc834a14b8f66732118ca1072d43bf484674971c37944053deff4fed89e797527b7a83fa1ff25
+  data.tar.gz: f79bc0d5be7041e6efcc25f1f88afa43eecf10c382d7353f6b3fa55d6752756b767152b52ab694b5999eda0bbce58ed60ba36b520b09c16309b0ee06f36f82f5

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
 #
@@ -247,7 +248,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,9 +298,10 @@ 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
+    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
@@ -341,7 +343,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}"
@@ -365,7 +367,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
@@ -373,9 +375,8 @@ class Todo
   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])
+      match = patterns.uniq.all? do |pattern|
+        @queries[pattern] ? @queries[pattern].call(task) : /#{pattern}/ix.match(task[:title])
       end
       items[num] = task if match
     end
@@ -398,7 +399,6 @@ class Todo
     end
     return due
   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.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-17 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: []