fusuma 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 217ba27576aeda18f673e4519d622d564b5a41c0
-  data.tar.gz: 985359605435d4a14a9a2fa5e69baf4ce08f874c
+SHA256:
+  metadata.gz: f639aca336e61fc9c2a68d32bb31c52964c30eefb9c32ab2caba61dc6f37a9e7
+  data.tar.gz: 8055c1d8250c7062f314371129d51adc54f27c4a5f7e18e07452462233047c18
 SHA512:
-  metadata.gz: 3ad557b7cd54f0647160280a9945d37c5aa1770b2002fe8bdef8ce9c1932da03584c8931795833e41b892fb1837fcb735b91e0b38bad6dcda911ee0fd8d2bb12
-  data.tar.gz: b7f9b22cc2e22ff13387cbc6301331ae2e00f6af5ed7da20830a452b7a1eac839f6d0297893a2e400559278ddcbceec4ed71d706579b9561079806659327f45c
+  metadata.gz: 40f9f9aae6f9b281c474fbb65e2bb48ef4b1082c9065adbaea06dc51559504f5b652fb8716517a43d827f8b3e02f63961661d592e75fcfdf0d478c1723b9667f
+  data.tar.gz: d3ca5a6136544f760e8277e2629838e6903f5028478fd43b647218ee19b1b4fd4a8bb744ce6e5a9b8b708614a7689cf2f6178db77180bab4105b0db55430c457

data/.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # [iberianpig] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [iberianpig] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: iberianpig # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

data/.rubocop.yml

@@ -13,3 +13,4 @@ Metrics/LineLength:
   Max: 100
   Exclude:
     - "fusuma.gemspec"
+    - "**/*_spec.rb"

data/lib/fusuma.rb

@@ -37,7 +37,8 @@ module Fusuma
         print_enabled_plugins
 
         print_device_list if option[:list]
-        Device.given_devices = option[:device]
+        # TODO: remove keep_device_from_option from command line options
+        Plugin::Filters::LibinputDeviceFilter::KeepDevice.from_option = option[:device]
         Process.daemon if option[:daemon]
       end
 

data/lib/fusuma/device.rb

@@ -28,8 +28,6 @@ module Fusuma
     end
 
     class << self
-      attr_reader :given_devices
-
       # @return [Array]
       def all
         @all ||= fetch_devices
@@ -53,19 +51,6 @@ module Fusuma
         @available = nil
       end
 
-      # Narrow down available device list
-      # @param names [String, Array]
-      def given_devices=(names)
-        # NOTE: convert to Array
-        device_names = Array(names)
-        return if device_names.empty?
-
-        @given_devices = narrow_available_devices(device_names: device_names)
-        return unless @given_devices.empty?
-
-        exit 1
-      end
-
       private
 
       # @return [Array]
@@ -77,17 +62,6 @@ module Fusuma
         line_parser.generate_devices
       end
 
-      def narrow_available_devices(device_names:)
-        device_names.select do |name|
-          if available.map(&:name).include? name
-            MultiLogger.info("Touchpad is found: #{name}")
-            true
-          else
-            MultiLogger.warn("Touchpad is not found: #{name}")
-          end
-        end
-      end
-
       # parse line and generate devices
       class LineParser
         attr_reader :lines

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

@@ -6,7 +6,7 @@ module Fusuma
   module Plugin
     # filter class
     module Filters
-      # Inherite this base
+      # Filter record to keep
       class Filter < Base
         # Filter input event
         # @param event [Event]
@@ -24,7 +24,8 @@ module Fusuma
 
         # @abstract override `#keep?` to implement
         # @param record [String]
-        # @return [True, False]
+        # @return [True]  when keeping record
+        # @return [False] when discarding record
         def keep?(record)
           true if record
         end

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

@@ -17,23 +17,59 @@ module Fusuma
           }
         end
 
+        # @return [TrueClass] when keeping it
+        # @return [FalseClass] when discarding it
         def keep?(record)
-          keep_device_ids.any? { |device_id| record.to_s =~ /^\s?#{device_id}/ }
-        end
+          # NOTE: purge cache when found new device
+          if record.to_s =~ /\sDEVICE_ADDED\s/ && keep_device.match_pattern?(record.to_s)
+            keep_device.reset
+            return false
+          end
 
-        private
+          keep_device.all.map(&:id).any? { |device_id| record.to_s =~ /^\s?#{device_id}\s/ }
+        end
 
-        # @return [Array]
-        def keep_device_ids
-          @keep_device_ids ||= Device.all.select do |device|
-            keep_device_names.any? { |name| device.name.match(name) }
-          end.map(&:id)
+        def keep_device
+          @keep_device ||= begin
+                             from_config = Array(config_params(:keep_device_names))
+                             KeepDevice.new(name_patterns: from_config)
+                           end
         end
 
-        # @return [Array]
-        def keep_device_names
-          Array(config_params(:keep_device_names)).tap do |names|
-            break Device.all.map(&:name) if names.empty?
+        # Select Device to keep
+        class KeepDevice
+          def initialize(name_patterns:)
+            @name_patterns = name_patterns | Array(self.class.from_option)
+          end
+
+          # remove cache for reloading new devices
+          def reset
+            @all = nil
+            Device.reset
+          end
+
+          # @return [Array]
+          def all
+            @all ||= if @name_patterns.empty?
+                       Device.available
+                     else
+                       Device.all.select do |device|
+                         match_pattern?(device.name)
+                       end
+                     end
+          end
+
+          # @return [TrueClass]
+          # @return [FalseClass]
+          def match_pattern?(string)
+            return true if @name_patterns.empty?
+
+            @name_patterns.any? { |name_pattern| string.match(name_pattern) }
+          end
+
+          class << self
+            # TODO: remove from_option and command line options
+            attr_accessor :from_option
           end
         end
       end

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

@@ -49,7 +49,7 @@ module Fusuma
         # @yield [line] gives a line in libinput debug-events output to the block
         def debug_events
           prefix = 'stdbuf -oL --'
-          options = [*libinput_options, device_option]
+          options = [*libinput_options]
           cmd = "#{prefix} #{debug_events_command} #{options.join(' ')}".strip
           MultiLogger.debug(debug_events: cmd)
           Open3.popen3(cmd) do |_i, o, _e, _w|
@@ -90,14 +90,6 @@ module Fusuma
 
         private
 
-        # use device option only if libinput detect only 1 device
-        # @return [String]
-        def device_option
-          return unless Device.available.size == 1
-
-          "--device=/dev/input/#{Device.available.first.id}"
-        end
-
         # TODO: add specs
         def libinput_options
           enable_tap = '--enable-tap' if config_params(:'enable-tap')

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = '1.2'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux