todo-jsonl 0.1.33 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f9cb1d9f24fe4077faebac43c8fe85041021f560a9cd812e67acace53441cc
-  data.tar.gz: cddf8951cc9afbdea4ee6831f3c86fc5419a4f00582a2b1292007bba15b9cf13
+  metadata.gz: fc4e0e129e6dae5b09b233027e88344b5439b805a732a97c9162ea0cd57159d4
+  data.tar.gz: 3d521e8f11ccc2295bc32bc7bfdea49aca23c7b55023b19b8d90a8a0f002229a
 SHA512:
-  metadata.gz: 9e90bb2be2db37e6bfdcee15f7953112bba1db7804562dd4ab697a033a7d38ec4cd495abb394320263ff2a76fb5ff23c0886eb8ae381959a170828a0d7d83d9f
-  data.tar.gz: ab376c488d6a86676ee134154ef62e7c63f801d3002ef1df28ec2aee521f535730739ff4a13847dd0d77ad19bab0b6b36d5ce7732d6b317696e125293fa95d28
+  metadata.gz: 75b546efb040d46254728b62a5d27962d9a96495a1c0295bc334580ac88beeaeb611359e04e881baa846de199684486850f96390b8efff2445e506375eab0bc0
+  data.tar.gz: c6115760b9b524d8624ccd8491119b289a5def26910c07b1cf5d295c91ad84e07a3dbb71ae6dc44dfa7fc838a666cac67dd922aa954b1660cb1a93a79611b7ab

data/bin/todo.rb

@@ -69,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
@@ -107,8 +107,8 @@ class Todo
         raise action + ' command requires at least two parameters' if args.length < 2
         add_note(args.first.to_i, args[1..-1].join(' '))
       when 'delnote'
-        raise action + ' command requires exactly one parameter' if args.length != 1
-        delete_note(args.first.to_i)
+        raise action + ' command requires one or two parameters' if args.length < 1 || args.length > 2
+        delete_note(args.first.to_i, args[1])
       when 'list'
         list(nil, args)
       when 'show'
@@ -126,7 +126,7 @@ class Todo
       else
         list(nil, arguments)
       end
-    rescue => error
+    rescue StandardError => error
       puts "#{colorize('ERROR:', :red)} #{error}"
     end
     self
@@ -151,7 +151,7 @@ class Todo
       * rename <tasknumber> <text>     rename task
       * del <tasknumber>               delete task
       * note <tasknumber> <text>       add note to task
-      * delnote <tasknumber>           delete all notes from task
+      * delnote <tasknumber> [number]  delete a specific or all notes from task
 
       * list <regex> [regex...]        list tasks (only active tasks by default)
       * show <tasknumber>              show all task details
@@ -159,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
@@ -173,19 +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
 
@@ -207,9 +212,7 @@ class Todo
 
   def write_tasks(tasks)
     File.open(TODO_FILE, 'w:UTF-8') do |file|
-      tasks.keys.sort.each do |key|
-        file.write(JSON.generate(tasks[key]) + "\n")
-      end
+      tasks.keys.sort.each { |key| file.write(JSON.generate(tasks[key]) + "\n") }
     end
   end
 
@@ -223,15 +226,9 @@ class Todo
   end
 
   def add(text)
-    task = {
-      state: 'new',
-      title: text,
-      modified: @today.strftime(DATE_FORMAT)
-    }
+    task = { state: 'new', title: text, modified: @today.strftime(DATE_FORMAT) }
     postprocess_tags(task)
-    File.open(TODO_FILE, 'a:UTF-8') do |file|
-      file.write(JSON.generate(task) + "\n")
-    end
+    File.open(TODO_FILE, 'a:UTF-8') { |file| file.write(JSON.generate(task) + "\n") }
     list
   end
 
@@ -301,7 +298,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'
@@ -334,17 +336,21 @@ class Todo
     end)
   end
 
-  def delete_note(item)
+  def delete_note(item, num = nil)
     update_task(item, :show, lambda do |task|
-      task.delete(:note)
+      return task.delete(:note) if num.to_s.empty?
+      raise "#{num.to_i}: Note does not exist" if num.to_i <= 0 || task[:note].to_a.size < num.to_i
+      task[:note].delete_at(num.to_i - 1)
+      task.delete(:note) if task[:note].empty?
     end)
   end
 
   def show(item, tasks = nil)
     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}"
+    tasks[item].each do |k, v|
+      v = "\n" + v.each_with_index.map { |n, i| "#{(i + 1).to_s.rjust(v.size.to_s.size, ' ')}: #{n}" }.
+        join("\n") if v.is_a?(Array)
+      puts "#{colorize(k.to_s.rjust(10, ' ') + ':', :cyan)} #{v}"
     end
   end
 
@@ -365,20 +371,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
-    items
   end
 
   def colorize(text, color)
@@ -388,7 +392,7 @@ class Todo
   def convert_due_date(date)
     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)
+      @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

metadata

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