doing 2.1.6 → 2.1.10

data/docs/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Dec 20 15:47:11 2021 by
+  Generated on Tue Dec 21 14:44:17 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/index.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 
 
-The current version of `doing` is 2.1.4.
+The current version of `doing` is 2.1.9.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.6
+v2.1.10
 
 === Global Options
 === --config_file arg
@@ -397,7 +397,7 @@ File to write output to
 Shell to generate for (bash, zsh, fish)
 
 [Default Value] zsh
-[Must Match] (?i-mx:^[bzf](?:[ai]?sh)?$)
+[Must Match] (?i-mx:^(?:[bzf](?:[ai]?sh)?|all)$)
 
 
 ==== Command: <tt>config </tt>
@@ -2155,6 +2155,13 @@ View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all d
 [Default Value] None
 
 
+===== --age AGE
+
+Age (oldest|newest)
+
+[Default Value] newest
+
+
 ===== -b|--bool BOOLEAN
 
 Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.

data/generate_completions.sh

@@ -1,5 +1,3 @@
 #!/bin/bash
 
-bundle exec bin/doing completion --type fish --file lib/completion/doing.fish
-bundle exec bin/doing completion --type bash --file lib/completion/doing.bash
-bundle exec bin/doing completion --type zsh --file lib/completion/_doing.zsh
+bundle exec bin/doing completion --type all

data/lib/completion/_doing.zsh

@@ -201,7 +201,7 @@ function _doing() {
                 args=( {-f,--file=}"[Specify alternate doing file]" {-i,--interactive}"[Select from recent backups]" {-p,--prune=}"[Remove old backups]" {-r,--redo}"[Redo last undo]" )
             ;;
             view) 
-                args=( "(--after=)--after=}[View entries newer than date]" {-b,--bool=}"[Tag boolean]" "(--before=)--before=}[View entries older than date]" {-c,--count=}"[Count to display]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--color)--color}[Include colors in output]" "(--duration)--duration}[Show elapsed time on entries without @done tag]" "(--from=)--from=}[Date range to show]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" "(--search=)--search=}[Search filter]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag=)--tag=}[Tag filter]" "(--tag_order=)--tag_order=}[Tag sort direction]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" {-x,--exact}"[Force exact search string matching]" )
+                args=( "(--after=)--after=}[View entries newer than date]" "(--age=)--age=}[Age]" {-b,--bool=}"[Tag boolean]" "(--before=)--before=}[View entries older than date]" {-c,--count=}"[Count to display]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--color)--color}[Include colors in output]" "(--duration)--duration}[Show elapsed time on entries without @done tag]" "(--from=)--from=}[Date range to show]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" "(--search=)--search=}[Search filter]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag=)--tag=}[Tag filter]" "(--tag_order=)--tag_order=}[Tag sort direction]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             views) 
                 args=( {-c,--column}"[List in single column]" )

data/lib/completion/doing.bash

@@ -366,9 +366,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --age --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --age --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1

data/lib/completion/doing.fish

@@ -371,6 +371,7 @@ complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command undo' -
 complete -c doing -l prune -s p -f -r -n '__fish_doing_using_command undo' -d Remove\ old\ backups
 complete -c doing -l redo -s r -f  -n '__fish_doing_using_command undo' -d Redo\ last\ undo
 complete -c doing -l after  -f -r -n '__fish_doing_using_command view' -d View\ entries\ newer\ than\ date
+complete -c doing -l age  -f -r -n '__fish_doing_using_command view' -d Age
 complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command view' -d Tag\ boolean
 complete -c doing -l before  -f -r -n '__fish_doing_using_command view' -d View\ entries\ older\ than\ date
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command view' -d Count\ to\ display
@@ -414,5 +415,5 @@ complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume
 complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel finish grep search import last mark flag note reset begin rotate select show show tag tags tags view' -a 'case-sensitive ignore smart'
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'
 complete -f -c doing -l tag_order -x -n '__fish_doing_using_command show view yesterday' -a 'asc desc'
-complete -f -c doing -s a -l age -x -n '__fish_doing_using_command show' -a 'oldest newest'
+complete -f -c doing -s a -l age -x -n '__fish_doing_using_command show view' -a 'oldest newest'
 complete -f -c doing -s s -l section -x -n '__fish_doing_using_command again resume autotag cancel done did finish grep search import last mark flag meanwhile note now next on recent reset begin rotate select since tag tags today view wiki yesterday' -a '(__fish_doing_complete_sections)'

data/lib/doing/completion/bash_completion.rb

@@ -9,7 +9,7 @@ module Doing
         logic = []
 
         @commands.each_with_index do |cmd, i|
-          @bar.advance
+          @bar.advance(status: cmd[:commands].first)
 
           data = get_help_sections(cmd[:commands].first)
 
@@ -167,7 +167,7 @@ module Doing
         data = get_help_sections
         @global_options = parse_options(data[:global_options])
         @commands = parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count, bar_format: :blade, status: 'Reading subcommands')
         @bar.resize(25)
       end
 

data/lib/doing/completion/fish_completion.rb

@@ -132,7 +132,7 @@ module Doing
         need_section = []
 
         @commands.each_with_index do |cmd, i|
-          @bar.advance
+          @bar.advance(status: cmd[:commands].first)
           data = get_help_sections(cmd[:commands].first)
 
           if data[:synopsis].join(' ').strip.split(/ /).last =~ /(path|file)/i
@@ -200,7 +200,7 @@ module Doing
         data = get_help_sections
         @global_options = parse_options(data[:global_options])
         @commands = parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count, bar_format: :blade, status: 'processing subcommands')
         @bar.resize(25)
       end
 

data/lib/doing/completion/zsh_completion.rb

@@ -96,7 +96,7 @@ module Doing
         out = []
 
         @commands.each_with_index do |cmd, i|
-          @bar.advance
+          @bar.advance(status: cmd[:commands].first)
 
           data = get_help_sections(cmd[:commands].first)
           option_arr = []
@@ -127,7 +127,7 @@ module Doing
         data = get_help_sections
         @global_options = parse_options(data[:global_options])
         @commands = parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar]\033[0m", total: @commands.count, bar_format: :blade)
+        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count, bar_format: :blade, status: 'processing subcommands')
         @bar.resize(25)
       end
 

data/lib/doing/completion.rb

@@ -19,11 +19,21 @@ module Doing
       # @param      file  [String] Path to save to, or 'stdout'
       #
       def generate_completion(type: 'zsh', file: 'stdout')
+        if type =~ /^all$/i
+          Doing.logger.log_now(:warn, 'Generating:', 'all completion types, will use default paths')
+          generate_completion(type: 'fish', file: 'lib/completion/doing.fish')
+          Doing.logger.warn('File written:', "fish completions written to lib/completion/doing.fish")
+          generate_completion(type: 'zsh', file: 'lib/completion/_doing.zsh')
+          Doing.logger.warn('File written:', "zsh completions written to lib/completion/_doing.zsh")
+          generate_completion(type: 'bash', file: 'lib/completion/doing.bash')
+          Doing.logger.warn('File written:', "bash completions written to lib/completion/doing.bash")
+          return
+        end
 
         generator = case type.to_s
-                    when /^f/
+                    when /^f/i
                       FishCompletions.new
-                    when /^b/
+                    when /^b/i
                       BashCompletions.new
                     else
                       ZshCompletions.new

data/lib/doing/configuration.rb

@@ -31,8 +31,8 @@ module Doing
       },
       'doing_file' => '~/.local/share/doing/what_was_i_doing.md',
       'backup_dir' => '~/.local/share/doing/doing_backup',
-      'current_section' => 'Currently',
       'history_size' => 15,
+      'current_section' => 'Currently',
       'paginate' => false,
       'never_time' => [],
       'never_finish' => [],

data/lib/doing/log_adapter.rb

@@ -259,6 +259,7 @@ module Doing
 
       if @logdev == $stdout
         $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
+        $stdout.puts
       else
         results.each do |msg|
           @logdev.puts color_message(msg[:level], msg[:message])

data/lib/doing/prompt.rb

@@ -86,7 +86,38 @@ module Doing
         @fzf ||= install_fzf
       end
 
-      def install_fzf
+      def uninstall_fzf
+        fzf_bin = File.join(File.dirname(__FILE__), '../helpers/fzf/bin/fzf')
+        FileUtils.rm_f(fzf_bin) if File.exist?(fzf_bin)
+        Doing.logger.warn('fzf:', "removed #{fzf_bin}")
+      end
+
+      def which_fzf
+        fzf_dir = File.join(File.dirname(__FILE__), '../helpers/fzf')
+        fzf_bin = File.join(fzf_dir, 'bin/fzf')
+        return fzf_bin if File.exist?(fzf_bin)
+
+        Doing.logger.debug('fzf:', 'Using user-installed fzf')
+        TTY::Which.which('fzf')
+      end
+
+      def silence_std(file = '/dev/null')
+        $stdout = File.new(file, 'w')
+        $stderr = File.new(file, 'w')
+      end
+
+      def restore_std
+        $stdout = STDOUT
+        $stderr = STDERR
+      end
+
+      def install_fzf(force: false)
+        if force
+          uninstall_fzf
+        elsif which_fzf
+          return which_fzf
+        end
+
         fzf_dir = File.join(File.dirname(__FILE__), '../helpers/fzf')
         FileUtils.mkdir_p(fzf_dir) unless File.directory?(fzf_dir)
         fzf_bin = File.join(fzf_dir, 'bin/fzf')
@@ -94,17 +125,25 @@ module Doing
 
         prev_level = Doing.logger.level
         Doing.logger.adjust_verbosity({ log_level: :info })
-        Doing.logger.log_now(:warn, 'Compiling and installing fzf -- this will only happen once')
-        Doing.logger.log_now(:warn, 'fzf is copyright Junegunn Choi, MIT License <https://github.com/junegunn/fzf/blob/master/LICENSE>')
+        Doing.logger.log_now(:warn, 'fzf:', 'Compiling and installing fzf -- this will only happen once')
+        Doing.logger.log_now(:warn, 'fzf:', 'fzf is copyright Junegunn Choi, MIT License <https://github.com/junegunn/fzf/blob/master/LICENSE>')
 
-        system("'#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
+        silence_std
+        `'#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null`
         unless File.exist?(fzf_bin)
+          restore_std
           Doing.logger.log_now(:warn, 'Error installing, trying again as root')
-          system("sudo '#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null")
+          silence_std
+          `sudo '#{fzf_dir}/install' --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish &> /dev/null`
+        end
+        restore_std
+        unless File.exist?(fzf_bin)
+          Doing.logger.error('fzf:', 'unable to install fzf. You can install manually and Doing will use the system version.')
+          Doing.logger.error('fzf:', 'see https://github.com/junegunn/fzf#installation')
+          raise RuntimeError.new('Error installing fzf, please report at https://github.com/ttscoff/doing/issues')
         end
-        raise RuntimeError.new('Error installing fzf, please report at https://github.com/ttscoff/doing/issues') unless File.exist?(fzf_bin)
 
-        Doing.logger.info("fzf installed to #{fzf}")
+        Doing.logger.info('fzf:', "installed to #{fzf}")
         Doing.logger.adjust_verbosity({ log_level: prev_level })
         fzf_bin
       end
@@ -189,7 +228,7 @@ module Doing
           %(-q "#{query}"),
           '--info=inline'
         ]
-        fzf_args.push('-1') unless opt.fetch(:show_if_single)
+        fzf_args.push('-1') unless opt.fetch(:show_if_single, false)
         fzf_args << case case_sensitive
                     when :sensitive
                       '+i'

data/lib/doing/string.rb

@@ -263,6 +263,26 @@ module Doing
       number == 1 ? self : "#{self}s"
     end
 
+    ##
+    ## Convert an age string to a qualified type
+    ##
+    ## @return     [Symbol] :oldest or :newest
+    ##
+    def normalize_age!(default = :newest)
+      replace normalize_age(default)
+    end
+
+    def normalize_age(default = :newest)
+      case self
+      when /^o/i
+        :oldest
+      when /^n/i
+        :newest
+      else
+        default
+      end
+    end
+
     ##
     ## Convert a sort order string to a qualified type
     ##

data/lib/doing/symbol.rb

@@ -9,6 +9,10 @@ module Doing
       to_s.normalize_bool(default)
     end
 
+    def normalize_age(default = :newest)
+      to_s.normalize_age(default)
+    end
+
     def normalize_order(default = 'asc')
       to_s.normalize_order(default)
     end

data/lib/doing/util_backup.rb

@@ -20,6 +20,21 @@ module Doing
         backups[limit..-1].each do |file|
           FileUtils.rm(File.join(backup_dir, file))
         end
+
+        clear_redo(filename)
+      end
+
+      ##
+      ## Delete all redo files
+      ##
+      ## @param      limit  Maximum number of backups to retain
+      ##
+      def clear_redo(filename)
+        filename ||= Doing.config.settings['doing_file']
+        backups = Dir.glob("undone*___#{File.basename(filename)}", base: backup_dir).sort.reverse
+        backups.each do |file|
+          FileUtils.rm(File.join(backup_dir, file))
+        end
       end
 
       ##
@@ -103,6 +118,8 @@ module Doing
           arr.push("#{d.time_ago}\t#{File.join(backup_dir, file)}")
         end
 
+        raise DoingRuntimeError, 'No backup files to load' if options.empty?
+
         backup_file = show_menu(options, filename)
         idx = undones.index(File.basename(backup_file))
         skipped = undones.slice!(idx, undones.count - idx)
@@ -135,8 +152,10 @@ module Doing
           arr.push("#{d.time_ago}\t#{File.join(backup_dir, file)}")
         end
 
+        raise DoingRuntimeError, 'No backup files to load' if options.empty?
+
         backup_file = show_menu(options, filename)
-        write_to_file(File.join(backup_dir, "undone___#{File.basename(filename)}"), IO.read(filename), backup: false)
+        Util.write_to_file(File.join(backup_dir, "undone___#{File.basename(filename)}"), IO.read(filename), backup: false)
         FileUtils.mv(backup_file, filename)
         prune_backups_after(File.basename(backup_file))
         Doing.logger.warn('File update:', "restored from #{backup_file}")
@@ -215,10 +234,10 @@ module Doing
         Time.now.strftime('%Y-%m-%d_%H.%M.%S')
       end
 
-      def get_backups(filename = nil)
+      def get_backups(filename = nil, include_forward: false)
         filename ||= Doing.config.settings['doing_file']
         backups = Dir.glob("*___#{File.basename(filename)}", base: backup_dir).sort.reverse
-        backups.delete_if { |f| f =~ /^undone/ }
+        backups.delete_if { |f| f =~ /^undone/ } unless include_forward
       end
 
       def save_undone(filename = nil)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.6'
+  VERSION = '2.1.10'
 end