fusuma 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352237ad297e7171f4e0ab18f96b1560e90ce1835b2591e01213496876388b42
-  data.tar.gz: 11b61f92f937ac7857800d10e6967367674e691cc883a12e81a343f084a8073b
+  metadata.gz: f8ebe6dea94f392eb2972323029d8f32ab58735020f0f5af4e70a52f3d80eb13
+  data.tar.gz: 12e77d944ef40cd9daf3c05d8f9b2de2538dd031ef0095395904f9fb4dacc238
 SHA512:
-  metadata.gz: 49d73eaa0635211cb018992b4c7d8cfd238a7f7d9811db33248578873ad21b04b0cbdaaecbc7469c34d18c9205e1de574be85f47e91cc7c986460f29adb18aa4
-  data.tar.gz: a0beefc19aefe6cf1ffeb879b3dc070af75e65b620a5b68a0765bb9cbb09f4df3f0d689e4b67b3963f90e7ece9398a0543014874f6555abb320c19698997d3d5
+  metadata.gz: ccc8856c22dfe28666edf5163913250058b3859925b1eae7e38187663dcdb99c27b24690620a0518192c7342da664683f4821d9b691e1929d1c3472d5e208699
+  data.tar.gz: c88048e832b387171cc3ef49f015564f8b1bfc19058eaa8e9bf54e4b79a90199c0652df7c4936b3a01eea363cb26718fbb6fc839700ef10d7c407835010a2642

data/README.md

@@ -11,10 +11,10 @@ This gem makes your linux able to recognize swipes or pinchs and assign commands
 ## Features
 
 - Easy installation with RubyGems
-- Defining Gestures and Actions in YAML
-- Sensitivity setting (threshold, interval) for gesture recognition
-- Automatic device addition for reconnecting external touchpads
-- Extension of gesture recognition by [plugin system](https://github.com/iberianpig/fusuma/#fusuma-plugins)
+- Define gestures and actions in YAML format
+- Sensitivity settings (threshold, interval) for gesture recognition
+- Automatic addition of external touchpads
+- Feature extension via a [plugin system](https://github.com/iberianpig/fusuma/#fusuma-plugins)
 
 ## Installation
 
@@ -35,9 +35,9 @@ newgrp input
 **IMPORTANT**: This makes `/dev/input/` readable, so if that's an issue for you for some reason (like for privacy- or securityconcerns etc. or if it causes other parts of your OS to misbehave), **consider this your heads-up.** 
 
 <details>
-<summary>For Debian Based Distros (Ubuntu, Debian, Mint, Pop!OS)</summary>
+<summary>For Debian Based Distros (Ubuntu, Debian, Mint, Pop!_OS)</summary>
 
-### For Debian Based Distros (Ubuntu, Debian, Mint, Pop!OS)
+### For Debian Based Distros (Ubuntu, Debian, Mint, Pop!_OS)
 
 #### 1. Install libinput-tools
 
@@ -258,8 +258,8 @@ The following wiki pages can be edited by everyone.
 - [elementary OS](https://github.com/iberianpig/fusuma/wiki/elementary-OS)
 - [i3](https://github.com/iberianpig/fusuma/wiki/i3)
 - [KDE to mimic MacOS](https://github.com/iberianpig/fusuma/wiki/KDE-to-mimic-MacOS)
-- [POP OS with Cinnamon](https://github.com/iberianpig/fusuma/wiki/POP-OS-with-Cinnamon)
-- [PopOS Default Gnome](https://github.com/iberianpig/fusuma/wiki/PopOS-Default-Gnome)
+- [Pop!_OS with Cinnamon](https://github.com/iberianpig/fusuma/wiki/POP-OS-with-Cinnamon)
+- [Pop!_OS Default Gnome](https://github.com/iberianpig/fusuma/wiki/PopOS-Default-Gnome)
 - [Ubuntu OS to mimic Mac a little](https://github.com/iberianpig/fusuma/wiki/Ubuntu-OS-to-mimic-Mac-a-little)
 - [3 fingers Drag (OS X Style)](https://github.com/iberianpig/fusuma/wiki/3-fingers-Drag-(OS-X-Style))
 - [3 fingers Alt Tab Switcher(Windows Style)](https://github.com/iberianpig/fusuma/wiki/3-fingers-Alt-Tab-Switcher(Windows-Style))
@@ -420,7 +420,7 @@ sudo gem list fusuma-plugin- | cut -d' ' -f1 | xargs --no-run-if-empty sudo gem
 
 ## Tutorial Video
 
-[![Multitouch Touchpad Gestures in Linux with Fusuma](http://img.youtube.com/vi/bn11Iwvf29I/0.jpg)](http://www.youtube.com/watch?v=bn11Iwvf29I "Multitouch Touchpad Gestures in Linux with Fusuma")
+[![Multitouch Touchpad Gestures in Linux with Fusuma](http://img.youtube.com/vi/bn11Iwvf29I/0.jpg)](http://www.youtube.com/watch?v=bn11Iwvf29I "Multitouch Touchpad Gestures in Linux with Fusuma")  
 [Multitouch Touchpad Gestures in Linux with Fusuma](http://www.youtube.com/watch?v=bn11Iwvf29I) by [Eric Adams](https://www.youtube.com/user/igster75)
 
 ## Support

data/lib/fusuma/config/yaml_duplication_checker.rb

@@ -6,14 +6,7 @@ module Fusuma
     # Find duplicated keys from YAML.
     module YAMLDuplicationChecker
       def self.check(yaml_string, filename, &on_duplicated)
-        # Ruby 2.6+
-        tree = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
-          # Specify filename to display helpful message when it raises
-          # an error.
-          YAML.parse(yaml_string, filename: filename)
-        else
-          YAML.parse(yaml_string, filename)
-        end
+        tree = YAML.parse(yaml_string, filename: filename)
         return unless tree
 
         traverse(tree, &on_duplicated)

data/lib/fusuma/config.rb

@@ -100,10 +100,12 @@ module Fusuma
 
       yamls = YAML.load_stream(File.read(path)).compact
       yamls.map do |yaml|
-        raise InvalidFileError, "invalid config.yml: #{path}" unless yaml.is_a? Hash
+        raise InvalidFileError, "Invalid config.yml: #{path}" unless yaml.is_a? Hash
 
         yaml.deep_symbolize_keys
       end
+    rescue Psych::SyntaxError => e
+      raise InvalidFileError, "Invalid syntax: #{path} #{e.message}"
     end
 
     # @param index [Index]

data/lib/fusuma/device.rb

@@ -66,7 +66,7 @@ module Fusuma
         line_parser = LineParser.new
 
         libinput_command = Plugin::Inputs::LibinputCommandInput.new.command
-        # note: this libinput command takes a nontrivial amout of time (~200ms)
+        # note: this libinput command takes a nontrivial amount of time (~200ms)
         libinput_command.list_devices do |line|
           line_parser.push(line)
         end

data/lib/fusuma/libinput_command.rb

@@ -22,7 +22,7 @@ module Fusuma
 
     # @return [String]
     def version
-      # versiom_command prints "1.6.3\n"
+      # version_command prints "1.6.3\n"
       @version ||= `#{version_command}`.strip
     end
 
@@ -39,11 +39,7 @@ module Fusuma
 
     # @return [Integer] return a latest line libinput debug-events
     def debug_events(writer)
-      @debug_events ||= begin
-        t = Open3.pipeline_start([debug_events_with_options], ["grep -v POINTER_ --line-buffered"],
-          out: writer, in: "/dev/null")
-        t[0].pid
-      end
+      Open3.pipeline_start([debug_events_with_options], ["grep -v POINTER_ --line-buffered"], out: writer, in: "/dev/null")
     end
 
     # @return [String] command

data/lib/fusuma/multi_logger.rb

@@ -13,6 +13,22 @@ module Fusuma
 
     class << self
       attr_writer :filepath
+
+      def info(msg)
+        instance.info(msg)
+      end
+
+      def debug(msg)
+        instance.debug(msg)
+      end
+
+      def warn(msg)
+        instance.warn(msg)
+      end
+
+      def error(msg)
+        instance.error(msg)
+      end
     end
 
     def initialize
@@ -49,8 +65,11 @@ module Fusuma
       debug_mode
     end
 
+    private
+
     def ignore_pattern?(msg)
       # TODO: configurable from config.yml
+      # pattern = /timer_input|remap_touchpad_input|thumbsense context|libinput_command_input/
       pattern = /timer_input/
       case msg
       when Hash
@@ -58,27 +77,11 @@ module Fusuma
         return unless e
 
         e.tag.match?(pattern)
+      when String
+        msg.match?(pattern)
       else
         false
       end
     end
-
-    class << self
-      def info(msg)
-        instance.info(msg)
-      end
-
-      def debug(msg)
-        instance.debug(msg)
-      end
-
-      def warn(msg)
-        instance.warn(msg)
-      end
-
-      def error(msg)
-        instance.error(msg)
-      end
-    end
   end
 end

data/lib/fusuma/plugin/buffers/gesture_buffer.rb

@@ -12,7 +12,7 @@ module Fusuma
         DEFAULT_SECONDS_TO_KEEP = 100
 
         def initialize(*args)
-          super(*args)
+          super
           @cache = {}
           @cache_select_by = {}
           @cache_sum10 = {}

data/lib/fusuma/plugin/detectors/detector.rb

@@ -9,7 +9,7 @@ module Fusuma
       # Inherite this base
       class Detector < Base
         def initialize(*args)
-          super(*args)
+          super
           @tag = self.class.tag
           @type = self.class.type
         end

data/lib/fusuma/plugin/detectors/hold_detector.rb

@@ -12,10 +12,10 @@ module Fusuma
         BUFFER_TYPE = "gesture"
         GESTURE_RECORD_TYPE = "hold"
 
-        BASE_THERESHOLD = 0.7
+        BASE_THRESHOLD = 0.7
 
         def initialize(*args)
-          super(*args)
+          super
           @timer = Inputs::TimerInput.instance
         end
 
@@ -134,7 +134,7 @@ module Fusuma
             keys_global = Config::Index.new ["threshold", type]
             config_value = Config.search(keys_specific) ||
               Config.search(keys_global) || 1
-            BASE_THERESHOLD * config_value
+            BASE_THRESHOLD * config_value
           end
         end
       end

data/lib/fusuma/plugin/detectors/pinch_detector.rb

@@ -11,7 +11,7 @@ module Fusuma
         GESTURE_RECORD_TYPE = "pinch"
 
         FINGERS = [2, 3, 4].freeze
-        BASE_THERESHOLD = 1.3
+        BASE_THRESHOLD = 1.3
 
         # @param buffers [Array<Buffer>]
         # @return [Events::Event] if event is detected
@@ -141,7 +141,7 @@ module Fusuma
             keys_global = Config::Index.new ["threshold", type]
             config_value = Config.search(keys_specific) ||
               Config.search(keys_global) || 1
-            BASE_THERESHOLD * config_value
+            BASE_THRESHOLD * config_value
           end
         end
 

data/lib/fusuma/plugin/detectors/rotate_detector.rb

@@ -11,7 +11,7 @@ module Fusuma
         GESTURE_RECORD_TYPE = "pinch"
 
         FINGERS = [2, 3, 4].freeze
-        BASE_THERESHOLD = 0.5
+        BASE_THRESHOLD = 0.5
 
         # @param buffers [Array<Buffer>]
         # @return [Events::Event] if event is detected
@@ -126,7 +126,7 @@ module Fusuma
             keys_global = Config::Index.new ["threshold", type]
             config_value = Config.search(keys_specific) ||
               Config.search(keys_global) || 1
-            BASE_THERESHOLD * config_value
+            BASE_THRESHOLD * config_value
           end
         end
 

data/lib/fusuma/plugin/detectors/swipe_detector.rb

@@ -11,7 +11,7 @@ module Fusuma
         GESTURE_RECORD_TYPE = "swipe"
 
         FINGERS = [3, 4].freeze
-        BASE_THERESHOLD = 25
+        BASE_THRESHOLD = 25
 
         # @param buffers [Array<Buffers::Buffer>]
         # @return [Events::Event] if event is detected
@@ -124,7 +124,7 @@ module Fusuma
             keys_global = Config::Index.new ["threshold", type]
             config_value = Config.search(keys_specific) ||
               Config.search(keys_global) || 1
-            BASE_THERESHOLD * config_value
+            BASE_THRESHOLD * config_value
           end
         end
 

data/lib/fusuma/plugin/events/event.rb

@@ -26,12 +26,12 @@ module Fusuma
             Records::TextRecord.new(record)
           else
             raise ArgumentError,
-              "@record should be String or Record"
+              "@record should be String or Record: #{record.class}, #{record}"
           end
         end
 
         def inspect
-          "time: #{time}, tag: #{tag}, record: #{record}"
+          "tag: #{tag}, record: #{record}"
         end
       end
     end

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

@@ -31,7 +31,7 @@ module Fusuma
           end
 
           def to_s
-            "#{@gesture}, #{@finger}, #{@status}, #{@delta}"
+            "#{@gesture}, Finger: #{@finger}, Status: #{@status}"
           end
         end
       end

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

@@ -36,7 +36,7 @@ module Fusuma
           # @return [NilClass] when merge is not succeeded
           def merge(records:, index: @index)
             # FIXME: cache
-            raise "position is NOT body: #{self}" unless mergable?
+            raise "position is NOT body: #{self}" unless mergeable?
 
             if records.empty?
               if Config.instance.find_execute_key(index)
@@ -76,7 +76,7 @@ module Fusuma
             end
           end
 
-          def mergable?
+          def mergeable?
             @position == :body
           end
         end

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

@@ -10,7 +10,7 @@ module Fusuma
       # @abstract Subclass and override {#io} to implement
       class Input < Base
         def initialize(*args)
-          super(*args)
+          super
           @tag = self.class.name.split("Inputs::").last.underscore
         end
 
@@ -43,11 +43,6 @@ module Fusuma
           exit 1
         end
 
-        # @return [Integer]
-        def pid
-          raise NotImplementedError, "override #{self.class.name}##{__method__}"
-        end
-
         # @return [IO]
         def io
           raise NotImplementedError, "override #{self.class.name}##{__method__}"

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

@@ -8,8 +8,6 @@ module Fusuma
     module Inputs
       # libinput commands wrapper
       class LibinputCommandInput < Input
-        attr_reader :pid
-
         def config_param_types
           {
             device: [String],
@@ -27,7 +25,7 @@ module Fusuma
         def io
           @io ||= begin
             reader, writer = create_io
-            @pid = command.debug_events(writer)
+            command.debug_events(writer)
             reader
           end
         end

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

@@ -23,12 +23,12 @@ module Fusuma
           @early_wake_queue = Queue.new
         end
 
-        attr_reader :pid, :interval
+        attr_reader :interval
 
         def io
           @io ||= begin
             reader, writer = create_io
-            @pid = start(reader, writer)
+            start(reader, writer)
 
             reader
           end
@@ -38,7 +38,6 @@ module Fusuma
           Thread.new do
             timer_loop(writer)
           end
-          nil
         end
 
         def timer_loop(writer)

data/lib/fusuma/version.rb

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

data/lib/fusuma.rb

@@ -15,14 +15,13 @@ module Fusuma
       def run(option = {})
         read_options(option)
         instance = new
+        instance.initialize_plugins
         instance.set_trap
         ## NOTE: Uncomment following line to measure performance
         # instance.run_with_lineprof
         instance.run
-      rescue => e
-        MultiLogger.error("Shutdown by error")
-        MultiLogger.error(e)
-        instance.send(:shutdown)
+      ensure
+        instance&.send(:shutdown)
       end
 
       private
@@ -59,7 +58,9 @@ module Fusuma
       end
     end
 
-    def initialize
+    def initialize; end
+
+    def initialize_plugins
       @inputs = Plugin::Inputs::Input.plugins.map do |cls|
         cls.ancestors.include?(Singleton) ? cls.instance : cls.new
       end
@@ -147,7 +148,7 @@ module Fusuma
     # @return [NilClass] when event is NOT given
     def merge(events)
       index_events, context_events = events.partition { |event| event.record.type == :index }
-      main_events, modifiers = index_events.partition { |event| event.record.mergable? }
+      main_events, modifiers = index_events.partition { |event| event.record.mergeable? }
       request_context = context_events.each_with_object({}) do |e, results|
         results[e.record.name] = e.record.value
       end
@@ -206,7 +207,7 @@ module Fusuma
     private
 
     def shutdown
-      [@inputs, @filters, @parsers, @buffers, @detectors, @executors].flatten.each do |plugin|
+      [@inputs, @filters, @parsers, @buffers, @detectors, @executors].flatten.compact.each do |plugin|
         plugin.shutdown
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-08-19 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