doing 2.1.32 → 2.1.33

data/lib/completion/doing.bash

@@ -0,0 +1,493 @@
+_doing_again() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--noauto --ask --started --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-X -e -i -n -s -x --noauto --ask --started --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_archive() {
+  OLD_IFS="$IFS"
+local token=${COMP_WORDS[$COMP_CWORD]}
+IFS=$'	'
+local words=$(doing sections)
+IFS="$OLD_IFS"
+
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --before --bool --case --from --keep --label --not --search --to --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-k -t -x --after --before --bool --case --from --keep --label --not --search --to --tag --val --exact' -- $token ) )
+  else
+  local nocasematchWasOff=0
+  shopt nocasematch >/dev/null || nocasematchWasOff=1
+  (( nocasematchWasOff )) && shopt -s nocasematch
+  local w matches=()
+  OLD_IFS="$IFS"
+  IFS=$'	'‰
+  for w in $words; do
+    if [[ "$w" == "$token"* ]]; then
+      matches+=("${w// / }")
+    fi
+  done
+  IFS="$OLD_IFS"
+  (( nocasematchWasOff )) && shopt -u nocasematch
+  COMPREPLY=("${matches[@]}")
+
+  fi
+}
+
+_doing_autotag() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --count --force --interactive --section --search --tag --unfinished' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -i -s -u --bool --count --force --interactive --section --search --tag --unfinished' -- $token ) )
+  
+  fi
+}
+
+_doing_cancel() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--archive --bool --case --interactive --not --section --search --tag --unfinished --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -i -s -u -x --archive --bool --case --interactive --not --section --search --tag --unfinished --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_changes() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--changes --all --interactive --lookup --markdown --render --search --sort' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-C -a -i -l -s --changes --all --interactive --lookup --markdown --render --search --sort' -- $token ) )
+  
+  fi
+}
+
+_doing_completion() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--type' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-t --type' -- $token ) )
+  
+  fi
+}
+
+_doing_config() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--dump --update' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-d -u --dump --update' -- $token ) )
+  
+  fi
+}
+
+_doing_done() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--noauto --archive --ask --finished --started --date --editor --from --note --remove --section --for --unfinished' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-X -a -e -n -r -s -u --noauto --archive --ask --finished --started --date --editor --from --note --remove --section --for --unfinished' -- $token ) )
+  
+  fi
+}
+
+_doing_finish() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--archive --finished --auto --started --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --update --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -i -r -s -u -x --archive --finished --auto --started --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --update --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_grep() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --before --bool --case --config_template --delete --duration --editor --from --hilite --interactive --not --output --only_timed --section --times --tag_sort --template --totals --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-d -e -h -i -o -s -t -x --after --before --bool --case --config_template --delete --duration --editor --from --hilite --interactive --not --output --only_timed --section --times --tag_sort --template --totals --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_help() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W ' ' -- $token ) )
+  
+  fi
+}
+
+_doing_import() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --autotag --before --case --from --not --only_timed --overlap --prefix --section --search --tag --type --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-s -t -x --after --autotag --before --case --from --not --only_timed --overlap --prefix --section --search --tag --type --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_last() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --case --config_template --delete --duration --editor --hilite --not --section --search --tag --template --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-d -e -h -s -x --bool --case --config_template --delete --duration --editor --hilite --not --section --search --tag --template --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_mark() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --count --case --date --force --interactive --not --remove --section --search --tag --unfinished --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -d -i -r -s -u -x --bool --count --case --date --force --interactive --not --remove --section --search --tag --unfinished --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_meanwhile() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--noauto --archive --ask --started --editor --note --section' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-X -a -e -n -s --noauto --archive --ask --started --editor --note --section' -- $token ) )
+  
+  fi
+}
+
+_doing_note() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--ask --bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-e -i -r -s -x --ask --bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_now() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--noauto --ask --started --editor --finish_last --from --note --section' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-X -e -f -n -s --noauto --ask --started --editor --finish_last --from --note --section' -- $token ) )
+  
+  fi
+}
+
+_doing_on() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--config_template --duration --output --section --times --tag_sort --template --totals' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-o -s -t --config_template --duration --output --section --times --tag_sort --template --totals' -- $token ) )
+  
+  fi
+}
+
+_doing_open() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--app --bundle_id --editor' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -b -e --app --bundle_id --editor' -- $token ) )
+  
+  fi
+}
+
+_doing_plugins() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--column --type' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -t --column --type' -- $token ) )
+  
+  fi
+}
+
+_doing_recent() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--config_template --duration --interactive --section --times --tag_sort --template --totals' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-i -s -t --config_template --duration --interactive --section --times --tag_sort --template --totals' -- $token ) )
+  
+  fi
+}
+
+_doing_redo() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--file --interactive' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-f -i --file --interactive' -- $token ) )
+  
+  fi
+}
+
+_doing_reset() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --case --interactive --not --resume --section --search --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-i -r -s -x --bool --case --interactive --not --resume --section --search --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_rotate() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--before --bool --case --keep --not --section --search --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-k -s -x --before --bool --case --keep --not --section --search --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_sections() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--column' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c --column' -- $token ) )
+  
+  fi
+}
+
+_doing_select() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --query --remove --section --save_to --search --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -q -r -s -t -x --archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --query --remove --section --save_to --search --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_show() {
+  OLD_IFS="$IFS"
+local token=${COMP_WORDS[$COMP_CWORD]}
+IFS=$'	'
+local words=$(doing sections)
+IFS="$OLD_IFS"
+
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--age --after --before --bool --count --case --config_template --duration --from --hilite --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --template --totals --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -c -h -i -m -o -s -t -x --age --after --before --bool --count --case --config_template --duration --from --hilite --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --template --totals --val --exact' -- $token ) )
+  else
+  local nocasematchWasOff=0
+  shopt nocasematch >/dev/null || nocasematchWasOff=1
+  (( nocasematchWasOff )) && shopt -s nocasematch
+  local w matches=()
+  OLD_IFS="$IFS"
+  IFS=$'	'‰
+  for w in $words; do
+    if [[ "$w" == "$token"* ]]; then
+      matches+=("${w// / }")
+    fi
+  done
+  IFS="$OLD_IFS"
+  (( nocasematchWasOff )) && shopt -u nocasematch
+  COMPREPLY=("${matches[@]}")
+
+  fi
+}
+
+_doing_since() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--config_template --duration --output --section --times --tag_sort --template --totals' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-o -s -t --config_template --duration --output --section --times --tag_sort --template --totals' -- $token ) )
+  
+  fi
+}
+
+_doing_tag() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--autotag --bool --count --case --date --force --interactive --not --remove --regex --rename --section --search --tag --unfinished --value --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-a -c -d -i -r -s -u -v -x --autotag --bool --count --case --date --force --interactive --not --remove --regex --rename --section --search --tag --unfinished --value --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_tag_dir() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--remove' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-r --remove' -- $token ) )
+  
+  fi
+}
+
+_doing_tags() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --counts --case --interactive --line --not --order --section --search --sort --tag --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -i -l -o -s -x --bool --counts --case --interactive --line --not --order --section --search --sort --tag --val --exact' -- $token ) )
+  
+  fi
+}
+
+_doing_template() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--column --list --path --save' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -l -p -s --column --list --path --save' -- $token ) )
+  
+  fi
+}
+
+_doing_today() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --before --config_template --duration --from --output --section --times --tag_sort --template --totals' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --config_template --duration --from --output --section --times --tag_sort --template --totals' -- $token ) )
+  
+  fi
+}
+
+_doing_undo() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--file --interactive --prune --redo' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-f -i -p -r --file --interactive --prune --redo' -- $token ) )
+  
+  fi
+}
+
+_doing_view() {
+  OLD_IFS="$IFS"
+local token=${COMP_WORDS[$COMP_CWORD]}
+IFS=$'	'
+local words=$(doing views)
+IFS="$OLD_IFS"
+
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --age --before --bool --count --case --color --duration --from --hilite --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -h -i -o -s -t -x --after --age --before --bool --count --case --color --duration --from --hilite --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+  else
+  local nocasematchWasOff=0
+  shopt nocasematch >/dev/null || nocasematchWasOff=1
+  (( nocasematchWasOff )) && shopt -s nocasematch
+  local w matches=()
+  OLD_IFS="$IFS"
+  IFS=$'	'‰
+  for w in $words; do
+    if [[ "$w" == "$token"* ]]; then
+      matches+=("${w// / }")
+    fi
+  done
+  IFS="$OLD_IFS"
+  (( nocasematchWasOff )) && shopt -u nocasematch
+  COMPREPLY=("${matches[@]}")
+
+  fi
+}
+
+_doing_views() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--column' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c --column' -- $token ) )
+  
+  fi
+}
+
+_doing_wiki() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --bool --before --from --only_timed --section --search --tag' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-b -f -s --after --bool --before --from --only_timed --section --search --tag' -- $token ) )
+  
+  fi
+}
+
+_doing_yesterday() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --before --config_template --duration --from --output --section --times --tag_order --tag_sort --template --totals' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --config_template --duration --from --output --section --times --tag_order --tag_sort --template --totals' -- $token ) )
+  
+  fi
+}
+
+_doing()
+{
+  local last="${@: -1}"
+  local token=${COMP_WORDS[$COMP_CWORD]}
+
+  if [[ $last =~ (again|resume) ]]; then _doing_again
+    elif [[ $last =~ (archive|move) ]]; then _doing_archive
+    elif [[ $last =~ (autotag) ]]; then _doing_autotag
+    elif [[ $last =~ (cancel) ]]; then _doing_cancel
+    elif [[ $last =~ (changes|changelog) ]]; then _doing_changes
+    elif [[ $last =~ (completion) ]]; then _doing_completion
+    elif [[ $last =~ (config) ]]; then _doing_config
+    elif [[ $last =~ (done|did) ]]; then _doing_done
+    elif [[ $last =~ (finish) ]]; then _doing_finish
+    elif [[ $last =~ (grep|search) ]]; then _doing_grep
+    elif [[ $last =~ (help) ]]; then _doing_help
+    elif [[ $last =~ (import) ]]; then _doing_import
+    elif [[ $last =~ (last) ]]; then _doing_last
+    elif [[ $last =~ (mark|flag) ]]; then _doing_mark
+    elif [[ $last =~ (meanwhile) ]]; then _doing_meanwhile
+    elif [[ $last =~ (note) ]]; then _doing_note
+    elif [[ $last =~ (now|next) ]]; then _doing_now
+    elif [[ $last =~ (on) ]]; then _doing_on
+    elif [[ $last =~ (open) ]]; then _doing_open
+    elif [[ $last =~ (plugins) ]]; then _doing_plugins
+    elif [[ $last =~ (recent) ]]; then _doing_recent
+    elif [[ $last =~ (redo) ]]; then _doing_redo
+    elif [[ $last =~ (reset|begin) ]]; then _doing_reset
+    elif [[ $last =~ (rotate) ]]; then _doing_rotate
+    elif [[ $last =~ (sections) ]]; then _doing_sections
+    elif [[ $last =~ (select) ]]; then _doing_select
+    elif [[ $last =~ (show) ]]; then _doing_show
+    elif [[ $last =~ (since) ]]; then _doing_since
+    elif [[ $last =~ (tag) ]]; then _doing_tag
+    elif [[ $last =~ (tag_dir) ]]; then _doing_tag_dir
+    elif [[ $last =~ (tags) ]]; then _doing_tags
+    elif [[ $last =~ (template) ]]; then _doing_template
+    elif [[ $last =~ (today) ]]; then _doing_today
+    elif [[ $last =~ (undo) ]]; then _doing_undo
+    elif [[ $last =~ (view) ]]; then _doing_view
+    elif [[ $last =~ (views) ]]; then _doing_views
+    elif [[ $last =~ (wiki) ]]; then _doing_wiki
+    elif [[ $last =~ (yesterday) ]]; then _doing_yesterday
+  else
+    OLD_IFS="$IFS"
+    IFS=$'
+'
+    COMPREPLY=( $(compgen -W "$(doing help -c)" -- $token) )
+    IFS="$OLD_IFS"
+  fi
+}
+
+complete -F _doing doing

data/lib/completion/doing.fish

@@ -555,7 +555,8 @@ complete -c doing -l template  -f -r -n '__fish_doing_using_command yesterday' -
 complete -c doing -l totals  -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search on select show since today view yesterday' -a '(__fish_doing_export_plugin)'
 complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'
-complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel changes changelog 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 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 tag tags view' -a 'case-sensitive ignore smart'
+complete -f -c doing -l sort -x -n '__fish_doing_using_command changes changelog show tags' -a 'asc desc'
 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 view' -a 'oldest newest'

data/lib/doing/completion/bash_completion.rb

@@ -126,7 +126,7 @@ module Doing
         data = Completion.get_help_sections
         @global_options = Completion.parse_options(data[:global_options])
         @commands = Completion.parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :box, hide_cursor: true, status: 'Reading subcommands')
+        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Bash completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :square, hide_cursor: true, status: 'Reading subcommands')
         width = TTY::Screen.columns - 45
         @bar.resize(width)
       end

data/lib/doing/completion/fish_completion.rb

@@ -183,7 +183,7 @@ module Doing
               need_export.concat(cmd[:commands]) if option[:long] == 'output'
               need_bool.concat(cmd[:commands]) if option[:long] == 'bool'
               need_case.concat(cmd[:commands]) if option[:long] == 'case'
-              need_case.concat(cmd[:commands]) if option[:long] == 'sort'
+              need_sort.concat(cmd[:commands]) if option[:long] == 'sort'
               need_tag_sort.concat(cmd[:commands]) if option[:long] == 'tag_sort'
               need_tag_order.concat(cmd[:commands]) if option[:long] == 'tag_order'
               need_age.concat(cmd[:commands]) if option[:long] == 'age'
@@ -232,7 +232,7 @@ module Doing
         data = Completion.get_help_sections
         @global_options = Completion.parse_options(data[:global_options])
         @commands = Completion.parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :block, hide_cursor: true, status: 'processing subcommands')
+        @bar = TTY::ProgressBar.new("\033[0;0;33mGenerating Fish completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :square, hide_cursor: true, status: 'processing subcommands')
         width = TTY::Screen.columns - 45
         @bar.resize(width)
       end

data/lib/doing/completion/zsh_completion.rb

@@ -2,6 +2,12 @@
 
 module Doing
   module Completion
+    class ::String
+      def sanitize
+        gsub(/'/, '\\\'').gsub(/\[/, '(').gsub(/\]/, ')')
+      end
+    end
+
     # Generate completions for zsh
     class ZshCompletions
       attr_accessor :commands, :global_options
@@ -65,12 +71,12 @@ module Doing
             Completion.parse_options(data[:command_options]).each do |option|
               next if option.nil?
 
-              arg = option[:arg] ? '=' : ''
+              arg = option[:arg] ? ":#{option[:arg]}:" : ''
 
               option_arr << if option[:short]
-                              %({-#{option[:short]},--#{option[:long]}#{arg}}"[#{option[:description].gsub(/'/, '\\\'')}]")
+                              %({'(--#{option[:long]})-#{option[:short]}','(-#{option[:short]})--#{option[:long]}'}"[#{option[:description].sanitize}]#{arg}")
                             else
-                              %("(--#{option[:long]}#{arg})--#{option[:long]}#{arg}}[#{option[:description].gsub(/'/, '\\\'')}]")
+                              %("--#{option[:long]}[#{option[:description].sanitize}]#{arg}")
                             end
             end
           end
@@ -87,7 +93,7 @@ module Doing
         data = Completion.get_help_sections
         @global_options = Completion.parse_options(data[:global_options])
         @commands = Completion.parse_commands(data[:commands])
-        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :block, hide_cursor: true, status: 'processing subcommands')
+        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Zsh completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :square, hide_cursor: true, status: 'processing subcommands')
         width = TTY::Screen.columns - 45
         @bar.resize(width)
       end

data/lib/doing/types.rb

@@ -11,7 +11,7 @@ module Doing
     REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
     REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i.freeze
     REGEX_RANGE_INDICATOR = ' +(?:to|through|thru|(?:un)?til|-+) +'
-    REGEX_RANGE = /^\S+#{REGEX_RANGE_INDICATOR}+\S+/i.freeze
+    REGEX_RANGE = /^\S+.*?#{REGEX_RANGE_INDICATOR}\S+.*?$/i.freeze
     REGEX_TIME_RANGE = /^#{REGEX_CLOCK}#{REGEX_RANGE_INDICATOR}#{REGEX_CLOCK}$/i.freeze
 
     InvalidExportType = Class.new(RuntimeError)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.32'
+  VERSION = '2.1.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.32
+  version: 2.1.33
 platform: ruby
 authors:
 - Brett Terpstra
@@ -582,6 +582,7 @@ files:
 - img/doing-show-note-formatting-800.jpg
 - inputrc
 - lib/completion/_doing.zsh
+- lib/completion/doing.bash
 - lib/completion/doing.fish
 - lib/doing.rb
 - lib/doing/add_options.rb