fusuma 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c6f872a195572cd05d5cbf86ff5a55e3b7419b9ddc3a2e1b1b09bd395adde36
-  data.tar.gz: 51c32b562df304b04a0b607b9e4404bfb7fb031fee73388a2902b56a6a94c4a5
+  metadata.gz: 9368eba481cbc496fb561cb449ec99c6b5f1eff8b4c8c4a9c8d61b4e7d5b4cf8
+  data.tar.gz: 3bea9acc54d3e2061f391ec282f9327ca2b3fd70463fa5f2394063a980b20613
 SHA512:
-  metadata.gz: 90da79d6210fc47324fda9d3b5e4f9ed1f4e820ccead8c2dc0341d2bb69e3bd691c34db39bdb83cd94529f9e69efe478d02c1cca43f4b953bddd4b0eb46f8888
-  data.tar.gz: adbd22a0b5a1d8213d96994e33a38c4cf2c6f667d33d16019cf1e4f90dee7d114301fee0c544e18e1e532fa7f10c5aa13c09963d5694072c63721bbc8f5ab065
+  metadata.gz: 2af60b07cfa18ca3b3d13eedf9b0271ff5bfdea37776e66a51e59eb33ea2e6bd35fe1fdc4724738ca3ecec37c7a6811c202c4277bf1e4ff341fda81e8fdb9f58
+  data.tar.gz: 4583ee8007e36e364658f02a42d5f447adb947408e690cb0f554c004672869f0304e2e674335aebc2d9a267abcb01cbe2f559845e604d4acc945620d7fada1a7

data/bin/console

@@ -23,5 +23,5 @@ def reload!(print = true)
   true
 end
 
-require 'pry'
-Pry.start
+require "irb"
+IRB.start(__FILE__)

data/lib/fusuma/plugin/manager.rb

@@ -15,37 +15,51 @@ module Fusuma
         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
         fusuma_external_plugin_paths.each { |siblings_plugin| require(siblings_plugin) }
       end
 
+      def exclude_path_pattern
+        %r{fusuma/plugin/[^/]*.rb}
+      end
+
+      def fusuma_default_plugin_paths
+        @_fusuma_default_plugin_paths ||= Dir.glob(File.expand_path("#{__dir__}/../../#{search_key}")).grep_v(exclude_path_pattern).sort
+      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 = Gem::Specification.load(fusuma_gemspec_path)
-          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.compact
+        @_fusuma_external_plugin_paths ||=
+          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 = Gem::Specification.load(fusuma_gemspec_path)
+
+            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}"
+              MultiLogger.warn "gemspec: #{gemspec_path}"
+              next
+            end
+          end.compact.grep_v(exclude_path_pattern).sort
+      end
+
+      def search_key
+        File.join(plugin_dir_name, "*rb")
       end
 
       private
 
+      # @example
+      #  plugin_dir_name
+      #   => "fusuma/plugin/detectors"
+      # @return [String]
       def plugin_dir_name
         @plugin_class.name.match(/(Fusuma::.*)::/)[1].to_s.underscore
       end
@@ -70,6 +84,13 @@ module Fusuma
           load_paths << plugin_path
 
           manager = Manager.new(plugin_class)
+
+          @already_required ||= {}
+
+          key = manager.search_key
+          return if @already_required[key]
+
+          @already_required[key] = true
           manager.require_siblings_from_plugin_dir
           manager.require_siblings_from_gems
         end

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Fusuma is multitouch gesture recognizer. This gem makes your touchpad
   on Linux able to recognize swipes or pinchs and assign command to them. Read installation