doing 2.1.89 → 2.1.91

data/lib/doing/completion/bash_completion.rb

@@ -11,35 +11,33 @@ module Doing
         out = []
         logic = []
 
-        @commands.each_with_index do |cmd, i|
+        @commands.each_with_index do |cmd, _i|
           @bar.advance(status: cmd[:commands].first)
 
           data = Completion.get_help_sections(cmd[:commands].first)
 
           arg = data[:synopsis].join(' ').strip.split(/ /).last
-          case arg
-          when /(path|file)/i
-            type = :file
-          when /sect/i
-            type = 'sections'
-          when /view/i
-            type = 'views'
+          type = case arg
+                 when /(path|file)/i
+                   :file
+                 when /sect/i
+                   'sections'
+                 when /view/i
+                   'views'
+                 end
+
+          next unless data[:command_options]
+
+          options = Completion.parse_options(data[:command_options])
+          out << command_function(cmd[:commands].first, options, type)
+
+          if first
+            op = 'if'
+            first = false
           else
-            type = nil
-          end
-
-          if data[:command_options]
-            options = Completion.parse_options(data[:command_options])
-            out << command_function(cmd[:commands].first, options, type)
-
-            if first
-              op = 'if'
-              first = false
-            else
-              op = 'elif'
-            end
-            logic << %(#{op} [[ $last =~ (#{cmd[:commands].join('|')}) ]]; then _doing_#{cmd[:commands].first})
+            op = 'elif'
           end
+          logic << %(#{op} [[ $last =~ (#{cmd[:commands].join('|')}) ]]; then _doing_#{cmd[:commands].first})
         end
 
         out << <<~EOFUNC
@@ -71,25 +69,23 @@ module Doing
           short_options << o[:short] if o[:short]
         end
 
-        long = long_options.map! {|o| "--#{o}"}.join(' ')
-        short = short_options.map! {|o| "-#{o}"}.join(' ')
+        long = long_options.map! { |o| "--#{o}" }.join(' ')
+        short = short_options.map! { |o| "-#{o}" }.join(' ')
         words = ''
         logic = ''
-        words, logic = get_words(type) if type && type.is_a?(String)
-
-        func = <<~ENDFUNC
-        _doing_#{command}() {
-          #{words}
-          if [[ "$token" == --* ]]; then
-            COMPREPLY=( $( compgen -W '#{long}' -- $token ) )
-          elif [[ "$token" == -* ]]; then
-            COMPREPLY=( $( compgen -W '#{short} #{long}' -- $token ) )
-          #{logic}
-          fi
-        }
+        words, logic = get_words(type) if type.is_a?(String)
+
+        <<~ENDFUNC
+          _doing_#{command}() {
+            #{words}
+            if [[ "$token" == --* ]]; then
+              COMPREPLY=( $( compgen -W '#{long}' -- $token ) )
+            elif [[ "$token" == -* ]]; then
+              COMPREPLY=( $( compgen -W '#{short} #{long}' -- $token ) )
+            #{logic}
+            fi
+          }
         ENDFUNC
-
-        func
       end
 
       def get_words(type)
@@ -126,7 +122,8 @@ 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: :square, 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/completion_string.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Doing
   module Completion
     module StringUtils
-
       ##
       ## Get short description for command completion
       ##

data/lib/doing/completion/fig_completion.rb

@@ -13,15 +13,15 @@ module Doing
       attr_accessor :commands, :global_options
 
       def generate_helpers
-        out=<<~EOFUNCTIONS
-        const completionSpec: Fig.Spec = {
-          name: "doing",
-          description: "A CLI for a What Was I Doing system",
-          subcommands: [
-            #{generate_subcommand_completions.join("\n    ")}
-          ],
-        };
-        export default completionSpec;
+        out = <<~EOFUNCTIONS
+          const completionSpec: Fig.Spec = {
+            name: "doing",
+            description: "A CLI for a What Was I Doing system",
+            subcommands: [
+              #{generate_subcommand_completions.join("\n    ")}
+            ],
+          };
+          export default completionSpec;
         EOFUNCTIONS
         @bar.advance(status: '✅')
         @bar.finish
@@ -62,34 +62,33 @@ module Doing
             arg = ''
 
             if option[:arg]
-              arg =<<~EOARG
-              args: {
-              #{indent}        name: "#{option[:arg]}",
-              #{indent}        description: "#{option[:arg]}",
-              #{indent}  },
+              arg = <<~EOARG
+                args: {
+                #{indent}        name: "#{option[:arg]}",
+                #{indent}        description: "#{option[:arg]}",
+                #{indent}  },
               EOARG
             end
 
-            if option[:short]
-              opt_data =<<~EOOPT
-              {
-              #{indent}  name: ["-#{option[:short]}", "--#{option[:long]}"],
-              #{indent}  description: "#{option[:description].sanitize}",
-              #{indent}  #{arg}
-              #{indent}},
-              EOOPT
-            else
-              opt_data = <<~EOOPT
-              {
-              #{indent}  name: ["--#{option[:long]}"],
-              #{indent}  description: "#{option[:description].sanitize}",
-              #{indent}  #{arg}
-              #{indent}},
-              EOOPT
-            end
+            opt_data = if option[:short]
+                         <<~EOOPT
+                           {
+                           #{indent}  name: ["-#{option[:short]}", "--#{option[:long]}"],
+                           #{indent}  description: "#{option[:description].sanitize}",
+                           #{indent}  #{arg}
+                           #{indent}},
+                         EOOPT
+                       else
+                         <<~EOOPT
+                           {
+                           #{indent}  name: ["--#{option[:long]}"],
+                           #{indent}  description: "#{option[:description].sanitize}",
+                           #{indent}  #{arg}
+                           #{indent}},
+                         EOOPT
+                       end
 
             option_arr << opt_data
-
           end
 
           cmd_opts = <<~EOCMD
@@ -107,7 +106,8 @@ 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 Fig completions: \033[0;35;40m[:bar] :status\033[0m", total: @commands.count + 1, bar_format: :square, hide_cursor: true, status: 'processing subcommands')
+        @bar = TTY::ProgressBar.new(" \033[0;0;33mGenerating Fig 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/fish_completion.rb

@@ -4,7 +4,6 @@ module Doing
   module Completion
     # Generate completions for Fish
     class FishCompletions
-
       attr_accessor :commands, :global_options
 
       def generate_helpers
@@ -152,7 +151,6 @@ module Doing
       end
 
       def generate_subcommand_option_completions
-
         out = []
         need_export = []
         need_bool = []
@@ -163,32 +161,32 @@ module Doing
         need_age = []
         need_section = []
 
-        @commands.each_with_index do |cmd, i|
+        @commands.each_with_index do |cmd, _i|
           @bar.advance(status: cmd[:commands].first)
           data = Completion.get_help_sections(cmd[:commands].first)
 
           if data[:synopsis].join(' ').strip.split(/ /).last =~ /(path|file)/i
-            out << "complete -c doing -F -n '__fish_doing_using_command #{cmd[:commands].join(" ")}'"
+            out << "complete -c doing -F -n '__fish_doing_using_command #{cmd[:commands].join(' ')}'"
           end
 
-          if data[:command_options]
-            Completion.parse_options(data[:command_options]).each do |option|
-              next if option.nil?
-
-              arg = option[:arg] ? '-r' : ''
-              short = option[:short] ? "-s #{option[:short]}" : ''
-              long = option[:long] ? "-l #{option[:long]}" : ''
-              out << "complete -c doing #{long} #{short} -f #{arg} -n '__fish_doing_using_command #{cmd[:commands].join(' ')}' -d #{Shellwords.escape(option[:description])}"
-
-              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_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'
-              need_section.concat(cmd[:commands]) if option[:long] == 'section'
-            end
+          next unless data[:command_options]
+
+          Completion.parse_options(data[:command_options]).each do |option|
+            next if option.nil?
+
+            arg = option[:arg] ? '-r' : ''
+            short = option[:short] ? "-s #{option[:short]}" : ''
+            long = option[:long] ? "-l #{option[:long]}" : ''
+            out << "complete -c doing #{long} #{short} -f #{arg} -n '__fish_doing_using_command #{cmd[:commands].join(' ')}' -d #{Shellwords.escape(option[:description])}"
+
+            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_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'
+            need_section.concat(cmd[:commands]) if option[:long] == 'section'
           end
         end
 
@@ -232,7 +230,8 @@ 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: :square, 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

@@ -13,7 +13,7 @@ module Doing
       attr_accessor :commands, :global_options
 
       def generate_helpers
-        out=<<~EOFUNCTIONS
+        out = <<~EOFUNCTIONS
           compdef _doing doing
 
           function _doing() {
@@ -49,7 +49,7 @@ module Doing
 
       def generate_subcommand_completions
         out = []
-        @commands.each_with_index do |cmd, i|
+        @commands.each_with_index do |cmd, _i|
           cmd[:commands].each do |c|
             out << "'#{c}:#{cmd[:description].gsub(/'/, '\\\'')}'"
           end
@@ -58,10 +58,9 @@ module Doing
       end
 
       def generate_subcommand_option_completions(indent: '        ')
-
         out = []
 
-        @commands.each_with_index do |cmd, i|
+        @commands.each_with_index do |cmd, _i|
           @bar.advance(status: cmd[:commands].first)
 
           data = Completion.get_help_sections(cmd[:commands].first)
@@ -93,7 +92,8 @@ 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: :square, 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/completion.rb

@@ -16,7 +16,7 @@ module Doing
     COMMAND_RX = /^(?<cmd>[^, \t]+)(?<alias>(?:, [^, \t]+)*)?\s+- (?<desc>.*?)$/.freeze
 
     class << self
-      def get_help_sections(command = "")
+      def get_help_sections(command = '')
         res = `doing help #{command}|command cat`.strip
         scanned = res.scan(SECTIONS_RX)
         sections = {}
@@ -97,8 +97,10 @@ module Doing
         FileUtils.mkdir_p(default_dir)
         src = File.expand_path(File.join(File.dirname(__FILE__), '..', 'completion', default_filenames[type]))
 
-        if File.exist?(File.join(default_dir, default_filenames[type]))
-          return unless Doing::Prompt.yn("Update #{type} completion script", default_response: 'n')
+        if File.exist?(File.join(default_dir,
+                                 default_filenames[type])) && !Doing::Prompt.yn("Update #{type} completion script",
+                                                                                default_response: 'n')
+          return
 
         end
 
@@ -203,7 +205,8 @@ module Doing
         case type.to_s
         when /^b/i
           unless dir =~ %r{(\.bash_it/completion|bash_completion/completions)}
-            link_completion(file, ['~/.bash_it/completion/enabled', '/usr/share/bash-completion/completions', '/usr/share/bash_completion/completions'], 'doing.bash')
+            link_completion(file,
+                            ['~/.bash_it/completion/enabled', '/usr/share/bash-completion/completions', '/usr/share/bash_completion/completions'], 'doing.bash')
           end
         when /^fig/i
         when /^f/i

data/lib/doing/configuration.rb

@@ -116,7 +116,7 @@ module Doing
       'interaction' => {
         'confirm_longer_than' => '5h'
       }
-    }
+    }.freeze
 
     def initialize(file = nil, options: {})
       @config_file = file.nil? ? default_config_file : File.expand_path(file)
@@ -237,11 +237,9 @@ module Doing
           if new_cfg.nil?
             return real_path if real_path[-1] == path && real_path.count == element_count
 
-            if distance < 5 && !create
-              return resolve_key_path(keypath, create: false, distance: distance + 1)
-            else
-              return nil unless create
-            end
+            return resolve_key_path(keypath, create: false, distance: distance + 1) if distance < 5 && !create
+
+            return nil unless create
 
             resolved = real_path.count.positive? ? "Resolved #{real_path.join('.')}, but " : ''
             Doing.logger.log_now(:warn, "#{resolved}#{path} is unknown")
@@ -251,13 +249,19 @@ module Doing
             raise InvalidArgument, 'Invalid key path' unless res
 
             real_path.push(path).concat(paths).compact!
-            Doing.logger.debug('Config:', "translated key path #{keypath} to #{real_path.join('.')}") unless keypath == real_path.join('.')
+            unless keypath == real_path.join('.')
+              Doing.logger.debug('Config:',
+                                 "translated key path #{keypath} to #{real_path.join('.')}")
+            end
             return real_path
           end
           cfg = new_cfg
         end
       end
-      Doing.logger.debug('Config:', "translated key path #{keypath} to #{real_path.join('.')}") unless keypath == real_path.join('.')
+      unless keypath == real_path.join('.')
+        Doing.logger.debug('Config:',
+                           "translated key path #{keypath} to #{real_path.join('.')}")
+      end
       real_path
     end
 
@@ -295,7 +299,8 @@ module Doing
     #
     def from(user_config)
       # Util.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
-      Configuration[user_config].stringify_keys.deep_merge(DEFAULTS, { extend_existing_arrays: true, sort_merged_arrays: true })
+      Configuration[user_config].stringify_keys.deep_merge(DEFAULTS,
+                                                           { extend_existing_arrays: true, sort_merged_arrays: true })
     end
 
     ##
@@ -346,7 +351,7 @@ module Doing
 
       load_plugins(plugin_config['plugin_path'])
 
-      Plugins.plugins.each do |_type, plugins|
+      Plugins.plugins.each_value do |plugins|
         plugins.each do |title, plugin|
           plugin_config[title] = plugin[:config] if plugin[:config].good?
           config['export_templates'][title] ||= nil if plugin[:templates] && !plugin[:templates].empty?
@@ -366,7 +371,10 @@ module Doing
 
       Hooks.trigger :post_config, self
 
-      config = local_config.deep_merge(config, { extend_existing_arrays: true, sort_merged_arrays: true }) unless @ignore_local
+      unless @ignore_local
+        config = local_config.deep_merge(config,
+                                         { extend_existing_arrays: true, sort_merged_arrays: true })
+      end
       # config = Util.deep_merge_hashes(config, local_config) unless @ignore_local
 
       Hooks.trigger :post_local_config, self
@@ -483,13 +491,13 @@ module Doing
       end
 
       begin
-
         user_config = Util.safe_load_file(config_file)
         raise StandardError, 'Invalid config file format' unless user_config.is_a?(Hash)
 
         if user_config.key?('html_template')
           user_config['export_templates'] ||= {}
-          user_config['export_templates'].deep_merge(user_config.delete('html_template'), { extend_existing_arrays: true, sort_merged_arrays: true })
+          user_config['export_templates'].deep_merge(user_config.delete('html_template'),
+                                                     { extend_existing_arrays: true, sort_merged_arrays: true })
         end
 
         user_config['include_notes'] = user_config.delete(':include_notes') if user_config.key?(':include_notes')

data/lib/doing/errors.rb

@@ -6,9 +6,7 @@ module Doing
       def initialize(msg = nil, level: nil, topic: 'Error:', exit_code: 1)
         level ||= :error
         Doing.logger.output_results
-        if msg
-          Doing.logger.log_now(level, topic, msg)
-        end
+        Doing.logger.log_now(level, topic, msg) if msg
 
         Process.exit exit_code
       end
@@ -52,7 +50,6 @@ module Doing
     class NoResults < DoingNoTraceError
       def initialize(msg = 'No results', topic = 'Exited:')
         super(msg, level: :warn, topic: topic, exit_code: 0)
-
       end
     end
 

data/lib/doing/good.rb

@@ -18,7 +18,7 @@ module Doing
     ##             has content
     ##
     def good?
-      !nil? && !self&.empty? || false
+      !nil? && !empty? || false
     end
   end
 

data/lib/doing/hash.rb

@@ -153,7 +153,7 @@ module Doing
     ## Remove keys with empty values
     ##
     def remove_empty
-      delete_if { |k, v| !v.is_a?(FalseClass) && !v.good? }
+      delete_if { |_k, v| !v.is_a?(FalseClass) && !v.good? }
     end
 
     def tag_filter_to_options
@@ -193,9 +193,9 @@ module Doing
     ## @param      to_delete  [Array] the keys to delete if key doesn't exist
     ##
     def delete_unless_key(key, to_delete)
-      unless key?(key)
-        to_delete.each { |k| delete(k) }
-      end
+      return if key?(key)
+
+      to_delete.each { |k| delete(k) }
     end
   end
 end

data/lib/doing/help_monkey_patch.rb

@@ -4,7 +4,7 @@ module GLI
   module Commands
     # Help Command Monkeypatch for paginated output
     class Help < Command
-      def show_help(global_options, options, arguments, out, error)
+      def show_help(_global_options, options, arguments, out, error)
         Doing::Pager.paginate = true
 
         command_finder = HelpModules::CommandFinder.new(@app, arguments, error)

data/lib/doing/hooks.rb

@@ -40,10 +40,14 @@ module Doing
     # register a single hook to be called later, internal API
     def self.register_one(event, priority, &block)
       unless @registry[event]
-        raise Doing::Errors::HookUnavailable.new("Invalid hook. Doing only supports #{@registry.keys.inspect}", 'hook', event)
+        raise Doing::Errors::HookUnavailable.new("Invalid hook. Doing only supports #{@registry.keys.inspect}", 'hook',
+                                                 event)
       end
 
-      raise Doing::Errors::PluginUncallable.new('Hooks must respond to :call', 'hook', event) unless block.respond_to? :call
+      unless block.respond_to? :call
+        raise Doing::Errors::PluginUncallable.new('Hooks must respond to :call', 'hook',
+                                                  event)
+      end
 
       Doing.logger.debug('Hook Manager:', "Registered #{event} hook") if ENV['DOING_PLUGIN_DEBUG']
 

data/lib/doing/item/dates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doing
   module ItemDates
     # def date=(new_date)
@@ -10,7 +12,7 @@ module Doing
 
       return nil if @title =~ /(?<=^| )@done\b/
 
-      return Time.now - @date
+      Time.now - @date
     end
 
     ##

data/lib/doing/item/item.rb

@@ -105,7 +105,7 @@ module Doing
         when :date
           output << format('%13s |', @date.relative_date).cyan
         when :section
-          output << "#{magenta}(#{white(@section)}#{magenta})"
+          output << "#{Color.magenta}(#{Color.white(@section)}#{Color.magenta})"
         when :title
           output << @title.white.highlight_tags('cyan')
         end

data/lib/doing/item/query.rb

@@ -78,8 +78,8 @@ module Doing
 
       if search.rx? || matching == :fuzzy
         rx = search.to_rx(distance: distance, case_type: case_type)
-        new_title = @title.gsub(rx) { |m| yellow(m) }
-        new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+        new_title = @title.gsub(rx) { |m| Color.yellow(m) }
+        new_note.add(@note.to_s.gsub(rx) { |m| Color.yellow(m) })
       else
         query = search.strip.to_phrase_query
 
@@ -89,8 +89,8 @@ module Doing
         end
         query[:must].concat(query[:should]).each do |s|
           rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
-          new_title = @title.gsub(rx) { |m| yellow(m) }
-          new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+          new_title = @title.gsub(rx) { |m| Color.yellow(m) }
+          new_note.add(@note.to_s.gsub(rx) { |m| Color.yellow(m) })
         end
       end
 
@@ -448,16 +448,16 @@ module Doing
     end
 
     def value_string_matches?(tag_val, comp, value)
-      case comp
-      when /\^=/
-        tag_val =~ /^#{value.wildcard_to_rx}/i
-      when /\$=/
-        tag_val =~ /#{value.wildcard_to_rx}$/i
-      when %r{==}
-        tag_val =~ /^#{value.wildcard_to_rx}$/i
-      else
-        tag_val =~ /#{value.wildcard_to_rx}/i
-      end
+      tag_val =~ case comp
+                 when /\^=/
+                   /^#{value.wildcard_to_rx}/i
+                 when /\$=/
+                   /#{value.wildcard_to_rx}$/i
+                 when /==/
+                   /^#{value.wildcard_to_rx}$/i
+                 else
+                   /#{value.wildcard_to_rx}/i
+                 end
     end
 
     def value_number_matches?(tag_val, comp, value)

data/lib/doing/item/state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doing
   # State queries for a Doing entry
   module ItemState