doing 2.1.6 → 2.1.10

data/lib/doing/wwid.rb

@@ -338,7 +338,8 @@ module Doing
     ## @option opt :back [Date] backdate
     ## @option opt :timed [Boolean] new item is timed entry, marks previous entry as @done
     ##
-    def add_item(title, section = nil, opt = {})
+    def add_item(title, section = nil, opt)
+      opt ||= {}
       section ||= @config['current_section']
       @content.add_section(section, log: false)
       opt[:back] ||= opt[:date] ? opt[:date] : Time.now
@@ -401,7 +402,8 @@ module Doing
     ## @param      paths  [String] Path to JSON report file
     ## @param      opt    [Hash] Additional Options
     ##
-    def import(paths, opt = {})
+    def import(paths, opt)
+      opt ||= {}
       Plugins.plugins[:import].each do |_, options|
         next unless opt[:type] =~ /^(#{options[:trigger].normalize_trigger})$/i
 
@@ -461,7 +463,8 @@ module Doing
     #
     # @return     nothing
     #
-    def repeat_item(item, opt = {})
+    def repeat_item(item, opt)
+      opt ||= {}
       if item.should_finish?
         if item.should_time?
           item.title.tag!('done', value: Time.now.strftime('%F %R'))
@@ -501,7 +504,8 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def repeat_last(opt = {})
+    def repeat_last(opt)
+      opt ||= {}
       opt[:section] ||= 'all'
       opt[:section] = guess_section(opt[:section])
       opt[:note] ||= []
@@ -523,7 +527,8 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def last_entry(opt = {})
+    def last_entry(opt)
+      opt ||= {}
       opt[:tag_bool] ||= :and
       opt[:section] ||= @config['current_section']
 
@@ -615,19 +620,19 @@ module Doing
     ## @param      items  [Array] The items to filter (if empty, filters all items)
     ## @param      opt    [Hash] The filter parameters
     ##
-    ## @option opt [String] :section
-    ## @option opt [Boolean] :unfinished
-    ## @option opt [Array or String] :tag  (Array or comma-separated string)
-    ## @option opt [Symbol] :tag_bool  (:and, :or, :not)
-    ## @option opt [String] :search  (string, optional regex with //)
-    ## @option opt [Array] :date_filter  [[Time]start, [Time]end]
-    ## @option opt [Boolean] :only_timed
-    ## @option opt [String] :before  (Date/Time string, unparsed)
-    ## @option opt [String] :after  (Date/Time string, unparsed)
-    ## @option opt [Boolean] :today
-    ## @option opt [Boolean] :yesterday
-    ## @option opt [Number] :count  (Number to return)
-    ## @option opt [String] :age  ('old' or 'new')
+    ## @option opt [String] :section ('all')
+    ## @option opt [Boolean] :unfinished (false)
+    ## @option opt [Array or String] :tag ([]) Array or comma-separated string
+    ## @option opt [Symbol] :tag_bool (:and) :and, :or, :not
+    ## @option opt [String] :search ('') string, optional regex with `/string/`
+    ## @option opt [Array] :date_filter (nil) [[Time]start, [Time]end]
+    ## @option opt [Boolean] :only_timed (false)
+    ## @option opt [String] :before (nil) Date/Time string, unparsed
+    ## @option opt [String] :after  (nil) Date/Time string, unparsed
+    ## @option opt [Boolean] :today (false) limit to entries from today
+    ## @option opt [Boolean] :yesterday (false) limit to entries from yesterday
+    ## @option opt [Number] :count (0) max entries to return
+    ## @option opt [String] :age (new) 'old' or 'new'
     ##
     def filter_items(items = Items.new, opt: {})
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
@@ -784,7 +789,7 @@ module Doing
 
       output = Items.new
 
-      if opt[:age] =~ /^o/i
+      if opt[:age] && opt[:age].normalize_age == :oldest
         output.concat(filtered_items.slice(0, count).reverse)
       else
         output.concat(filtered_items.reverse.slice(0, count))
@@ -800,7 +805,8 @@ module Doing
     ##
     ## Options hash is shared with #filter_items and #act_on
     ##
-    def interactive(opt = {})
+    def interactive(opt)
+      opt ||= {}
       opt[:section] = opt[:section] ? guess_section(opt[:section]) : 'All'
 
       search = nil
@@ -820,7 +826,11 @@ module Doing
       }
       items = filter_items(Items.new, opt: filter_options)
 
-      selection = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **opt)
+      menu_options = %i[search query exact multiple show_if_single menu sort case].each_with_object({}) {
+        |k, hsh| hsh[k] = opt[k]
+      }
+
+      selection = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **menu_options)
 
       raise NoResults, 'no items selected' if selection.nil? || selection.empty?
 
@@ -848,7 +858,8 @@ module Doing
     ## @option opt [Boolean] :again
     ## @option opt [Boolean] :resume
     ##
-    def act_on(items, opt = {})
+    def act_on(items, opt)
+      opt ||= {}
       actions = %i[editor delete tag flag finish cancel archive output save_to again resume]
       has_action = false
       single = items.count == 1
@@ -1105,7 +1116,8 @@ module Doing
     ##
     ## @see        #filter_items
     ##
-    def tag_last(opt = {})
+    def tag_last(opt)
+      opt ||= {}
       opt[:count] ||= 1
       opt[:archive] ||= false
       opt[:tags] ||= ['done']
@@ -1229,7 +1241,8 @@ module Doing
     ##
     ## @return     [Item] the next chronological item in the index
     ##
-    def next_item(item, options = {})
+    def next_item(item, options)
+      options ||= {}
       items = filter_items(Items.new, opt: options)
 
       idx = items.index(item)
@@ -1287,7 +1300,8 @@ module Doing
     ## @option opt :back [Date] backdate new item
     ## @option opt :new_item [String] content to use for new item
     ## @option opt :note [Array] note content for new item
-    def stop_start(target_tag, opt = {})
+    def stop_start(target_tag, opt)
+      opt ||= {}
       tag = target_tag.dup
       opt[:section] ||= @config['current_section']
       opt[:archive] ||= false
@@ -1354,7 +1368,8 @@ module Doing
     ##
     ## Rename doing file with date and start fresh one
     ##
-    def rotate(opt = {})
+    def rotate(opt)
+      opt ||= {}
       keep = opt[:keep] || 0
       tags = []
       tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
@@ -1369,7 +1384,7 @@ module Doing
       counter = 0
       new_content = Items.new
 
-      @content.each do |item|
+      section_items.each do |item|
         break if counter >= max
         if opt[:before]
           time_string = opt[:before]
@@ -1482,7 +1497,7 @@ module Doing
     ##
     ## @param      opt   [Hash] Additional Options
     ##
-    def list_section(opt = {}, items: Items.new)
+    def list_section(opt, items: Items.new)
       opt[:config_template] ||= 'default'
 
       tpl_cfg = @config.dig('templates', opt[:config_template])
@@ -1504,7 +1519,8 @@ module Doing
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
-      opt[:age] ||= 'newest'
+      opt[:age] ||= :newest
+      opt[:age] = opt[:age].normalize_age
       opt[:format] ||= cfg['date_format']
       opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
@@ -1559,7 +1575,8 @@ module Doing
     ## @param      section      [String] The source section
     ## @param      options      [Hash] Options
     ##
-    def archive(section = @config['current_section'], options = {})
+    def archive(section = @config['current_section'], options)
+      options ||= {}
       count       = options[:keep] || 0
       destination = options[:destination] || 'Archive'
       tags        = options[:tags] || []
@@ -1589,7 +1606,8 @@ module Doing
     ## @param      output  [String] output format
     ## @param      opt     [Hash] Options
     ##
-    def today(times = true, output = nil, opt = {})
+    def today(times = true, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
@@ -1637,7 +1655,8 @@ module Doing
     ## @param      output   [String] Output format
     ## @param      opt      [Hash] Additional Options
     ##
-    def list_date(dates, section, times = nil, output = nil, opt = {})
+    def list_date(dates, section, times = nil, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
       section = guess_section(section)
@@ -1666,7 +1685,8 @@ module Doing
     ## @param      output   [String] Output format
     ## @param      opt      [Hash] Additional Options
     ##
-    def yesterday(section, times = nil, output = nil, opt = {})
+    def yesterday(section, times = nil, output = nil, opt)
+      opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
       section = guess_section(section)
@@ -1701,7 +1721,8 @@ module Doing
     ## @param      section  [String] The section to show from, default Currently
     ## @param      opt      [Hash] Additional Options
     ##
-    def recent(count = 10, section = nil, opt = {})
+    def recent(count = 10, section = nil, opt)
+      opt ||= {}
       times = opt[:t] || true
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
@@ -1720,10 +1741,16 @@ module Doing
       section ||= @config['current_section']
       section = guess_section(section)
 
-      list_section({ section: section, wrap_width: cfg['wrap_width'], count: count,
-                     format: cfg['date_format'], template: cfg['template'],
-                     order: 'asc', times: times, totals: opt[:totals],
-                     sort_tags: opt[:sort_tags], tags_color: opt[:tags_color], config_template: 'recent' })
+      opt[:section] = section
+      opt[:wrap_width] = cfg['wrap_width']
+      opt[:count] = count
+      opt[:format] = cfg['date_format']
+      opt[:template] = cfg['template']
+      opt[:order] = 'asc'
+      opt[:times] = times
+      opt[:config_template] = 'recent'
+
+      list_section(opt)
     end
 
     ##
@@ -1776,13 +1803,14 @@ module Doing
     ## Does not repeat tags in a title, and only converts the first instance of an
     ## untagged keyword
     ##
-    ## @param      text  [String] The text to tag
+    ## @param      string  [String] The text to tag
     ##
-    def autotag(text)
-      return unless text
-      return text unless @auto_tag
+    def autotag(string)
+      return unless string
+      return string unless @auto_tag
 
-      original = text.dup
+      original = string.dup
+      text = string.dup
 
       current_tags = text.scan(/@\w+/).map { |t| t.sub(/^@/, '') }
       tagged = {
@@ -2091,7 +2119,8 @@ EOS
     ## @return     [String] formatted output based on opt[:output]
     ##             template trigger
     ##
-    def output(items, title, is_single, opt = {})
+    def output(items, title, is_single, opt)
+      opt ||= {}
       out = nil
 
       raise InvalidArgument, 'Unknown output format' unless opt[:output] =~ Plugins.plugin_regex(type: :export)
@@ -2135,7 +2164,8 @@ EOS
     ##                          section
     ## @param      opt          [Hash] Additional Options
     ##
-    def do_archive(section, destination, opt = {})
+    def do_archive(section, destination, opt)
+      opt ||= {}
       count = opt[:count] || 0
       tags  = opt[:tags] || []
       bool  = opt[:bool] || :and

data/scripts/generate_bash_completions.rb

@@ -30,7 +30,7 @@ class BashCompletions
     need_export = []
 
     @commands.each_with_index do |cmd, i|
-      @bar.advance
+      @bar.advance(status: cmd[:commands].first)
 
       data = get_help_sections(cmd[:commands].first)
 
@@ -188,7 +188,7 @@ class BashCompletions
     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: '')
     @bar.resize(25)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.10
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -542,7 +542,6 @@ files:
 - lib/examples/plugins/wiki_export/templates/wiki.haml
 - 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