fusuma 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a12dfc770118352a414806a6c37e376eebdf49db24aa347eb904146b855ecf
-  data.tar.gz: ef9fb2e5bbbdc4a53eafae83334455890ad99b3c91c43ad0e4ed678f38bb1673
+  metadata.gz: 629441e7756cdd5df55e497ff6c4758fcbcd1f351132f55caea11a80a06492e8
+  data.tar.gz: 6510ed44d991c1ec08938ad33b316ce6693fee571f00743df9dc66a1948c3562
 SHA512:
-  metadata.gz: ecb619087432fc99c51265b91ed1fc21da77e34e13d446a92c29127d15e3e7c35124b2a67df7a184891d76f0ad004151eb1e5d92df170334f5a668eebdb93941
-  data.tar.gz: b8da3242044d824d0f39170cf16a3e173214742e01cfe965257a146dfe5a1993d19232d50d5b26dd264956ace6d488ee09b5d7e873de7f45e442ad75646bc41c
+  metadata.gz: 88fe3cc4229f5a6bcd772affcd2292c440ede0a581448f81605b24de1ad90c15a6ad6b3d097da00ea35b6b9131ccd108cfab4c063c07c1aa140e3c83a125fcf2
+  data.tar.gz: 0e4fb3ac2fe62fd064a0ad17d46ba21952e78b75cf13c118961854316998cc70f00c8d83a0c386517efb0136f90349024c5ffd5870cc53cfdbc3688a5e0082f7

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
@@ -112,7 +112,7 @@ module Fusuma
         # @return [Hash]
         # @return [NilClass]
         def no_context(_request_context, &block)
-          return {} if with_context({}, &block)
+          {} if with_context({}, &block)
         end
 
         # Complete match request context
@@ -165,7 +165,10 @@ module Fusuma
 
             return config[:context] if with_context(config[:context], &block)
           end
-          complete_match_context
+          if complete_match_context
+            with_context(complete_match_context, &block)
+            complete_match_context
+          end
         end
       end
     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

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/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.2.0"
+  VERSION = "3.3.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
@@ -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.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-11-04 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