doing 2.0.17 → 2.0.21

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/plugins/export/template_export.rb

@@ -42,6 +42,7 @@ module Doing
         else
           note = []
         end
+
         output = opt[:template].dup
 
         output.gsub!(/%[a-z]+/) do |m|
@@ -90,7 +91,7 @@ module Doing
             item.title.wrap(width, pad: pad, indent: indent, offset: title_offset, prefix: prefix, color: title_color, after: after, reset: reset)
             # flag + item.title.gsub(/(.{#{opt[:wrap_width]}})(?=\s+|\Z)/, "\\1\n ").sub(/\s*$/, '') + reset
           else
-            format("%s%s%#{pad}s%s%s", title_color, prefix, item.title.sub(/\s*$/, ''), reset, after)
+            format("%s%#{pad}s%s", prefix, item.title.sub(/\s*$/, ''), after)
           end
         end
 
@@ -135,6 +136,7 @@ module Doing
 
         out += "#{output}\n"
       end
+
       # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:template]}")
       out += wwid.tag_times(format: wwid.config['timer_format'].to_sym, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
       out

data/lib/doing/string.rb

@@ -162,7 +162,7 @@ module Doing
     ## @param      prefix  [String] (Optional) A prefix to add to each line
     ##
     def wrap(len, pad: 0, indent: '  ', offset: 0, prefix: '', color: '', after: '', reset: '')
-      last_color = after.last_color
+      last_color = color.empty? ? '' : after.last_color
       note_rx = /(?i-m)(%(?:[io]d|(?:\^[\s\S])?(?:(?:[ _t]|[^a-z0-9])?\d+)?(?:[\s\S][ _t]?)?)?note)/
       # Don't break inside of tag values
       str = gsub(/@\S+\(.*?\)/) { |tag| tag.gsub(/\s/, '%%%%') }

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.17'
+  VERSION = '2.0.21'
 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, 'Downloading 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 = `git clone --depth 1 https://github.com/junegunn/fzf.git #{fzf_dir}`
+      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(/ *$/, ' ')}"),
@@ -1649,7 +1660,9 @@ module Doing
       opt[:format] ||= cfg['date_format']
       opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
-      opt[:tags_color] ||= cfg['tags_color'] || false
+      if opt[:tags_color].nil?
+        opt[:tags_color] = cfg['tags_color'] || false
+      end
       opt[:template] ||= cfg['template']
 
       # opt[:highlight] ||= true
@@ -2182,10 +2195,11 @@ EOS
 
       @content.each do |title, section|
         output += "#{section[:original]}\n"
-        output += list_section({ section: title, template: "\t- %date | %title%t2note", highlight: false, wrap_width: 0 })
+        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