todo-jsonl 0.1.32 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b3b87cee25e9b7f3b98d8c4fabfa9314953ab473fa845af8d5ac3865416bf3
-  data.tar.gz: fc60551fd9ad077cbb794c91dc94595cc8969eaeede825d42bf425b1654113f4
+  metadata.gz: 40ddf723c9cd6d6f2bbfd6a2e79d793b2e4a9e566ab03decb98ffa2b26ab7aae
+  data.tar.gz: f503bf830367cca971c40625adbf5d2ac73f75055c0ec1aa7d5d76676b2a8dce
 SHA512:
-  metadata.gz: ee42c84380d64142ba3f64a9ea7deee06f874f3a9f6a9ac4142fc834a14b8f66732118ca1072d43bf484674971c37944053deff4fed89e797527b7a83fa1ff25
-  data.tar.gz: f79bc0d5be7041e6efcc25f1f88afa43eecf10c382d7353f6b3fa55d6752756b767152b52ab694b5999eda0bbce58ed60ba36b520b09c16309b0ee06f36f82f5
+  metadata.gz: e6938c3a54128c70a606db10c737a482bf9192d2f6dfa8f01c66e1805ec3af1f7da1ddba7f99769015e29349c63f153eb409fea3b68db5f68c8629ac99113dff
+  data.tar.gz: b63dd1f3e0f93b1ef2677040695b75d9b4ed373cda2243a0e08f60a5f4e4f77187f918d97ee4a54ccfb20467d58980c016af67ceec8e07ad69e8ba69dce95fe6

data/bin/todo.rb

@@ -29,7 +29,6 @@ require 'json'
 require 'date'
 
 class Todo
-
   COLOR_CODES = {
     black:   30,
     red:     31,
@@ -70,7 +69,7 @@ class Todo
   DUE_DATE_TAG_PATTERN = /(^| )due:([a-zA-Z0-9-]+)/
   CONTEXT_TAG_PATTERN = /(^| )[@+][\w-]+/
   PRIORITY_FLAG = '*'
-  TODO_FILE = "#{ENV['HOME']}/todo.jsonl"
+  TODO_FILE = File.join(Dir.home, 'todo.jsonl')
 
   def execute(arguments)
     begin
@@ -127,7 +126,7 @@ class Todo
       else
         list(nil, arguments)
       end
-    rescue => error
+    rescue StandardError => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
     self
@@ -160,13 +159,14 @@ 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"
+      In addition to formatted dates, you can use date synonyms:
+      "due:today", "due:tomorrow", and day names e.g. "due:monday" or "due:tue"
 
-      Legend:
-      #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
+      Legend: #{STATES.select { |k, v| k != 'default' }.map { |k, v| "#{k} #{v}" }.join(', ') }, priority #{PRIORITY_FLAG}
 
       Todo file: #{TODO_FILE}
     USAGE
@@ -174,20 +174,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
 
@@ -226,8 +229,8 @@ class Todo
 
   def add(text)
     task = {
-      state: 'new',
-      title: text,
+      state:    'new',
+      title:    text,
       modified: @today.strftime(DATE_FORMAT)
     }
     postprocess_tags(task)
@@ -303,7 +306,12 @@ class Todo
     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]
+      [
+        task[:priority] && task[:state] != 'done' ? 0 : 1,
+        ORDER[task[:state] || 'default'],
+        task[:state] != 'done' ? task[:due] || 'n/a' : task[:modified],
+        num
+      ]
     end
     items.each do |num, task|
       state = task[:state] || 'default'
@@ -367,20 +375,18 @@ class Todo
     tasks = load_tasks
     patterns = [':done'] + patterns.to_a
     items = filter_tasks(tasks, patterns)
-    items.each_key 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 = patterns.uniq.all? do |pattern|
+    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)
@@ -388,16 +394,11 @@ class Todo
   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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 1.0.3
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: