manager.rb in fusuma-2.5.0

- old
+ new

@@ -1,43 +1,49 @@
 # frozen_string_literal: true
 
-require_relative '../multi_logger'
-require_relative '../string_support'
+require_relative "../multi_logger"
+require_relative "../string_support"
 
 module Fusuma
   module Plugin
     # Manage Fusuma plugins
     class Manager
       def initialize(plugin_class)
         @plugin_class = plugin_class
       end
 
       def require_siblings_from_plugin_dir
-        search_key = File.join('../../', plugin_dir_name, '*.rb')
-        Dir.glob(File.expand_path("#{__dir__}/#{search_key}")).sort.each do |siblings_plugin|
-          require siblings_plugin
-        end
+        fusuma_default_plugin_paths.each { |siblings_plugin| require(siblings_plugin) }
       end
 
+      def fusuma_default_plugin_paths
+        search_key = File.join("../../", plugin_dir_name, "*.rb")
+        Dir.glob(File.expand_path("#{__dir__}/#{search_key}")).sort
+      end
+
       def require_siblings_from_gems
-        search_key = File.join(plugin_dir_name, '*.rb')
-        Gem.find_latest_files(search_key).each do |siblings_plugin|
-          next unless siblings_plugin =~ %r{fusuma-plugin-(.+).*/lib/#{plugin_dir_name}/\1_.+.rb}
+        fusuma_external_plugin_paths.each { |siblings_plugin| require(siblings_plugin) }
+      end
 
+      def fusuma_external_plugin_paths
+        search_key = File.join(plugin_dir_name, "*.rb")
+        Gem.find_latest_files(search_key).map do |siblings_plugin|
+          next unless %r{fusuma-plugin-(.+).*/lib/#{plugin_dir_name}/.+\.rb}.match?(siblings_plugin)
+
           match_data = siblings_plugin.match(%r{(.*)/(.*)/lib/(.*)})
           gemspec_path = Dir.glob("#{match_data[1]}/#{match_data[2]}/*.gemspec").first
           raise "Not Found: #{match_data[1]}/#{match_data[2]}/*.gemspec" unless gemspec_path
 
           gemspec = Gem::Specification.load(gemspec_path)
-          fusuma_gemspec_path = File.expand_path('../../../fusuma.gemspec', __dir__)
+          fusuma_gemspec_path = File.expand_path("../../../fusuma.gemspec", __dir__)
           fusuma_gemspec = Gem::Specification.load(fusuma_gemspec_path)
-          if gemspec.dependencies.find { |d| d.name == 'fusuma' }&.match?(fusuma_gemspec)
-            require siblings_plugin
+          if gemspec.dependencies.find { |d| d.name == "fusuma" }&.match?(fusuma_gemspec)
+            siblings_plugin
           else
             MultiLogger.warn "#{gemspec.name} #{gemspec.version} is incompatible with running #{fusuma_gemspec.name} #{fusuma_gemspec.version}"
           end
-        end
+        end.compact
       end
 
       private
 
       def plugin_dir_name
@@ -67,17 +73,17 @@
           manager.require_siblings_from_plugin_dir
           manager.require_siblings_from_gems
         end
 
         def require_base_plugins
-          require_relative './base'
-          require_relative './events/event'
-          require_relative './inputs/input'
-          require_relative './filters/filter'
-          require_relative './parsers/parser'
-          require_relative './buffers/buffer'
-          require_relative './detectors/detector'
-          require_relative './executors/executor'
+          require_relative "./base"
+          require_relative "./events/event"
+          require_relative "./inputs/input"
+          require_relative "./filters/filter"
+          require_relative "./parsers/parser"
+          require_relative "./buffers/buffer"
+          require_relative "./detectors/detector"
+          require_relative "./executors/executor"
         end
 
         def plugins
           @plugins ||= {}
         end