todo-jsonl 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f947add722dd8daa2e1c9e95b28e88ca906adb71c27af00ef251702c75c868e8
-  data.tar.gz: ec96ca95d021e7eb4ed2ebb2e4738d08a19291e54c366873843b5c6a66108347
+  metadata.gz: d47bb16f60f84f6c3e55951169bdb0871f915b7a6948844897fa8a150df05456
+  data.tar.gz: '09600be32199c25bc946036ee947290c7c77472d00933fee39c67d9bd2dc0649'
 SHA512:
-  metadata.gz: 5bb56460d8dd36f2643e13f0c5d4c969c4a3ebdfb887da54dabf07771ad9fbf80cbd5c115e8b058cc837aaa690ecb54850183e25d6609d4387b6335bffc0e5df
-  data.tar.gz: 8abecd75607bc3208ddc5a73bc13cf7a1f3921a9c9275e0d067ee9c0b12c22cc7280701943c0f11d417daa1cf3cbcb3541704c2c5ec9c99ea6ada8ffe9372642
+  metadata.gz: 3ae62a56b667ebcb55e661d1ac64cd4c2b62db7d7d4f106c79a034ca58264d4d7c3ea20a4d262e4386806baa88d472c88dcc5a6946c4d3ca8eb01bbc3d99363e
+  data.tar.gz: ede2f1f9f155ce5ff5acacdd784b030c01e11f14a4ef6d85e5223663dc3a0dea5a2ab8a3eac95f498808747fa9588723d1feef36828e4657ee23cd41736aa4e0

data/bin/todo.rb

@@ -155,7 +155,7 @@ class Todo
       * list <regex> [regex...]        list tasks (only active tasks by default)
       * show <tasknumber>              show all task details
       * repl                           enter read-eval-print loop mode
-      * cleanup <regex> [regex...]     cleanup completed tasks by regexp
+      * 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:
@@ -201,9 +201,7 @@ class Todo
         end
       end
     end
-    if item_to_check && !tasks.has_key?(item_to_check)
-      raise "#{item_to_check}: No such todo"
-    end
+    raise "#{item_to_check}: No such todo" if item_to_check && !tasks.has_key?(item_to_check)
     tasks
   end
 
@@ -237,69 +235,67 @@ class Todo
     list
   end
 
-  def append(item, text = '')
+  def update_task(item, post_action, update_function)
     tasks = load_tasks(item)
-    tasks[item][:title] = [tasks[item][:title], text].join(' ')
+    update_function.call(tasks[item])
     tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    postprocess_tags(tasks[item])
     write_tasks(tasks)
-    list(tasks)
+    send(post_action, tasks) if post_action
+  end
+
+  def append(item, text = '')
+    update_task item, :list, lambda { |task|
+      task[:title] = [task[:title], text].join(' ')
+      postprocess_tags(task)
+    }
   end
 
   def rename(item, text)
-    tasks = load_tasks(item)
-    tasks[item][:title] = text
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    postprocess_tags(tasks[item])
-    write_tasks(tasks)
-    list(tasks)
+    update_task item, :list, lambda { |task|
+      task[:title] = text
+      postprocess_tags(task)
+    }
   end
 
   def delete(item)
     tasks = load_tasks(item)
     tasks.delete(item)
     write_tasks(tasks)
-    list
+    list(tasks)
   end
 
   def change_state(item, state, note = nil)
-    tasks = load_tasks(item)
-    tasks[item][:state] = state
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    if !note.nil? && !note.empty?
-      tasks[item][:note] ||= []
-      tasks[item][:note].push(note)
-    end
-    write_tasks(tasks)
-    list(tasks)
+    update_task item, :list, lambda { |task|
+      task[:state] = state
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      end
+    }
   end
 
   def set_priority(item, note = nil)
-    tasks = load_tasks(item)
-    tasks[item][:priority] = !tasks[item][:priority]
-    tasks[item].delete(:priority) if !tasks[item][:priority]
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    if !note.nil? && !note.empty?
-      tasks[item][:note] ||= []
-      tasks[item][:note].push(note)
-    end
-    write_tasks(tasks)
-    list(tasks)
+    update_task item, :list, lambda { |task|
+      task[:priority] = !task[:priority]
+      task.delete(:priority) if !task[:priority]
+      if !note.nil? && !note.empty?
+        task[:note] ||= []
+        task[:note].push(note)
+      end
+    }
   end
 
   def due_date(item, date = '')
-    tasks = load_tasks(item)
-    tasks[item][:due] = convert_due_date(date)
-    tasks[item].delete(:due) if tasks[item][:due].nil?
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    list(tasks)
+    update_task item, :list, lambda { |task|
+      task[:due] = convert_due_date(date)
+      task.delete(:due) if task[:due].nil?
+    }
   end
 
   def list(tasks = nil, patterns = nil)
     tasks = tasks || load_tasks
     task_indent = [tasks.keys.max.to_s.size, 4].max
-    patterns = patterns.nil? || patterns.empty? ? [@queries[':active']] : patterns
+    patterns = patterns.nil? || patterns.empty? ? [':active'] : patterns
     items = filter_tasks(tasks, patterns)
     items = items.sort_by do |num, task|
       [task[:priority] && task[:state] != 'done' ? 0 : 1, ORDER[task[:state] || 'default'], task[:due] || 'n/a', num]
@@ -330,24 +326,20 @@ class Todo
   end
 
   def add_note(item, text)
-    tasks = load_tasks(item)
-    tasks[item][:note] ||= []
-    tasks[item][:note].push(text)
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    show(item)
+    update_task item, :show, lambda { |task|
+      task[:note] ||= []
+      task[:note].push(text)
+    }
   end
 
   def delete_note(item)
-    tasks = load_tasks(item)
-    tasks[item].delete(:note)
-    tasks[item][:modified] = @today.strftime(DATE_FORMAT)
-    write_tasks(tasks)
-    show(item)
+    update_task item, :show, lambda { |task|
+      task.delete(:note)
+    }
   end
 
-  def show(item)
-    tasks = load_tasks(item)
+  def show(item, tasks = nil)
+    tasks = 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}"
@@ -369,7 +361,7 @@ class Todo
 
   def cleanup(patterns)
     tasks = load_tasks
-    patterns = [@queries[':done']] + patterns.to_a
+    patterns = [':done'] + patterns.to_a
     items = filter_tasks(tasks, patterns)
     items.keys.each do |num| tasks.delete(num) end
     write_tasks(tasks)
@@ -393,7 +385,7 @@ class Todo
     "\e[#{COLOR_CODES[color]}m#{text}\e[0m"
   end
 
-  def convert_due_date(date = '')
+  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) ||

metadata

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