doing 2.0.18 → 2.0.22

data/lib/doing/completion/zsh_completion.rb

@@ -0,0 +1,140 @@
+module Doing
+  module Completion
+    class ZshCompletions
+
+      attr_accessor :commands, :global_options
+
+      def generate_helpers
+        out=<<~EOFUNCTIONS
+          compdef _doing doing
+
+          function _doing() {
+              local line state
+
+              function _commands {
+                  local -a commands
+
+                  commands=(
+                            #{generate_subcommand_completions.join("\n                  ")}
+                  )
+                  _describe 'command' commands
+              }
+
+              _arguments -C \
+                      "1: :_commands" \
+                      "*::arg:->args"
+
+
+
+              case $line[1] in
+                  #{generate_subcommand_option_completions(indent: '            ').join("\n            ")}
+              esac
+
+              _arguments -s $args
+          }
+
+        EOFUNCTIONS
+        @bar.finish
+        out
+      end
+
+      def get_help_sections(command = '')
+        res = `doing help #{command}`.strip
+        scanned = res.scan(/(?m-i)^([A-Z ]+)\n([\s\S]*?)(?=\n+[A-Z]+|\Z)/)
+        sections = {}
+        scanned.each do |sect|
+          title = sect[0].downcase.strip.gsub(/ +/, '_').to_sym
+          content = sect[1].split(/\n/).map(&:strip).delete_if(&:empty?)
+          sections[title] = content
+        end
+        sections
+      end
+
+      def parse_option(option)
+        res = option.match(/(?:-(?<short>\w), )?(?:--(?:\[no-\])?(?<long>[\w_]+)(?:=(?<arg>\w+))?)\s+- (?<desc>.*?)$/)
+        return nil unless res
+
+        {
+          short: res['short'],
+          long: res['long'],
+          arg: res[:arg],
+          description: res['desc'].short_desc
+        }
+      end
+
+      def parse_options(options)
+        options.map { |opt| parse_option(opt) }
+      end
+
+      def parse_command(command)
+        res = command.match(/^(?<cmd>[^, \t]+)(?<alias>(?:, [^, \t]+)*)?\s+- (?<desc>.*?)$/)
+        commands = [res['cmd']]
+        commands.concat(res['alias'].split(/, /).delete_if(&:empty?)) if res['alias']
+
+        {
+          commands: commands,
+          description: res['desc'].short_desc
+        }
+      end
+
+      def parse_commands(commands)
+        commands.map { |cmd| parse_command(cmd) }
+      end
+
+      def generate_subcommand_completions
+        out = []
+        @commands.each_with_index do |cmd, i|
+          cmd[:commands].each do |c|
+            out << "'#{c}:#{cmd[:description].gsub(/'/, '\\\'')}'"
+          end
+        end
+        out
+      end
+
+      def generate_subcommand_option_completions(indent: '        ')
+
+        out = []
+
+        @commands.each_with_index do |cmd, i|
+          @bar.advance
+
+          data = get_help_sections(cmd[:commands].first)
+          option_arr = []
+
+          if data[:command_options]
+            parse_options(data[:command_options]).each do |option|
+              next if option.nil?
+
+              arg = option[:arg] ? '=' : ''
+
+              option_arr << if option[:short]
+                              %({-#{option[:short]},--#{option[:long]}#{arg}}"[#{option[:description].gsub(/'/, '\\\'')}]")
+                            else
+                              %("(--#{option[:long]}#{arg})--#{option[:long]}#{arg}}[#{option[:description].gsub(/'/, '\\\'')}]")
+                            end
+            end
+          end
+
+          cmd[:commands].each do |c|
+            out << "#{c}) \n#{indent}    args=( #{option_arr.join(' ')} )\n#{indent};;"
+          end
+        end
+
+        out
+      end
+
+      def initialize
+        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
+  end
+end

data/lib/doing/completion.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'tty-progressbar'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'completion'))
+require 'string'
+require 'fish_completion'
+require 'zsh_completion'
+require 'bash_completion'
+
+module Doing
+  # Completion script generator
+  module Completion
+    class << self
+      def generate_completion(type: 'zsh', file: 'stdout')
+
+        generator = case type.to_s
+                    when /^f/
+                      FishCompletions.new
+                    when /^b/
+                      BashCompletions.new
+                    else
+                      ZshCompletions.new
+                    end
+
+        result = generator.generate_completions
+
+        if file =~ /^stdout$/i
+          $stdout.puts result
+        else
+          File.open(File.expand_path(file), 'w') do |f|
+            f.puts result
+          end
+          Doing.logger.warn('File written:', "#{type} completions written to #{file}")
+        end
+      end
+    end
+  end
+end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.18'
+  VERSION = '2.0.22'
 end

data/lib/doing/wwid.rb

@@ -611,6 +611,22 @@ module Doing
       last_entry
     end
 
+    def fzf
+      fzf_dir = File.join(File.dirname(__FILE__), '../helpers/fzf')
+      FileUtils.mkdir_p(fzf_dir) unless File.directory?(fzf_dir)
+      fzf = File.join(fzf_dir, 'bin/fzf')
+      return fzf if File.exist?(fzf)
+
+      Doing.logger.log_now(:warn, 'Compiling and installing FZF. This will only happen once')
+      Doing.logger.log_now(:warn, 'fzf is copyright Junegunn Choi <https://github.com/junegunn/fzf/blob/master/LICENSE>')
+
+      res = `#{fzf_dir}/install --bin --no-key-bindings --no-completion --no-update-rc --no-bash --no-zsh --no-fish`
+
+      raise DoingRuntimeError unless File.exist?(fzf)
+
+      fzf
+    end
+
     ##
     ## Generate a menu of options and allow user selection
     ##
@@ -619,7 +635,6 @@ module Doing
     def choose_from(options, prompt: 'Make a selection: ', multiple: false, sorted: true, fzf_args: [])
       return nil unless $stdout.isatty
 
-      fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
       # fzf_args << '-1' # User is expecting a menu, and even if only one it seves as confirmation
       fzf_args << %(--prompt "#{prompt}")
       fzf_args << '--multi' if multiple
@@ -653,8 +668,6 @@ module Doing
     def fuzzy_filter_items(items, opt: {})
       scannable = items.map.with_index { |item, idx| "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}"  }.join("\n")
 
-      fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
-
       fzf_args = [
         '--multi',
         %(--filter="#{opt[:search].sub(/^'?/, "'")}"),
@@ -869,8 +882,6 @@ module Doing
         out.join('')
       end
 
-      fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
-
       fzf_args = [
         %(--header="#{opt[:header]}"),
         %(--prompt="#{opt[:prompt].sub(/ *$/, ' ')}"),
@@ -2187,7 +2198,8 @@ EOS
         output += list_section({ section: title, template: "\t- %date | %title%t2note", highlight: false, wrap_width: 0, tags_color: false })
       end
 
-      output + @other_content_bottom.join("\n") unless @other_content_bottom.nil?
+      output += @other_content_bottom.join("\n") unless @other_content_bottom.nil?
+      output.uncolor
     end
 
     ##

data/lib/doing.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require 'doing/version'
 require 'time'
 require 'date'
@@ -30,6 +29,7 @@ require 'doing/errors'
 require 'doing/hooks'
 require 'doing/plugin_manager'
 require 'doing/pager'
+require 'doing/completion'
 # require 'doing/markdown_document_listener'
 
 # Main doing module

data/lib/helpers/fzf/.goreleaser.yml

@@ -0,0 +1,119 @@
+---
+project_name: fzf
+
+before:
+  hooks:
+    - go mod download
+
+builds:
+  - id: fzf-macos
+    binary: fzf
+    goos:
+      - darwin
+    goarch:
+      - amd64
+    ldflags:
+      - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
+    hooks:
+      post: |
+        sh -c '
+        cat > /tmp/fzf-gon-amd64.hcl << EOF
+        source = ["./dist/fzf-macos_darwin_amd64/fzf"]
+        bundle_id = "kr.junegunn.fzf"
+        apple_id {
+          username = "junegunn.c@gmail.com"
+          password = "@env:AC_PASSWORD"
+        }
+        sign {
+          application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)"
+        }
+        zip {
+          output_path = "./dist/fzf-{{ .Version }}-darwin_amd64.zip"
+        }
+        EOF
+        gon /tmp/fzf-gon-amd64.hcl
+        '
+
+  - id: fzf-macos-arm
+    binary: fzf
+    goos:
+      - darwin
+    goarch:
+      - arm64
+    ldflags:
+      - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
+    hooks:
+      post: |
+        sh -c '
+        cat > /tmp/fzf-gon-arm64.hcl << EOF
+        source = ["./dist/fzf-macos-arm_darwin_arm64/fzf"]
+        bundle_id = "kr.junegunn.fzf"
+        apple_id {
+          username = "junegunn.c@gmail.com"
+          password = "@env:AC_PASSWORD"
+        }
+        sign {
+          application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)"
+        }
+        zip {
+          output_path = "./dist/fzf-{{ .Version }}-darwin_arm64.zip"
+        }
+        EOF
+        gon /tmp/fzf-gon-arm64.hcl
+        '
+
+  - id: fzf
+    goos:
+      - linux
+      - windows
+      - freebsd
+      - openbsd
+    goarch:
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      - 5
+      - 6
+      - 7
+    ldflags:
+      - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}"
+    ignore:
+      - goos: freebsd
+        goarch: arm
+      - goos: openbsd
+        goarch: arm
+      - goos: freebsd
+        goarch: arm64
+      - goos: openbsd
+        goarch: arm64
+
+archives:
+  - name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    builds:
+      - fzf
+    format: tar.gz
+    format_overrides:
+      - goos: windows
+        format: zip
+    files:
+      - non-existent*
+
+release:
+  github:
+    owner: junegunn
+    name: fzf
+  prerelease: auto
+  name_template: '{{ .Tag }}'
+  extra_files:
+    - glob: ./dist/fzf-*darwin*.zip
+
+snapshot:
+  name_template: "{{ .Tag }}-devel"
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - README
+      - test

data/lib/helpers/fzf/.rubocop.yml

@@ -0,0 +1,28 @@
+Layout/LineLength:
+  Enabled: false
+Metrics:
+  Enabled: false
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+Style/MethodCallWithArgsParentheses:
+  Enabled: true
+  IgnoredMethods:
+    - assert
+    - exit
+    - paste
+    - puts
+    - raise
+    - refute
+    - require
+    - send_keys
+  IgnoredPatterns:
+    - ^assert_
+    - ^refute_
+Style/NumericPredicate:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/WordArray:
+  MinSize: 1