todo-jsonl 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78bbcd37bbeabd3a2f73ebdd470bde3024755c6b3e7cddfe7fecb51290936c13
-  data.tar.gz: 26b2670e2d2dc589c8ecd2908e072b5df89db1673b50269a8766293f014a3a87
+  metadata.gz: 3e5df379407838c3c11f109e146fdddcb560fffdfc30ed29885913b8362ae565
+  data.tar.gz: 4dafcccddbc47174db8dfa37c09e508a10943e5b94ef339784a1e4097dd0443e
 SHA512:
-  metadata.gz: 283ea89c20cbd97f4e0684f13cf4b8d9e003209103c816079cdc31b66fad9f5600b76fe084dc8319e91156fd173120452dce9d2599724c79786ae8fb0d5fa144
-  data.tar.gz: '09ea2b77491b0718f7af5d89d0b219e1e45e833e7ec0c83c3cd03ee2e14bc1476bf652768e84ed6db8a6315dcf19664c18094f69009e6b4e2faa42936c25be15'
+  metadata.gz: 936dcca49f95ba126bb7b072f09ae4f3e6e05bfc31635b9d7acdee7b7393c5495e2e1f9ccb5cbab0a52d31509b3b94016cfbf102aad1e6ceaea292a890b2c777
+  data.tar.gz: d4c0ca6ed381cd2a38f40c88a3c451b45851c35dfeebe4afde82be5022c17d5b45d5e43c954c52418324df38bf319d4719bbe214b039521aa6b8fca6d742712d

data/bin/todo.rb

@@ -75,40 +75,40 @@ class Todo
     begin
       setup
       action = arguments.first
-      args = arguments[1..-1] || []
+      args = arguments.drop(1)
       case action
       when 'add'
         raise action + ' command requires at least one parameter' if args.nil? || args.empty?
         add(args.join(' '))
       when 'start'
-        args.length > 0 ? change_state(args.first.to_i, 'started', (args[1..-1] || []).join(' ')) : list(nil, [':started'])
+        args.length > 0 ? change_state(args.first.to_i, 'started', args.drop(1).join(' ')) : list(nil, [':started'])
       when 'done'
-        args.length > 0 ? change_state(args.first.to_i, 'done', (args[1..-1] || []).join(' ')) : list(nil, [':done'])
+        args.length > 0 ? change_state(args.first.to_i, 'done', args.drop(1).join(' ')) : list(nil, [':done'])
       when 'block'
-        args.length > 0 ? change_state(args.first.to_i, 'blocked', (args[1..-1] || []).join(' ')) : list(nil, [':blocked'])
+        args.length > 0 ? change_state(args.first.to_i, 'blocked', args.drop(1).join(' ')) : list(nil, [':blocked'])
       when 'reset'
-        args.length > 0 ? change_state(args.first.to_i, 'new', (args[1..-1] || []).join(' ')) : list(nil, [':new'])
+        args.length > 0 ? change_state(args.first.to_i, 'new', args.drop(1).join(' ')) : list(nil, [':new'])
       when 'prio'
         raise action + ' command requires at least one parameter' if args.length < 1
-        set_priority(args.first.to_i, (args[1..-1] || []).join(' '))
+        set_priority(args.first.to_i, args.drop(1).join(' '))
       when 'due'
         raise action + ' command requires at least one parameter' if args.length < 1
-        due_date(args.first.to_i, (args[1..-1] || []).join(' '))
+        due_date(args.first.to_i, args.drop(1).join(' '))
       when 'append'
         raise action + ' command requires at least two parameters' if args.length < 2
-        append(args.first.to_i, args[1..-1].join(' '))
+        append(args.first.to_i, args.drop(1).join(' '))
       when 'rename'
         raise action + ' command requires at least two parameters' if args.length < 2
-        rename(args.first.to_i, args[1..-1].join(' '))
+        rename(args.first.to_i, args.drop(1).join(' '))
       when 'del'
         raise action + ' command requires exactly one parameter' if args.length != 1
         delete(args.first.to_i)
       when 'note'
         raise action + ' command requires at least two parameters' if args.length < 2
-        add_note(args.first.to_i, args[1..-1].join(' '))
+        add_note(args.first.to_i, args.drop(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'
@@ -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
@@ -177,6 +177,7 @@ class Todo
     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) }
+    recent_date = (@today - 7).strftime(DATE_FORMAT)
     @queries = {
       ':active'    => lambda { |task| /(new|started|blocked)/.match(task[:state]) },
       ':done'      => lambda { |task| 'done' == task[:state] },
@@ -190,7 +191,8 @@ class Todo
       ':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] }
+      ':due'       => lambda { |task| task[:due] },
+      ':recent'    => lambda { |task| recent_date <= task[:modified] }
     }
   end
 
@@ -212,9 +214,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
 
@@ -228,15 +228,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
 
@@ -306,7 +300,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'
@@ -327,7 +326,7 @@ class Todo
         end
         due_date = ' ' + due_date
       end
-      puts "#{num.to_s.rjust(task_indent, ' ')}:#{priority_flag}#{display_state} #{title}#{due_date}"
+      puts "#{num.to_s.rjust(task_indent)}:#{priority_flag}#{display_state} #{title}#{due_date}"
     end
     puts 'No todos found' if items.empty?
   end
@@ -339,17 +338,25 @@ class Todo
     end)
   end
 
-  def delete_note(item)
+  def delete_note(item, num = nil)
     update_task(item, :show, lambda do |task|
-      task.delete(:note)
+      if num.to_s.empty?
+        task.delete(:note)
+      else
+        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)
   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| v.size > 1 ? "#{(i + 1).to_s.rjust(v.size.to_s.size)}: #{n}" : n }.
+        join("\n") if v.is_a?(Array)
+      puts "#{colorize(k.to_s.rjust(10) + ':', :cyan)} #{v}"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo-jsonl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Gabor Bata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -32,7 +32,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="