fusuma 2.4.1 → 2.5.1

data/lib/fusuma/plugin/events/records/text_record.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './record'
+require_relative "./record"
 
 module Fusuma
   module Plugin

data/lib/fusuma/plugin/executors/command_executor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './executor'
+require_relative "./executor"
 
 module Fusuma
   module Plugin
@@ -20,8 +20,8 @@ module Fusuma
 
           accel = args_accel(event)
           additional_env = event.record.args
-                                .deep_transform_keys(&:to_s)
-                                .deep_transform_values { |v| (v * accel).to_s }
+            .deep_transform_keys(&:to_s)
+            .deep_transform_values { |v| (v * accel).to_s }
 
           pid = Process.spawn(additional_env, command.to_s)
           Process.detach(pid)
@@ -30,7 +30,7 @@ module Fusuma
         end
 
         def executable?(event)
-          event.tag.end_with?('_detector') &&
+          event.tag.end_with?("_detector") &&
             event.record.type == :index &&
             search_command(event)
         end

data/lib/fusuma/plugin/executors/executor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../base'
+require_relative "../base"
 
 module Fusuma
   module Plugin
@@ -47,8 +47,8 @@ module Fusuma
           index = event.record.index
           @interval_time[index.cache_key] ||= begin
             config_value =
-              Config.search(Config::Index.new([*index.keys, 'interval'])) ||
-              Config.search(Config::Index.new(['interval', Detectors::Detector.type(event.tag)]))
+              Config.search(Config::Index.new([*index.keys, "interval"])) ||
+              Config.search(Config::Index.new(["interval", Detectors::Detector.type(event.tag)]))
             if event.record.trigger == :oneshot
               (config_value || 1) * BASE_ONESHOT_INTERVAL
             else

data/lib/fusuma/plugin/filters/filter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../base'
+require_relative "../base"
 
 module Fusuma
   module Plugin
@@ -12,7 +12,7 @@ module Fusuma
         # @return [Event] when keeping event
         # @return [NilClass] when discarding record
         def filter(event)
-          return event if event.tag !~ /#{source}/
+          return event if !/#{source}/.match?(event.tag)
 
           return event if keep?(event.record)
 
@@ -30,7 +30,7 @@ module Fusuma
         # Set source for tag from config.yml.
         # DEFAULT_SOURCE is defined in each Filter plugins.
         def source
-          @source ||= config_params(:source) || self.class.const_get('DEFAULT_SOURCE')
+          @source ||= config_params(:source) || self.class.const_get(:DEFAULT_SOURCE)
         end
       end
     end

data/lib/fusuma/plugin/filters/libinput_device_filter.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative './filter'
-require_relative '../../device'
+require_relative "./filter"
+require_relative "../../device"
 
 module Fusuma
   module Plugin
     module Filters
       # Filter device log
       class LibinputDeviceFilter < Filter
-        DEFAULT_SOURCE = 'libinput_command_input'
+        DEFAULT_SOURCE = "libinput_command_input"
 
         def config_param_types
           {
@@ -64,18 +64,18 @@ module Fusuma
           # @return [Array]
           def all
             @all ||= if @name_patterns.empty?
-                       Device.available
-                     else
-                       Device.all.select do |device|
-                         match_pattern?(device.name)
-                       end
-                     end.tap do |devices|
-                       print_not_found_messages if devices.empty?
-                     end
+              Device.available
+            else
+              Device.all.select do |device|
+                match_pattern?(device.name)
+              end
+            end.tap do |devices|
+              print_not_found_messages if devices.empty?
+            end
           end
 
           def print_not_found_messages
-            puts 'Device is not found. Check following section on your config.yml'
+            puts "Device is not found. Check following section on your config.yml"
             puts LibinputDeviceFilter.new.config_param_sample
           end
 

data/lib/fusuma/plugin/inputs/input.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../base'
-require_relative '../events/event'
+require_relative "../base"
+require_relative "../events/event"
 
 module Fusuma
   module Plugin
@@ -23,13 +23,13 @@ module Fusuma
             line = io.readline_nonblock("\n").chomp
           rescue EOFError => e
             warn "#{input.class.name}: #{e}"
-            warn 'Send SIGKILL to fusuma processes'
+            warn "Send SIGKILL to fusuma processes"
             inputs.reject { |i| i == input }.each do |i|
               warn "stop process: #{i.class.name.underscore}"
               Process.kill(:SIGKILL, i.pid)
             end
             exit 1
-          rescue StandardError => e
+          rescue => e
             warn "#{input.class.name}: #{e}"
             exit 1
           end
@@ -48,14 +48,14 @@ module Fusuma
         end
 
         # @return [Event]
-        def create_event(record: 'dummy input')
+        def create_event(record: "dummy input")
           e = Events::Event.new(tag: tag, record: record)
           MultiLogger.debug(input_event: e)
           e
         end
 
         def tag
-          self.class.name.split('Inputs::').last.underscore
+          self.class.name.split("Inputs::").last.underscore
         end
       end
     end
@@ -65,8 +65,8 @@ end
 # ref: https://github.com/Homebrew/brew/blob/6b2dbbc96f7d8aa12f9b8c9c60107c9cc58befc4/Library/Homebrew/extend/io.rb
 class IO
   def readline_nonblock(sep = $INPUT_RECORD_SEPARATOR)
-    line = +''
-    buffer = +''
+    line = +""
+    buffer = +""
 
     loop do
       break if buffer == sep

data/lib/fusuma/plugin/inputs/libinput_command_input.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../libinput_command'
-require_relative './input'
+require_relative "../../libinput_command"
+require_relative "./input"
 
 module Fusuma
   module Plugin
@@ -13,12 +13,12 @@ module Fusuma
         def config_param_types
           {
             device: [String],
-            'enable-dwt': [TrueClass, FalseClass],
-            'enable-tap': [TrueClass, FalseClass],
-            'show-keycodes': [TrueClass, FalseClass],
+            "enable-dwt": [TrueClass, FalseClass],
+            "enable-tap": [TrueClass, FalseClass],
+            "show-keycodes": [TrueClass, FalseClass],
             verbose: [TrueClass, FalseClass],
-            'libinput-debug-events': [String],
-            'libinput-list-devices': [String]
+            "libinput-debug-events": [String],
+            "libinput-list-devices": [String]
           }
         end
 
@@ -45,10 +45,10 @@ module Fusuma
         # @return [Array]
         def libinput_options
           device = ("--device='#{config_params(:device)}'" if config_params(:device))
-          enable_tap = '--enable-tap' if config_params(:'enable-tap')
-          enable_dwt = '--enable-dwt' if config_params(:'enable-dwt')
-          show_keycodes = '--show-keycodes' if config_params(:'show-keycodes')
-          verbose = '--verbose' if config_params(:verbose)
+          enable_tap = "--enable-tap" if config_params(:"enable-tap")
+          enable_dwt = "--enable-dwt" if config_params(:"enable-dwt")
+          show_keycodes = "--show-keycodes" if config_params(:"show-keycodes")
+          verbose = "--verbose" if config_params(:verbose)
           [
             device,
             enable_dwt,
@@ -59,11 +59,11 @@ module Fusuma
         end
 
         def debug_events_command
-          config_params(:'libinput-debug-events')
+          config_params(:"libinput-debug-events")
         end
 
         def list_devices_command
-          config_params(:'libinput-list-devices')
+          config_params(:"libinput-list-devices")
         end
 
         private

data/lib/fusuma/plugin/inputs/timer_input.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './input'
+require_relative "./input"
 
 module Fusuma
   module Plugin
@@ -39,11 +39,11 @@ module Fusuma
           begin
             loop do
               sleep interval
-              writer.puts 'timer'
+              writer.puts "timer"
             end
           rescue Errno::EPIPE
             exit 0
-          rescue StandardError => e
+          rescue => e
             MultiLogger.error e
           end
         end

data/lib/fusuma/plugin/manager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../multi_logger'
-require_relative '../string_support'
+require_relative "../multi_logger"
+require_relative "../string_support"
 
 module Fusuma
   module Plugin
@@ -12,34 +12,54 @@ module Fusuma
       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 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}
-
-          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)
-            require siblings_plugin
-          else
-            MultiLogger.warn "#{gemspec.name} #{gemspec.version} is incompatible with running #{fusuma_gemspec.name} #{fusuma_gemspec.version}"
-          end
-        end
+        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
+        @_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
@@ -64,19 +84,26 @@ 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
 
         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

data/lib/fusuma/plugin/parsers/libinput_gesture_parser.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../events/records/record'
-require_relative '../events/records/gesture_record'
+require_relative "../events/records/record"
+require_relative "../events/records/gesture_record"
 
 module Fusuma
   module Plugin
     module Parsers
       # parse libinput and generate gesture record
       class LibinputGestureParser < Parser
-        DEFAULT_SOURCE = 'libinput_command_input'
+        DEFAULT_SOURCE = "libinput_command_input"
 
         # @param record [String]
         # @return [Records::GestureRecord, nil]
@@ -21,9 +21,9 @@ module Fusuma
           end
 
           Events::Records::GestureRecord.new(status: status,
-                                             gesture: gesture,
-                                             finger: finger,
-                                             delta: delta)
+            gesture: gesture,
+            finger: finger,
+            delta: delta)
         end
 
         private
@@ -34,7 +34,7 @@ module Fusuma
 
           gesture, status = *detect_gesture(event_name)
 
-          status = 'cancelled' if gesture == 'hold' && status == 'end' && other == 'cancelled'
+          status = "cancelled" if gesture == "hold" && status == "end" && other == "cancelled"
           delta = parse_delta(other)
           [gesture, status, finger, delta]
         end
@@ -50,10 +50,10 @@ module Fusuma
           return if line.nil?
 
           move_x, move_y, unaccelerated_x, unaccelerated_y, _, zoom, _, rotate =
-            line.tr('/|(|)', ' ').split
+            line.tr("/|(|)", " ").split
           Events::Records::GestureRecord::Delta.new(move_x.to_f, move_y.to_f,
-                                                    unaccelerated_x.to_f, unaccelerated_y.to_f,
-                                                    zoom.to_f, rotate.to_f)
+            unaccelerated_x.to_f, unaccelerated_y.to_f,
+            zoom.to_f, rotate.to_f)
         end
       end
     end

data/lib/fusuma/plugin/parsers/parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../base'
+require_relative "../base"
 
 module Fusuma
   module Plugin
@@ -26,11 +26,11 @@ module Fusuma
         # Set source for tag from config.yml.
         # DEFAULT_SOURCE is defined in each Parser plugins.
         def source
-          @source ||= config_params(:source) || self.class.const_get('DEFAULT_SOURCE')
+          @source ||= config_params(:source) || self.class.const_get(:DEFAULT_SOURCE)
         end
 
         def tag
-          @tag ||= self.class.name.split('::').last.underscore
+          @tag ||= self.class.name.split("::").last.underscore
         end
 
         # parse Record object

data/lib/fusuma/string_support.rb

@@ -3,14 +3,14 @@
 # support camerize and underscore
 class String
   def camelize
-    split('_').map(&:capitalize).join
+    split("_").map(&:capitalize).join
   end
 
   def underscore
     gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .gsub('::', '/')
-      .tr('-', '_')
+      .gsub("::", "/")
+      .tr("-", "_")
       .downcase
   end
 end

data/lib/fusuma/version.rb

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

data/lib/fusuma.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative './fusuma/version'
-require_relative './fusuma/multi_logger'
-require_relative './fusuma/config'
-require_relative './fusuma/environment'
-require_relative './fusuma/device'
-require_relative './fusuma/plugin/manager'
+require_relative "./fusuma/version"
+require_relative "./fusuma/multi_logger"
+require_relative "./fusuma/config"
+require_relative "./fusuma/environment"
+require_relative "./fusuma/device"
+require_relative "./fusuma/plugin/manager"
 
 # this is top level module
 module Fusuma
@@ -24,8 +24,8 @@ module Fusuma
       private
 
       def set_trap
-        Signal.trap('INT') { puts exit } # Trap ^C
-        Signal.trap('TERM') { puts exit } # Trap `Kill `
+        Signal.trap("INT") { puts exit } # Trap ^C
+        Signal.trap("TERM") { puts exit } # Trap `Kill `
       end
 
       def read_options(option)
@@ -81,8 +81,8 @@ module Fusuma
 
     # For performance monitoring
     def run_with_lineprof(count: 1000)
-      require 'rblineprof'
-      require 'rblineprof-report'
+      require "rblineprof"
+      require "rblineprof-report"
 
       profile = lineprof(%r{#{Pathname.new(__FILE__).parent}/.}) do
         count.times { pipeline }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-17 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
@@ -65,44 +65,6 @@ files:
 - lib/fusuma/plugin/parsers/parser.rb
 - lib/fusuma/string_support.rb
 - lib/fusuma/version.rb
-- spec/helpers/config_helper.rb
-- spec/lib/config/searcher_spec.rb
-- spec/lib/config_spec.rb
-- spec/lib/custom_process_spec.rb
-- spec/lib/device_spec.rb
-- spec/lib/dummy_config.yml
-- spec/lib/fusuma_spec.rb
-- spec/lib/libinput-list-devices_iberianpig-XPS-9360.txt
-- spec/lib/libinput-list-devices_magic_trackpad.txt
-- spec/lib/libinput-list-devices_razer_razer_blade.txt
-- spec/lib/libinput-list-devices_thejinx0r.txt
-- spec/lib/libinput-list-devices_unavailable.txt
-- spec/lib/libinput_command_spec.rb
-- spec/lib/plugin/base_spec.rb
-- spec/lib/plugin/buffers/buffer_spec.rb
-- spec/lib/plugin/buffers/dummy_buffer.rb
-- spec/lib/plugin/buffers/gesture_buffer_spec.rb
-- spec/lib/plugin/detectors/detector_spec.rb
-- spec/lib/plugin/detectors/dummy_detector.rb
-- spec/lib/plugin/detectors/hold_detector_spec.rb
-- spec/lib/plugin/detectors/pinch_detector_spec.rb
-- spec/lib/plugin/detectors/rotate_detector_spec.rb
-- spec/lib/plugin/detectors/swipe_detector_spec.rb
-- spec/lib/plugin/events/event_spec.rb
-- spec/lib/plugin/events/records/gesture_record_spec.rb
-- spec/lib/plugin/events/records/record_spec.rb
-- spec/lib/plugin/events/records/text_record_spec.rb
-- spec/lib/plugin/executors/command_executor_spec.rb
-- spec/lib/plugin/executors/executor_spec.rb
-- spec/lib/plugin/filters/filter_spec.rb
-- spec/lib/plugin/filters/libinput_filter_spec.rb
-- spec/lib/plugin/inputs/input_spec.rb
-- spec/lib/plugin/inputs/libinput_command_input_spec.rb
-- spec/lib/plugin/inputs/timer_input_spec.rb
-- spec/lib/plugin/manager_spec.rb
-- spec/lib/plugin/parsers/libinput_gesture_parser_spec.rb
-- spec/lib/plugin/parsers/parser_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/iberianpig/fusuma
 licenses:
 - MIT
@@ -128,42 +90,4 @@ rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput driver, Linux
-test_files:
-- spec/spec_helper.rb
-- spec/lib/libinput_command_spec.rb
-- spec/lib/dummy_config.yml
-- spec/lib/libinput-list-devices_razer_razer_blade.txt
-- spec/lib/fusuma_spec.rb
-- spec/lib/libinput-list-devices_thejinx0r.txt
-- spec/lib/config/searcher_spec.rb
-- spec/lib/libinput-list-devices_unavailable.txt
-- spec/lib/config_spec.rb
-- spec/lib/libinput-list-devices_iberianpig-XPS-9360.txt
-- spec/lib/plugin/executors/command_executor_spec.rb
-- spec/lib/plugin/executors/executor_spec.rb
-- spec/lib/plugin/detectors/detector_spec.rb
-- spec/lib/plugin/detectors/rotate_detector_spec.rb
-- spec/lib/plugin/detectors/dummy_detector.rb
-- spec/lib/plugin/detectors/pinch_detector_spec.rb
-- spec/lib/plugin/detectors/swipe_detector_spec.rb
-- spec/lib/plugin/detectors/hold_detector_spec.rb
-- spec/lib/plugin/inputs/input_spec.rb
-- spec/lib/plugin/inputs/timer_input_spec.rb
-- spec/lib/plugin/inputs/libinput_command_input_spec.rb
-- spec/lib/plugin/filters/filter_spec.rb
-- spec/lib/plugin/filters/libinput_filter_spec.rb
-- spec/lib/plugin/base_spec.rb
-- spec/lib/plugin/events/event_spec.rb
-- spec/lib/plugin/events/records/text_record_spec.rb
-- spec/lib/plugin/events/records/record_spec.rb
-- spec/lib/plugin/events/records/gesture_record_spec.rb
-- spec/lib/plugin/buffers/gesture_buffer_spec.rb
-- spec/lib/plugin/buffers/dummy_buffer.rb
-- spec/lib/plugin/buffers/buffer_spec.rb
-- spec/lib/plugin/manager_spec.rb
-- spec/lib/plugin/parsers/parser_spec.rb
-- spec/lib/plugin/parsers/libinput_gesture_parser_spec.rb
-- spec/lib/libinput-list-devices_magic_trackpad.txt
-- spec/lib/custom_process_spec.rb
-- spec/lib/device_spec.rb
-- spec/helpers/config_helper.rb
+test_files: []

data/spec/helpers/config_helper.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'tempfile'
-require './lib/fusuma/config'
-
-module Fusuma
-  module ConfigHelper
-    module_function
-
-    def load_config_yml=(string)
-      Config.custom_path = Tempfile.open do |temp_file|
-        temp_file.tap { |f| f.write(string) }
-      end
-    end
-
-    def clear_config_yml
-      Config.custom_path = nil
-    end
-  end
-end