fusuma 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2069b9d7aebc84b8476061feceda9dbccdc1496d631bc321918c64df252fef40
-  data.tar.gz: 2efa46442f89aa15aa53f4e4b743f6cb4ef2449ca3f487a1a35940ad9ae38b9f
+  metadata.gz: 82378c097f2a0af57970c6ac59afbee3ef8e0ce2d0b2957ebc968673490c1623
+  data.tar.gz: 7324182088a879f6ccc057a311945258bf49f3f255cda67c161b5e6d847871d5
 SHA512:
-  metadata.gz: 6b13060987b8cceadf030c6601a4f05886b2d0db6c44f900e33f0c5f689afcf48ab98809d12014394da24e9be5bde3b303f15527c792b540e6f352d1b39f4225
-  data.tar.gz: b3620182b6cc50c22582e36927b478c6a68b1e86b3cfe7eee7fc29060e87d2ce1f3e36579e112cbfb62b488927aae427ad75630210c4db53e3127619a487253b
+  metadata.gz: deb0bc67936c61576f2ef0fa69ac0db89233ae2765633fe0da946368c91f0d2930520cea15a451119b79f451c8e103efb74b84a2fda2bbb9982625a29f560e65
+  data.tar.gz: ea89aef6ec99904287cd958c03beaf46f031b71757293bf77b8920d2b2cb5ead60f2cf525800644537d7a8e3f68aee47323f31f81a579f8a8bb8ebcc57eaccd9

data/lib/fusuma/config/searcher.rb

@@ -81,18 +81,20 @@ module Fusuma
         # Search with context from load_streamed Config
         # @param context [Hash]
         # @return [Object]
-        def with_context(context, &block)
-          @context = context || {}
+        def with_context(context = {}, &block)
+          before = @context
+          @context = context
           result = block.call
-          @context = {}
+        ensure # NOTE: ensure is called even if return in block
+          @context = before
           result
         end
 
-        CONEXT_SEARCH_ORDER = [:no_context, :complete_match_context, :partial_match_context]
+        CONTEXT_SEARCH_ORDER = [:no_context, :complete_match_context, :partial_match_context]
         # Return a matching context from config
         # @params request_context [Hash]
         # @return [Hash]
-        def find_context(request_context, fallbacks = CONEXT_SEARCH_ORDER, &block)
+        def find_context(request_context, fallbacks = CONTEXT_SEARCH_ORDER, &block)
           # Search in blocks in the following order.
           # 1. primary context(no context)
           # 2. complete match config[:context] == request_context

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/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/buffer.rb

@@ -31,6 +31,11 @@ module Fusuma
         def clear_expired(current_time: Time.now)
         end
 
+        # @return [TrueClass, FalseClass]
+        def empty?
+          @events.empty?
+        end
+
         # clear buffer
         def clear
           @events.clear

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

@@ -127,10 +127,6 @@ module Fusuma
           @events.last.record.gesture
         end
 
-        def empty?
-          @events.empty?
-        end
-
         def select_by_events(&block)
           return enum_for(:select_by_events) unless block
 

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

@@ -34,10 +34,6 @@ module Fusuma
             @events.delete(e)
           end
         end
-
-        def empty?
-          @events.empty?
-        end
       end
     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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = "3.4.0"
+  VERSION = "3.6.0"
 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
@@ -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.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-07-02 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