doing 2.0.18 → 2.0.22

data/lib/helpers/fzf/uninstall

@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+
+xdg=0
+prefix='~/.fzf'
+prefix_expand=~/.fzf
+fish_dir=${XDG_CONFIG_HOME:-$HOME/.config}/fish
+
+help() {
+  cat << EOF
+usage: $0 [OPTIONS]
+
+    --help               Show this message
+    --xdg                Remove files generated under \$XDG_CONFIG_HOME/fzf
+EOF
+}
+
+for opt in "$@"; do
+  case $opt in
+    --help)
+      help
+      exit 0
+      ;;
+    --xdg)
+      xdg=1
+      prefix='"${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf'
+      prefix_expand=${XDG_CONFIG_HOME:-$HOME/.config}/fzf/fzf
+      ;;
+    *)
+      echo "unknown option: $opt"
+      help
+      exit 1
+      ;;
+  esac
+done
+
+ask() {
+  while true; do
+    read -p "$1 ([y]/n) " -r
+    REPLY=${REPLY:-"y"}
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      return 0
+    elif [[ $REPLY =~ ^[Nn]$ ]]; then
+      return 1
+    fi
+  done
+}
+
+remove() {
+  echo "Remove $1"
+  rm -f "$1"
+}
+
+remove_line() {
+  src=$(readlink "$1")
+  if [ $? -eq 0 ]; then
+    echo "Remove from $1 ($src):"
+  else
+    src=$1
+    echo "Remove from $1:"
+  fi
+
+  shift
+  line_no=1
+  match=0
+  while [ -n "$1" ]; do
+    line=$(sed -n "$line_no,\$p" "$src" | \grep -m1 -nF "$1")
+    if [ $? -ne 0 ]; then
+      shift
+      line_no=1
+      continue
+    fi
+    line_no=$(( $(sed 's/:.*//' <<< "$line") + line_no - 1 ))
+    content=$(sed 's/^[0-9]*://' <<< "$line")
+    match=1
+    echo    "  - Line #$line_no: $content"
+    [ "$content" = "$1" ] || ask "    - Remove?"
+    if [ $? -eq 0 ]; then
+      awk -v n=$line_no 'NR == n {next} {print}' "$src" > "$src.bak" &&
+        mv "$src.bak" "$src" || break
+      echo  "      - Removed"
+    else
+      echo  "      - Skipped"
+      line_no=$(( line_no + 1 ))
+    fi
+  done
+  [ $match -eq 0 ] && echo "  - Nothing found"
+  echo
+}
+
+for shell in bash zsh; do
+  shell_config=${prefix_expand}.${shell}
+  remove "${shell_config}"
+  remove_line ~/.${shell}rc \
+    "[ -f ${prefix}.${shell} ] && source ${prefix}.${shell}" \
+    "source ${prefix}.${shell}"
+done
+
+bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
+if [ -f "$bind_file" ]; then
+  remove_line "$bind_file" "fzf_key_bindings"
+fi
+
+if [ -d "${fish_dir}/functions" ]; then
+  remove "${fish_dir}/functions/fzf.fish"
+  remove "${fish_dir}/functions/fzf_key_bindings.fish"
+
+  if [ -z "$(ls -A "${fish_dir}/functions")" ]; then
+    rmdir "${fish_dir}/functions"
+  else
+    echo "Can't delete non-empty directory: \"${fish_dir}/functions\""
+  fi
+fi
+
+config_dir=$(dirname "$prefix_expand")
+if [[ "$xdg" = 1 ]] && [[ "$config_dir" = */fzf ]] && [[ -d "$config_dir" ]]; then
+  rmdir "$config_dir"
+fi

data/scripts/generate_bash_completions.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
-require 'doing/cli_status'
-
+require 'tty-progressbar'
 require 'shellwords'
 
 class ::String
@@ -23,8 +21,6 @@ class ::String
 end
 
 class BashCompletions
-  include Status
-
   attr_accessor :commands, :global_options
 
   def main_function
@@ -32,12 +28,9 @@ class BashCompletions
     out = []
     logic = []
     need_export = []
-    # processing = []
 
     @commands.each_with_index do |cmd, i|
-      # processing << cmd[:commands].first
-      processing = cmd[:commands]
-      progress('Processing subcommand options', i, @commands.count, processing)
+      @bar.advance
 
       data = get_help_sections(cmd[:commands].first)
 
@@ -82,7 +75,6 @@ class BashCompletions
         fi
       }
     EOFUNC
-    clear
     out.join("\n")
   end
 
@@ -193,17 +185,19 @@ class BashCompletions
   end
 
   def initialize
-    status('Generating Bash completions', reset: false)
     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.resize(25)
   end
 
   def generate_completions
+    @bar.start
     out = []
     out << main_function
     out << 'complete -F _doing doing'
-    status('Complete', reset: false)
+    @bar.finish
     out.join("\n")
   end
 end

data/scripts/generate_fish_completions.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
-require 'doing/cli_status'
-
+require 'tty-progressbar'
 require 'shellwords'
 
 class ::String
@@ -23,7 +21,6 @@ class ::String
 end
 
 class FishCompletions
-  include Status
 
   attr_accessor :commands, :global_options
 
@@ -134,11 +131,7 @@ class FishCompletions
 
   def generate_subcommand_completions
     out = []
-    # processing = []
     @commands.each_with_index do |cmd, i|
-      # processing << cmd[:commands].first
-      processing = cmd[:commands]
-      progress('Processing subcommands', i, @commands.count, processing)
       out << "complete -xc doing -n '__fish_doing_needs_command' -a '#{cmd[:commands].join(' ')}' -d #{Shellwords.escape(cmd[:description])}"
     end
 
@@ -149,13 +142,9 @@ class FishCompletions
 
     out = []
     need_export = []
-    # processing = []
 
     @commands.each_with_index do |cmd, i|
-      # processing << cmd[:commands].first
-      processing = cmd[:commands]
-      progress('Processing subcommand options', i, @commands.count, processing)
-
+      @bar.advance
       data = get_help_sections(cmd[:commands].first)
 
       if data[:synopsis].join(' ').strip.split(/ /).last =~ /(path|file)/i
@@ -180,23 +169,25 @@ class FishCompletions
       out << "complete -f -c doing -s o -l output -x -n '__fish_doing_using_command #{need_export.join(' ')}' -a '(__fish_doing_export_plugins)'"
     end
 
-    clear
+    # clear
     out.join("\n")
   end
 
   def initialize
-    status('Generating Fish completions', reset: false)
     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.resize(25)
   end
 
   def generate_completions
+    @bar.start
     out = []
     out << generate_helpers
     out << generate_subcommand_completions
     out << generate_subcommand_option_completions
-    status('Complete', reset: false)
+    @bar.finish
     out.join("\n")
   end
 end

data/scripts/generate_zsh_completions.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
-require 'doing/cli_status'
-
+require 'tty-progressbar'
 require 'shellwords'
 
 class ::String
@@ -23,7 +21,6 @@ class ::String
 end
 
 class ZshCompletions
-  include Status
 
   attr_accessor :commands, :global_options
 
@@ -57,7 +54,7 @@ class ZshCompletions
       }
 
     EOFUNCTIONS
-    status('Complete', reset: false)
+    @bar.finish
     out
   end
 
@@ -106,28 +103,20 @@ class ZshCompletions
 
   def generate_subcommand_completions
     out = []
-    # processing = []
     @commands.each_with_index do |cmd, i|
-      # processing << cmd[:commands].first
-      processing = cmd[:commands]
-      progress('Processing subcommands', i, @commands.count, processing)
       cmd[:commands].each do |c|
         out << "'#{c}:#{cmd[:description].gsub(/'/, '\\\'')}'"
       end
     end
-    clear
     out
   end
 
   def generate_subcommand_option_completions(indent: '        ')
 
     out = []
-    # processing = []
 
     @commands.each_with_index do |cmd, i|
-      # processing << cmd[:commands].first
-      processing = cmd[:commands]
-      progress('Processing subcommand options', i, @commands.count, processing)
+      @bar.advance
 
       data = get_help_sections(cmd[:commands].first)
       option_arr = []
@@ -155,13 +144,15 @@ class ZshCompletions
   end
 
   def initialize
-    status('Generating Zsh completions', reset: false)
     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.resize(25)
   end
 
   def generate_completions
+    @bar.start
     generate_helpers
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.22
 platform: ruby
 authors:
 - Brett Terpstra
@@ -90,58 +90,102 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.26
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.3
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +350,11 @@ files:
 - lib/doing/array.rb
 - lib/doing/cli_status.rb
 - lib/doing/colors.rb
+- lib/doing/completion.rb
+- lib/doing/completion/bash_completion.rb
+- lib/doing/completion/fish_completion.rb
+- lib/doing/completion/string.rb
+- lib/doing/completion/zsh_completion.rb
 - lib/doing/configuration.rb
 - lib/doing/errors.rb
 - lib/doing/hash.rb
@@ -342,6 +391,92 @@ files:
 - lib/examples/plugins/wiki_export/templates/wiki_index.haml
 - lib/examples/plugins/wiki_export/wiki_export.rb
 - lib/helpers/fuzzyfilefinder
+- lib/helpers/fzf/.goreleaser.yml
+- lib/helpers/fzf/.rubocop.yml
+- lib/helpers/fzf/ADVANCED.md
+- lib/helpers/fzf/BUILD.md
+- lib/helpers/fzf/CHANGELOG.md
+- lib/helpers/fzf/Dockerfile
+- lib/helpers/fzf/LICENSE
+- lib/helpers/fzf/Makefile
+- lib/helpers/fzf/README-VIM.md
+- lib/helpers/fzf/README.md
+- lib/helpers/fzf/bin/fzf-tmux
+- lib/helpers/fzf/doc/fzf.txt
+- lib/helpers/fzf/go.mod
+- lib/helpers/fzf/go.sum
+- lib/helpers/fzf/install
+- lib/helpers/fzf/install.ps1
+- lib/helpers/fzf/main.go
+- lib/helpers/fzf/man/man1/fzf-tmux.1
+- lib/helpers/fzf/man/man1/fzf.1
+- lib/helpers/fzf/plugin/fzf.vim
+- lib/helpers/fzf/shell/completion.bash
+- lib/helpers/fzf/shell/completion.zsh
+- lib/helpers/fzf/shell/key-bindings.bash
+- lib/helpers/fzf/shell/key-bindings.fish
+- lib/helpers/fzf/shell/key-bindings.zsh
+- lib/helpers/fzf/src/LICENSE
+- lib/helpers/fzf/src/algo/algo.go
+- lib/helpers/fzf/src/algo/algo_test.go
+- lib/helpers/fzf/src/algo/normalize.go
+- lib/helpers/fzf/src/ansi.go
+- lib/helpers/fzf/src/ansi_test.go
+- lib/helpers/fzf/src/cache.go
+- lib/helpers/fzf/src/cache_test.go
+- lib/helpers/fzf/src/chunklist.go
+- lib/helpers/fzf/src/chunklist_test.go
+- lib/helpers/fzf/src/constants.go
+- lib/helpers/fzf/src/core.go
+- lib/helpers/fzf/src/history.go
+- lib/helpers/fzf/src/history_test.go
+- lib/helpers/fzf/src/item.go
+- lib/helpers/fzf/src/item_test.go
+- lib/helpers/fzf/src/matcher.go
+- lib/helpers/fzf/src/merger.go
+- lib/helpers/fzf/src/merger_test.go
+- lib/helpers/fzf/src/options.go
+- lib/helpers/fzf/src/options_test.go
+- lib/helpers/fzf/src/pattern.go
+- lib/helpers/fzf/src/pattern_test.go
+- lib/helpers/fzf/src/protector/protector.go
+- lib/helpers/fzf/src/protector/protector_openbsd.go
+- lib/helpers/fzf/src/reader.go
+- lib/helpers/fzf/src/reader_test.go
+- lib/helpers/fzf/src/result.go
+- lib/helpers/fzf/src/result_others.go
+- lib/helpers/fzf/src/result_test.go
+- lib/helpers/fzf/src/result_x86.go
+- lib/helpers/fzf/src/terminal.go
+- lib/helpers/fzf/src/terminal_test.go
+- lib/helpers/fzf/src/terminal_unix.go
+- lib/helpers/fzf/src/terminal_windows.go
+- lib/helpers/fzf/src/tokenizer.go
+- lib/helpers/fzf/src/tokenizer_test.go
+- lib/helpers/fzf/src/tui/dummy.go
+- lib/helpers/fzf/src/tui/light.go
+- lib/helpers/fzf/src/tui/light_unix.go
+- lib/helpers/fzf/src/tui/light_windows.go
+- lib/helpers/fzf/src/tui/tcell.go
+- lib/helpers/fzf/src/tui/tcell_test.go
+- lib/helpers/fzf/src/tui/ttyname_unix.go
+- lib/helpers/fzf/src/tui/ttyname_windows.go
+- lib/helpers/fzf/src/tui/tui.go
+- lib/helpers/fzf/src/tui/tui_test.go
+- lib/helpers/fzf/src/util/atomicbool.go
+- lib/helpers/fzf/src/util/atomicbool_test.go
+- lib/helpers/fzf/src/util/chars.go
+- lib/helpers/fzf/src/util/chars_test.go
+- lib/helpers/fzf/src/util/eventbox.go
+- lib/helpers/fzf/src/util/eventbox_test.go
+- lib/helpers/fzf/src/util/slab.go
+- lib/helpers/fzf/src/util/util.go
+- lib/helpers/fzf/src/util/util_test.go
+- lib/helpers/fzf/src/util/util_unix.go
+- lib/helpers/fzf/src/util/util_windows.go
+- lib/helpers/fzf/test/fzf.vader
+- lib/helpers/fzf/test/test_go.rb
+- lib/helpers/fzf/uninstall
 - lib/templates/doing-markdown.erb
 - lib/templates/doing.css
 - lib/templates/doing.haml