fusuma 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978dc626380b79b464091c15883ed5ab63abf0cc9d6e649ef46f87188e8dfc4c
-  data.tar.gz: 9ff7b618f47fda0fdb648c4a5422e689476d7e257160a45494f7e5d4396b0891
+  metadata.gz: 2069b9d7aebc84b8476061feceda9dbccdc1496d631bc321918c64df252fef40
+  data.tar.gz: 2efa46442f89aa15aa53f4e4b743f6cb4ef2449ca3f487a1a35940ad9ae38b9f
 SHA512:
-  metadata.gz: ddff427ccdaffc0fa0661685ea404d620ae85ad2cc2477dad2e7a2c066dd1c75ba2409bb2808c41977b22eff0812faa1343c6a32f186d5c8e945f20ec9023fa1
-  data.tar.gz: 06e687954d1b876c63f496017a39109a8e3d63a28919cec2096761a87c5528a72268eeae21ccbbd744dff946180005387dfe967776cd64b070894b245f5f556c
+  metadata.gz: 6b13060987b8cceadf030c6601a4f05886b2d0db6c44f900e33f0c5f689afcf48ab98809d12014394da24e9be5bde3b303f15527c792b540e6f352d1b39f4225
+  data.tar.gz: b3620182b6cc50c22582e36927b478c6a68b1e86b3cfe7eee7fc29060e87d2ce1f3e36579e112cbfb62b488927aae427ad75630210c4db53e3127619a487253b

data/lib/fusuma/config/index.rb

@@ -14,7 +14,7 @@ module Fusuma
             key = Key.new(key) if !key.is_a? Key
             @keys << key
             key.symbol
-          end.join(",")
+          end.join(",").to_sym
         else
           key = Key.new(keys)
           @cache_key = key.symbol
@@ -22,10 +22,16 @@ module Fusuma
         end
       end
 
-      def inspect
+      def to_s
         @keys.map(&:inspect)
       end
 
+      def ==(other)
+        return false unless other.is_a? Index
+
+        cache_key == other.cache_key
+      end
+
       attr_reader :keys, :cache_key
 
       # Keys in Index
@@ -40,7 +46,7 @@ module Fusuma
           @skippable = skippable
         end
 
-        def inspect
+        def to_s
           if @skippable
             "#{@symbol}(skippable)"
           else

data/lib/fusuma/config/searcher.rb

@@ -100,7 +100,7 @@ module Fusuma
           # no_context?(&block) ||
           #   complete_match_context(request_context, &block) ||
           #   partial_match_context(request_context, &block)
-          fallbacks.each do |method|
+          fallbacks.find do |method|
             result = send(method, request_context, &block)
             return result if result
           end

data/lib/fusuma/config.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "./multi_logger"
-require_relative "./config/index"
-require_relative "./config/searcher"
-require_relative "./config/yaml_duplication_checker"
-require_relative "./plugin/manager"
-require_relative "./hash_support"
+require_relative "multi_logger"
+require_relative "config/index"
+require_relative "config/searcher"
+require_relative "config/yaml_duplication_checker"
+require_relative "plugin/manager"
+require_relative "hash_support"
 require "singleton"
 require "yaml"
 
@@ -65,6 +65,7 @@ module Fusuma
 
       # reset searcher cache
       @searcher = Searcher.new
+      @cache_execute_keys = nil
 
       self
     rescue InvalidFileError => e
@@ -117,10 +118,17 @@ module Fusuma
         executor.new.execute_keys
       end.flatten
 
-      execute_params = search(index)
-      return if execute_params.nil? || !execute_params.is_a?(Hash)
+      @cache_execute_keys ||= {}
 
-      @execute_keys.find { |k| execute_params.key?(k) }
+      cache_key = [index.cache_key, Searcher.context].join
+
+      return @cache_execute_keys[cache_key] if @cache_execute_keys.has_key?(cache_key)
+
+      @cache_execute_keys[cache_key] =
+        @execute_keys.find do |execute_key|
+          new_index = Config::Index.new(index.keys | [execute_key])
+          search(new_index)
+        end
     end
 
     private

data/lib/fusuma/custom_process.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./string_support"
+require_relative "string_support"
 
 module Fusuma
   # Rename process

data/lib/fusuma/device.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "./multi_logger"
-require_relative "./libinput_command"
+require_relative "multi_logger"
+require_relative "libinput_command"
 
 module Fusuma
   # detect input device

data/lib/fusuma/environment.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "./version"
-require_relative "./libinput_command"
-require_relative "./multi_logger"
+require_relative "version"
+require_relative "libinput_command"
+require_relative "multi_logger"
 
 module Fusuma
   # Output Environment information

data/lib/fusuma/plugin/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./manager"
+require_relative "manager"
 require_relative "../config"
 require_relative "../custom_process"
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./detector"
+require_relative "detector"
 require_relative "../inputs/timer_input"
 
 module Fusuma

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../base"
-require_relative "./records/record"
-require_relative "./records/text_record"
+require_relative "records/record"
+require_relative "records/text_record"
 
 module Fusuma
   module Plugin

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./text_record"
+require_relative "text_record"
 
 module Fusuma
   module Plugin
@@ -29,6 +29,10 @@ module Fusuma
             @finger = finger.to_i
             @delta = delta
           end
+
+          def to_s
+            "#{@gesture}, #{@finger}, #{@status}, #{@delta}"
+          end
         end
       end
     end

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

@@ -22,6 +22,10 @@ module Fusuma
             @args = args
           end
 
+          def to_s
+            "#{@index}, #{@position}, #{@trigger}, #{@args}"
+          end
+
           def type
             :index
           end

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./filter"
+require_relative "filter"
 require_relative "../../device"
 
 module Fusuma

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

@@ -25,19 +25,22 @@ module Fusuma
 
           input = inputs.find { |i| i.io == io }
 
-          begin
-            # NOTE: io.readline is blocking method
-            # each input plugin must write line to pipe (include `\n`)
-            line = io.readline(chomp: true)
-          rescue EOFError => e
-            MultiLogger.error "#{input.class.name}: #{e}"
-            MultiLogger.error "Shutdown fusuma process..."
-            Process.kill("TERM", Process.pid)
-          rescue => e
-            MultiLogger.error "#{input.class.name}: #{e}"
-            exit 1
-          end
-          input.create_event(record: line)
+          input.create_event(record: input.read_from_io)
+        end
+
+        # @return [String, Record]
+        # IO#readline is blocking method
+        # so input plugin must write line to pipe (include `\n`)
+        # or, override read_from_io and implement your own read method
+        def read_from_io
+          io.readline(chomp: true)
+        rescue EOFError => e
+          MultiLogger.error "#{self.class.name}: #{e}"
+          MultiLogger.error "Shutdown fusuma process..."
+          Process.kill("TERM", Process.pid)
+        rescue => e
+          MultiLogger.error "#{self.class.name}: #{e}"
+          exit 1
         end
 
         # @return [Integer]

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 "input"
 
 module Fusuma
   module Plugin
@@ -57,7 +57,7 @@ module Fusuma
             enable_dwt,
             disable_dwt,
             show_keycodes,
-            verbose,
+            verbose
           ].compact
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./input"
+require_relative "input"
 require "timeout"
 
 module Fusuma

data/lib/fusuma/plugin/manager.rb

@@ -101,14 +101,14 @@ module Fusuma
         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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 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
@@ -19,6 +19,10 @@ module Fusuma
         ## 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)
       end
 
       private
@@ -191,11 +195,11 @@ module Fusuma
     def set_trap
       Signal.trap("INT") {
         shutdown
-        puts exit
+        exit
       } # Trap ^C
       Signal.trap("TERM") {
         shutdown
-        puts exit
+        exit
       } # Trap `Kill `
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2024-01-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
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput driver, Linux