doing 2.1.90 → 2.1.91

data/lib/completion/_doing.zsh

@@ -27,7 +27,6 @@ function _doing() {
                   'help:Shows a list of commands or help for one command'
                   'import:Import entries from an external source'
                   'last:Show the last entry'
-                  'later:Add an item to the Later section'
                   'mark:Mark last entry as flagged'
                   'flag:Mark last entry as flagged'
                   'meanwhile:Finish any running @meanwhile tasks and optionally create a new one'
@@ -128,9 +127,6 @@ function _doing() {
             last) 
                 args=( "--bool[Boolean used to combine multiple tags]:BOOLEAN:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" {'(--delete)-d','(-d)--delete'}"[Delete the last entry]" "--duration[Show elapsed time if entry is not tagged @done]" {'(--editor)-e','(-e)--editor'}"[Edit entry with vim]" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" {'(--section)-s','(-s)--section'}"[Specify a section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" "--tag[Filter entries by tag]:TAG:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
-            later) 
-                args=( "--ask[Prompt for note via multi-line input]" "--started[Backdate start time to date string [4pm|20m|2h|yesterday noon]]:DATE_STRING:" {'(--editor)-e','(-e)--editor'}"[Edit entry with vim]" {'(--note)-n','(-n)--note'}"[Note]:TEXT:" )
-            ;;
             mark) 
                 args=( "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[How many recent entries to tag]:COUNT:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" {'(--date)-d','(-d)--date'}"[Include current date/time with tag]" "--force[Don't ask permission to flag all entries when count is 0]" {'(--interactive)-i','(-i)--interactive'}"[Select item(s) to flag from a menu of matching entries]" "--not[Flag items that *don't* match search/tag filters]" {'(--remove)-r','(-r)--remove'}"[Remove flag]" {'(--section)-s','(-s)--section'}"[Section]:SECTION_NAME:" "--search[Filter entries using a search query]:QUERY:" "--tag[Filter entries by tag]:TAG:" {'(--unfinished)-u','(-u)--unfinished'}"[Flag last entry]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;

data/lib/completion/doing.bash

@@ -148,16 +148,6 @@ _doing_last() {
   fi
 }
 
-_doing_later() {
-  
-  if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--ask --started --editor --note' -- $token ) )
-  elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -n --ask --started --editor --note' -- $token ) )
-  
-  fi
-}
-
 _doing_mark() {
   
   if [[ "$token" == --* ]]; then
@@ -476,7 +466,6 @@ _doing()
     elif [[ $last =~ (help) ]]; then _doing_help
     elif [[ $last =~ (import) ]]; then _doing_import
     elif [[ $last =~ (last) ]]; then _doing_last
-    elif [[ $last =~ (later) ]]; then _doing_later
     elif [[ $last =~ (mark|flag) ]]; then _doing_mark
     elif [[ $last =~ (meanwhile) ]]; then _doing_meanwhile
     elif [[ $last =~ (note) ]]; then _doing_note

data/lib/completion/doing.fish

@@ -150,7 +150,6 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'grep search' -d Search\ f
 complete -xc doing -n '__fish_doing_needs_command' -a 'help' -d Shows\ a\ list\ of\ commands\ or\ help\ for\ one\ command
 complete -xc doing -n '__fish_doing_needs_command' -a 'import' -d Import\ entries\ from\ an\ external\ source
 complete -xc doing -n '__fish_doing_needs_command' -a 'last' -d Show\ the\ last\ entry
-complete -xc doing -n '__fish_doing_needs_command' -a 'later' -d Add\ an\ item\ to\ the\ Later\ section
 complete -xc doing -n '__fish_doing_needs_command' -a 'mark flag' -d Mark\ last\ entry\ as\ flagged
 complete -xc doing -n '__fish_doing_needs_command' -a 'meanwhile' -d Finish\ any\ running\ @meanwhile\ tasks\ and\ optionally\ create\ a\ new\ one
 complete -xc doing -n '__fish_doing_needs_command' -a 'note' -d Add\ a\ note\ to\ the\ last\ entry
@@ -328,10 +327,6 @@ complete -c doing -l template  -f -r -n '__fish_doing_using_command last' -d Ove
 complete -c doing -l title  -f -r -n '__fish_doing_using_command last' -d Title\ string\ to\ be\ used\ for\ output\ formats\ that\ require\ it
 complete -c doing -l val  -f -r -n '__fish_doing_using_command last' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command last' -d Force\ exact\ search\ string\ matching
-complete -c doing -l ask  -f  -n '__fish_doing_using_command later' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l started  -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command later' -d Edit\ entry\ with\ vim
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command later' -d Note
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command mark flag' -d How\ many\ recent\ entries\ to\ tag
 complete -c doing -l case  -f -r -n '__fish_doing_using_command mark flag' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive

data/lib/completion/doing.ts

@@ -2023,46 +2023,6 @@ const completionSpec: Fig.Spec = {
 
     },
 
-    {
-      name: "later",
-      description: "Add an item to the Later section",
-      options: [
-          {
-            name: ["--ask"],
-            description: "Prompt for note via multi-line input",
-            
-          },
-
-          {
-            name: ["--started"],
-            description: "Backdate start time to date string [4pm|20m|2h|yesterday noon]",
-            args: {
-                  name: "DATE_STRING",
-                  description: "DATE_STRING",
-            },
-
-          },
-
-          {
-            name: ["-e", "--editor"],
-            description: "Edit entry with vim",
-            
-          },
-
-          {
-            name: ["-n", "--note"],
-            description: "Note",
-            args: {
-                  name: "TEXT",
-                  description: "TEXT",
-            },
-
-          },
-
-        ],
-
-    },
-
     {
       name: "mark",
       description: "Mark last entry as flagged",

data/lib/doing/item/item.rb

@@ -105,7 +105,7 @@ module Doing
         when :date
           output << format('%13s |', @date.relative_date).cyan
         when :section
-          output << "#{magenta}(#{white(@section)}#{magenta})"
+          output << "#{Color.magenta}(#{Color.white(@section)}#{Color.magenta})"
         when :title
           output << @title.white.highlight_tags('cyan')
         end

data/lib/doing/item/query.rb

@@ -78,8 +78,8 @@ module Doing
 
       if search.rx? || matching == :fuzzy
         rx = search.to_rx(distance: distance, case_type: case_type)
-        new_title = @title.gsub(rx) { |m| yellow(m) }
-        new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+        new_title = @title.gsub(rx) { |m| Color.yellow(m) }
+        new_note.add(@note.to_s.gsub(rx) { |m| Color.yellow(m) })
       else
         query = search.strip.to_phrase_query
 
@@ -89,8 +89,8 @@ module Doing
         end
         query[:must].concat(query[:should]).each do |s|
           rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
-          new_title = @title.gsub(rx) { |m| yellow(m) }
-          new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+          new_title = @title.gsub(rx) { |m| Color.yellow(m) }
+          new_note.add(@note.to_s.gsub(rx) { |m| Color.yellow(m) })
         end
       end
 

data/lib/doing/prompt/input.rb

@@ -20,7 +20,7 @@ module Doing
       $stdin.reopen('/dev/tty')
       return default_response if @default_answer
 
-      print "#{yellow(prompt).sub(/:?$/, ':')} #{reset}"
+      print "#{Color.yellow(prompt).sub(/:?$/, ':')} #{Color.reset}"
       $stdin.gets.strip
     end
 
@@ -50,7 +50,7 @@ module Doing
       end
 
       begin
-        Readline.readline("#{yellow(prompt).sub(/:?$/, ':')} #{reset}", true).strip
+        Readline.readline("#{Color.yellow(prompt).sub(/:?$/, ':')} #{Color.reset}", true).strip
       rescue Interrupt
         raise UserCancelled
       end
@@ -82,8 +82,8 @@ module Doing
                    '(%<keycolor>sreturn twice%<textcolor>s)',
                    'to end editing and save,',
                    '%<keycolor>sCTRL-C%<textcolor>s to cancel%<reset>s'].join(' '),
-                  { promptcolor: boldgreen, prompt: prompt.sub(/:?$/, ':'),
-                    textcolor: yellow, keycolor: boldwhite, reset: reset })
+                  { promptcolor: Color.boldgreen, prompt: prompt.sub(/:?$/, ':'),
+                    textcolor: Color.yellow, keycolor: Color.boldwhite, reset: Color.reset })
 
       res = []
 
@@ -116,10 +116,10 @@ module Doing
 
       ask_note = []
       reader = TTY::Reader.new(interrupt: -> { raise Errors::UserCancelled }, track_history: false)
-      puts "#{boldgreen(prompt.sub(/:?$/,
-                                   ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"
+      puts "#{Color.boldgreen(prompt.sub(/:?$/,
+                                         ':'))} #{Color.yellow('Hit return for a new line, ')}#{Color.boldwhite('enter a blank line (')}#{Color.boldyellow('return twice')}#{Color.boldwhite(') to end editing')}"
       loop do
-        res = reader.read_line(green('> '))
+        res = reader.read_line(Color.green('> '))
         break if res.strip.empty?
 
         ask_note.push(res)

data/lib/doing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doing
-  VERSION = '2.1.90'
+  VERSION = '2.1.91'
 end

data/lib/doing/wwid/interactive.rb

@@ -365,7 +365,7 @@ module Doing
       elapsed = finish_date - date
 
       if max_elapsed.positive? && (elapsed > max_elapsed)
-        puts boldwhite(title) if title
+        puts Color.boldwhite(title) if title
         human = elapsed.time_string(format: :natural)
         res = Prompt.yn(Color.yellow("Did this entry actually take #{human}"), default_response: true)
         unless res

data/lib/doing/wwid/modify.rb

@@ -266,7 +266,7 @@ module Doing
               elapsed = done_date - item.date
 
               if max_elapsed.positive? && (elapsed > max_elapsed) && !opt[:took]
-                puts boldwhite(item.title)
+                puts Color.boldwhite(item.title)
                 human = elapsed.time_string(format: :natural)
                 res = Prompt.yn(Color.yellow("Did this actually take #{human}"), default_response: true)
                 unless res
@@ -399,7 +399,7 @@ module Doing
     ##
     def delete_items(items, force: false)
       items.slice(0, 5).each { |i| puts i.to_pretty } unless force
-      puts softpurple("+ #{items.size - 5} additional #{'item'.to_p(items.size - 5)}") if items.size > 5 && !force
+      puts Color.softpurple("+ #{items.size - 5} additional #{'item'.to_p(items.size - 5)}") if items.size > 5 && !force
 
       res = force ? true : Prompt.yn("Delete #{items.size} #{'item'.to_p(items.size)}?", default_response: 'y')
       return unless res

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.90
+  version: 2.1.91
 platform: ruby
 authors:
 - Brett Terpstra