fusuma 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8572f753f134496b8ffc0f36c3aafbf142357aad913edd9fd5f5d494d32259
-  data.tar.gz: 6adf4afa35ca59305efa6bde88b2ccf808c3025b5a577cc917d0b32d6b794058
+  metadata.gz: c964784d9707a4ca667c19b4c866bd5e0abc8e61e2f0752903c2cac3fd064448
+  data.tar.gz: fc9c42d27ee80535d6da10f3cdd0ee707a128ad42f147366dd40f4c2053a273a
 SHA512:
-  metadata.gz: 68dbe15577eb01891537a573c96ab0a2c532e919588c4fdb62899b236382630d8f575f913c9de282bf9a66b5ae8f91cc820067eedc7ecaa42e839f25d090afd8
-  data.tar.gz: cd74e943167bff03bf2eb1d3eaa9d170f28fd921c3736bcc1a981e49f0c7b755de10ecd8b9b6f314bce76377568441e04cd5228222cfe3c3afd32448569a754c
+  metadata.gz: 99e47419a912ae9e77215fef51bae8bc6a657ac679dbb9a55873087753f354bc9b077657f2fa7699372931ac7a0d0f3faef7d732da4197e1fcef2623b02b8b9c
+  data.tar.gz: 7d8ac348be34c4756e549ac0856fa01119680d5d9ebc7346ca3dc29070023b3a6c8d6a4f2218a3fde6951936d51d8ea0335723dcf2a76285f5ab7a477746ca4e

data/README.md

@@ -1,9 +1,9 @@
-# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://travis-ci.com/iberianpig/fusuma.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma) [![Coverage Status](https://coveralls.io/repos/github/iberianpig/fusuma/badge.svg?branch=master)](https://coveralls.io/github/iberianpig/fusuma?branch=master) [![Inline docs](http://inch-ci.org/github/iberianpig/fusuma.svg?branch=master)](http://inch-ci.org/github/iberianpig/fusuma)
+# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://travis-ci.com/iberianpig/fusuma.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma) [![Coverage Status](https://coveralls.io/repos/github/iberianpig/fusuma/badge.svg?branch=master)](https://coveralls.io/github/iberianpig/fusuma?branch=master)
 
 Fusuma is multitouch gesture recognizer.
 This gem makes your linux able to recognize swipes or pinchs and assign commands to them.
 
-![fusuma_image](https://i.gyazo.com/757fef526310b9d68f68e80eb1e4540f.png)
+![fusuma_image](https://repository-images.githubusercontent.com/69813387/60879a00-166c-11ea-9875-3bf0818c62ec)
 
 襖(Fusuma) means sliding door used to partition off rooms in a Japanese house.
 
@@ -83,7 +83,7 @@ $ sudo pacman -S ruby
 
 #### 3. Install Fusuma
 
-**Note:** By default in Arch Linux, when running ```gem```, gems are installed per-user (into ```~/.gem/ruby/```), instead of system-wide (into ```/usr/lib/ruby/gems/```). This is considered the best way to manage gems on Arch, because otherwise they might interfere with gems installed by Pacman. (From Arch Wiki)
+**Note:** By default in Arch Linux, when running `gem`, gems are installed per-user (into `~/.gem/ruby/`), instead of system-wide (into `/usr/lib/ruby/gems/`). This is considered the best way to manage gems on Arch, because otherwise they might interfere with gems installed by Pacman. (From Arch Wiki)
 
 To install gems system-wide, see any of the methods listed on [Arch Wiki](https://wiki.archlinux.org/index.php/ruby#Installing_gems_system-wide)
 
@@ -121,7 +121,7 @@ $ sudo gem update fusuma
 
 ## Customize Gesture Mapping
 
-You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.  
+You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.
 **NOTE: You will need to create the `~/.config/fusuma` directory if it doesn't exist yet.**
 
 ```bash
@@ -135,12 +135,15 @@ $ nano ~/.config/fusuma/config.yml # edit config file.
 * `swipe:`
   * support `3:`, `4:` fingers
   * support `left:`, `right:`, `up:`, `down:` directions
+  * support `begin:`, `update:`, `end:` events
 * `pinch:`
   * support `2:`, `3:`, `4:` fingers
   * support `in:`, `out:` directions
+  * support `begin:`, `update:`, `end:` events
 * `rotate:`
   * support `2:`, `3:`, `4:` fingers
   * support `clockwise:`,`counterclockwise:` directions
+  * support `begin:`, `update:`, `end:` events
 
 ### About YAML Basic Syntax
 
@@ -157,7 +160,7 @@ https://github.com/iberianpig/fusuma/wiki/Ubuntu
 swipe:
   3:
     left:
-      command: "xdotool key alt+Right" # History forward 
+      command: "xdotool key alt+Right" # History forward
     right:
       command: "xdotool key alt+Left" # History back
     up:
@@ -191,6 +194,8 @@ The following wiki pages can be edited by everyone.
 - [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)
 - [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))
 
 If you have a nice configuration, please share `~/.config/fusuma/config.yml` with everyone.
 
@@ -208,19 +213,19 @@ If the swipe's interval is `0.5`, shorten swipe-interval by half to recognize a
 
 ```yaml
 swipe:
-  3: 
-    left: 
+  3:
+    left:
       command: 'xdotool key alt+Right' # threshold: 0.5, interval: 0.75
       threshold: 0.5
-    right: 
+    right:
       command: 'xdotool key alt+Left' # threshold: 0.5, interval: 0.75
       threshold: 0.5
-    up: 
+    up:
       command: 'xdotool key super' # threshold: 1, interval: 0.75
-    down: 
+    down:
       command: 'xdotool key super' # threshold: 1, interval: 0.75
 pinch:
-  2: 
+  2:
     in:
       command: "xdotool keydown ctrl click 4 keyup ctrl" # threshold: 0.5, interval: 0.5
     out:
@@ -234,7 +239,7 @@ interval:
   pinch: 0.5
 ```
 
-There are three priorities of `threshold:` and `interval:`.  
+There are three priorities of `threshold:` and `interval:`.
 The individual `threshold:` and `interval:` settings (under "direction") have a higher priority than the global one (under "root")
 
 1. child elements in the direction (left/right/down/up → threshold/interval)
@@ -280,7 +285,7 @@ swipe:
 - `xte`
   - [xte(1) - Linux man page](https://linux.die.net/man/1/xte)
   - install with `sudo apt xautomation`
-  
+
 - [ydotool](https://github.com/ReimuNotMoe/ydotool)
   - Wayland compatible
   - Needs more maintainers.
@@ -292,8 +297,8 @@ swipe:
 - `-d`, `--daemon` : Daemonize process
 - `-l`, `--list-devices` : List available devices
 - `-v`, `--verbose` : Show details about the results of running fusuma
-- `--device="Device name"` : Open the given device only (DEPRECATED)
 - `--version` : Show fusuma version
+- `--log-file=path/to/file` : Set path of log file
 
 ### Specify touchpads by device name
 Set the following options to recognize multi-touch gestures only for the specified touchpad device.
@@ -322,7 +327,7 @@ Following features are provided as plugins.
 - Features for specific Linux distributions
 - Setting different gestures per applications
 
-### Installation of fusuma plugins
+### Installation of Fusuma plugins
 
 Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and hosted on [RubyGems](https://rubygems.org/search?utf8=%E2%9C%93&query=fusuma-plugins).
 
@@ -330,16 +335,17 @@ Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and
 
 ### Available plugins
 
-| Name                                                                           | About                                         |
-| ------------------------------------------------------------------------------ | --------------------------------------------- |
-| [fusuma-plugin-sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey)   | Emulates keyboard events                      |
-| [fusuma-plugin-wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl)     | Manages Window and Workspace                  |
-| [fusuma-plugin-keypress](https://github.com/iberianpig/fusuma-plugin-keypress) | Detects gestures while pressing multiple keys |
-| [fusuma-plugin-tap](https://github.com/iberianpig/fusuma-plugin-tap)           | Detects Tap and Hold gestures                 |
+| Name                                                                               | Version                                                               | About                                         |
+| ---------------------------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------------------------------- |
+| [fusuma-plugin-sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey)       | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-sendkey.svg)    | Emulates keyboard events                      |
+| [fusuma-plugin-wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl)         | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-wmctrl.svg)     | Manages Window and Workspace                  |
+| [fusuma-plugin-keypress](https://github.com/iberianpig/fusuma-plugin-keypress)     | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-keypress.svg)   | Detects gestures while pressing multiple keys |
+| [fusuma-plugin-tap](https://github.com/iberianpig/fusuma-plugin-tap)               | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-tap.svg)        | Detects Tap and Hold gestures                 |
+| [fusuma-plugin-appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher) | ![Gem Version](https://badge.fury.io/rb/fusuma-plugin-appmatcher.svg) | Configure app-specific gestures               |
 
 ## 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
@@ -348,7 +354,7 @@ I'm a Freelance Engineer in Japan and working on these products after finishing
 Currently, my open-source contribution times is not enough.
 If you like my work and want to contribute and become a sponsor, I will be able to focus on my projects.
 
-- [GitHub Sponsors](https://github.com/sponsors/iberianpig) (Zero fee!)
+- [GitHub Sponsors](https://github.com/sponsors/iberianpig)
 - [Patreon](https://www.patreon.com/iberianpig)
 
 ## Contributing

data/exe/fusuma

@@ -22,6 +22,11 @@ opt.on('-l', '--list-devices',
   option[:list] = v
 end
 
+opt.on('--log=path/to/file',
+       'Print logs to file') do |v|
+  option[:log_filepath] = v
+end
+
 opt.on('--device="Device name"',
        'Open the given device only (DEPRECATED)') do |v|
   option[:device] = v

data/fusuma.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/iberianpig/fusuma'
   spec.license       = 'MIT'
 
-  spec.files          = Dir.glob('{bin,lib,exe}/**/*') + %w[LICENSE README.md fusuma.gemspec]
-  spec.test_files     = Dir.glob("{test,spec,features}/**/*")
+  spec.files          = Dir['{bin,lib,exe}/**/*', 'LICENSE*', 'README*', '*.gemspec']
+  spec.test_files     = Dir['{test,spec,features}/**/*']
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5.1' # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
   # support bionic (18.04LTS) 2.5.1
-  spec.add_dependency 'posix-spawn'
 end

data/lib/fusuma/config/searcher.rb

@@ -67,8 +67,7 @@ module Fusuma
 
       # next locations' candidates sorted by priority
       #  1. look up location with key
-      #  2. fallback to other key
-      #  3. skip the key and go to child location
+      #  2. skip the key and go to child location
       def next_location_cadidates(location, key)
         [
           location[key.symbol],

data/lib/fusuma/config.rb

@@ -84,7 +84,7 @@ module Fusuma
       end.flatten
 
       execute_params = search(index)
-      return if execute_params.nil?
+      return if execute_params.nil? || !execute_params.is_a?(Hash)
 
       @execute_keys.find { |k| execute_params.keys.include?(k) }
     end

data/lib/fusuma/environment.rb

@@ -20,7 +20,7 @@ module Fusuma
         libinput_command = Plugin::Inputs::LibinputCommandInput.new.command
         MultiLogger.info "Fusuma: #{VERSION}"
         MultiLogger.info "libinput: #{libinput_command.version}"
-        MultiLogger.info "ruby #{ RUBY_VERSION }p#{ RUBY_PATCHLEVEL }"
+        MultiLogger.info "ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
         MultiLogger.info "OS: #{`uname -rsv`}".strip
         MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
         MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION $XDG_SESSION_TYPE`}".strip

data/lib/fusuma/libinput_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'posix/spawn'
+require 'open3'
 
 module Fusuma
   # Execute libinput command
@@ -33,20 +33,20 @@ module Fusuma
     def list_devices(&block)
       cmd = list_devices_command
       MultiLogger.debug(list_devices: cmd)
-      p, i, o, e = POSIX::Spawn.popen4(cmd)
+      i, o, e, _w = Open3.popen3(cmd)
+      MultiLogger.error(e.read) if o.eof?
       i.close
+      e.close
       o.each(&block)
-    ensure
-      [i, o, e].each { |io| io.close unless io.closed? }
-      Process.waitpid(p)
     end
 
-    # @return [Integer, IO] return a latest line libinput debug-events
-    def debug_events
-      @debug_events = begin
-        p, i, o, _e = POSIX::Spawn.popen4(debug_events_with_options)
-        i.close
-        [p, o]
+    # @return [Integer] return a latest line libinput debug-events
+    def debug_events(writer)
+      @debug_events ||= begin
+        pid = Process.spawn(debug_events_with_options, out: writer,
+                                                       in: '/dev/null')
+        Process.detach(pid)
+        pid
       end
     end
 

data/lib/fusuma/multi_logger.rb

@@ -11,9 +11,21 @@ module Fusuma
     attr_reader :err_logger
     attr_accessor :debug_mode
 
+    @@filepath = nil
+    def self.filepath=(filepath)
+      @@filepath = filepath
+    end
+
     def initialize
-      super($stdout)
-      @err_logger = Logger.new($stderr)
+      if @@filepath
+        logfile = File.new(@@filepath, 'a')
+        super(logfile)
+        $stderr = logfile
+        @err_logger = Logger.new($stderr)
+      else
+        super($stdout)
+        @err_logger = Logger.new($stderr)
+      end
       @debug_mode = false
     end
 

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

@@ -8,7 +8,7 @@ module Fusuma
       # manage events and generate command
       class TimerBuffer < Buffer
         DEFAULT_SOURCE = 'timer_input'
-        DEFAULT_SECONDS_TO_KEEP = 60
+        DEFAULT_SECONDS_TO_KEEP = 3
 
         def config_param_types
           {
@@ -31,8 +31,6 @@ module Fusuma
           @events.each do |e|
             break if current_time - e.time < @seconds_to_keep
 
-            MultiLogger.debug("#{self.class.name}##{__method__}")
-
             @events.delete(e)
           end
         end

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

@@ -62,8 +62,15 @@ module Fusuma
           if status == 'update'
             return unless moved?(prev_event, event)
 
-            avg_zoom = gesture_buffer.avg_attrs(:zoom)
-            first_zoom = updating_events.first.record.delta.zoom
+            first_zoom, avg_zoom = if updating_events.size >= 10
+                                     [updating_events[-10].record.delta.zoom,
+                                      gesture_buffer.class.new(
+                                        updating_events[-10..-1]
+                                      ).avg_attrs(:zoom)]
+                                   else
+                                     [updating_events.first.record.delta.zoom,
+                                      gesture_buffer.avg_attrs(:zoom)]
+                                   end
 
             oneshot_quantity = Quantity.new(target: avg_zoom, base: first_zoom).to_f
             oneshot_direction = Direction.new(target: avg_zoom, base: first_zoom).to_s

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

@@ -24,8 +24,14 @@ module Fusuma
           updating_events = gesture_buffer.updating_events
           return if updating_events.empty?
 
-          updating_time = 100 * (updating_events.last.time - updating_events.first.time)
-          oneshot_angle = gesture_buffer.sum_attrs(:rotate) / updating_time
+          oneshot_angle = if updating_events.size >= 10
+                            updating_time = 100 * (updating_events[-1].time - updating_events[-10].time)
+                            last_10 = gesture_buffer.class.new(updating_events[-10..-1])
+                            last_10.sum_attrs(:rotate) / updating_time
+                          else
+                            updating_time = 100 * (updating_events.last.time - updating_events.first.time)
+                            gesture_buffer.sum_attrs(:rotate) / updating_time
+                          end
 
           return if updating_events.empty?
 

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

@@ -24,9 +24,17 @@ module Fusuma
           updating_events = gesture_buffer.updating_events
           return if updating_events.empty?
 
-          updating_time = 100 * (updating_events.last.time - updating_events.first.time)
-          oneshot_move_x = gesture_buffer.sum_attrs(:move_x) / updating_time
-          oneshot_move_y = gesture_buffer.sum_attrs(:move_y) / updating_time
+          oneshot_move_x, oneshot_move_y = if updating_events.size >= 10
+                                             updating_time = 100 * (updating_events[-1].time - updating_events[-10].time)
+                                             last_10 = gesture_buffer.class.new(updating_events[-10..-1])
+                                             [last_10.sum_attrs(:move_x) / updating_time,
+                                              last_10.sum_attrs(:move_y) / updating_time]
+                                           else
+                                             updating_time = 100 * (updating_events.last.time - updating_events.first.time)
+                                             [gesture_buffer.sum_attrs(:move_x) / updating_time,
+                                              gesture_buffer.sum_attrs(:move_y) / updating_time]
+                                           end
+          gesture_buffer.sum_attrs(:move_x) / updating_time
 
           finger = gesture_buffer.finger
           status = case gesture_buffer.events.last.record.status

data/lib/fusuma/plugin/executors/command_executor.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'posix/spawn'
 require_relative './executor'
 
 module Fusuma
@@ -15,18 +14,19 @@ module Fusuma
         end
 
         def execute(event)
-          search_command(event).tap do |command|
-            break unless command
+          command = search_command(event)
 
-            MultiLogger.info(command: command, args: event.record.args)
+          MultiLogger.info(command: command, args: event.record.args)
 
-            additional_env = event.record.args
-                                  .deep_transform_keys(&:to_s)
-                                  .deep_transform_values { |v| (v * args_accel(event)).to_s }
+          accel = args_accel(event)
+          additional_env = event.record.args
+                                .deep_transform_keys(&:to_s)
+                                .deep_transform_values { |v| (v * accel).to_s }
 
-            pid = POSIX::Spawn.spawn(additional_env, command.to_s)
-            Process.detach(pid)
-          end
+          pid = Process.spawn(additional_env, command.to_s)
+          Process.detach(pid)
+        rescue SystemCallError => e
+          MultiLogger.error("#{event.record.index.keys}": e.message.to_s)
         end
 
         def executable?(event)

data/lib/fusuma/plugin/executors/executor.rb

@@ -15,7 +15,7 @@ module Fusuma
         # @return [Array<Symbol>]
         def execute_keys
           # [name.split('Executors::').last.underscore.gsub('_executor', '').to_sym]
-          raise NotImplementedError, "override #{name}##{__method__}"
+          raise NotImplementedError, "override #{self.class.name}##{__method__}"
         end
 
         # check executable

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

@@ -25,8 +25,9 @@ module Fusuma
         # @return [IO]
         def io
           @io ||= begin
-            @pid, io = command.debug_events
-            io
+            reader, writer = create_io
+            @pid = command.debug_events(writer)
+            reader
           end
         end
 
@@ -64,6 +65,12 @@ module Fusuma
         def list_devices_command
           config_params(:'libinput-list-devices')
         end
+
+        private
+
+        def create_io
+          IO.pipe
+        end
       end
     end
   end

data/lib/fusuma/version.rb

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

data/lib/fusuma.rb

@@ -29,6 +29,7 @@ module Fusuma
       end
 
       def read_options(option)
+        MultiLogger.filepath = option[:log_filepath]
         MultiLogger.instance.debug_mode = option[:verbose]
 
         load_custom_config(option[:config_path])
@@ -142,19 +143,26 @@ module Fusuma
       end
       main_events.sort_by! { |e| e.record.trigger_priority }
 
-      condition = nil
+      matched_condition = nil
       matched_context = nil
       event = main_events.find do |main_event|
         matched_context = Config::Searcher.find_context(request_context) do
-          condition, index_record = Config::Searcher.find_condition do
+          matched_condition, modified_record = Config::Searcher.find_condition do
             main_event.record.merge(records: modifiers.map(&:record))
           end
-          main_event if index_record
+          if matched_condition && modified_record
+            main_event.record = modified_record
+          else
+            matched_condition, = Config::Searcher.find_condition do
+              Config.search(main_event.record.index) &&
+                Config.find_execute_key(main_event.record.index)
+            end
+          end
         end
       end
       return if event.nil?
 
-      [condition, matched_context, event]
+      [matched_condition, matched_context, event]
     end
 
     # @param event [Plugin::Events::Event]

data/spec/lib/config/searcher_spec.rb

@@ -7,80 +7,162 @@ require './lib/fusuma/config/searcher'
 # spec for Config
 module Fusuma
   RSpec.describe Config::Searcher do
-    let(:keymap) do
-      {
-        'swipe' => {
-          3 => {
-            'left' => { 'command' => 'alt+Left' },
-            'right' => { 'command' => 'alt+Right' }
-          },
-          4 => {
-            'left' => { 'command' => 'super+Left' },
-            'right' => { 'command' => 'super+Right' }
-          }
-        },
-        'pinch' => {
-          'in' => { 'command' => 'ctrl+plus' },
-          'out' => { 'command' => 'ctrl+minus' }
-        }
-      }
-    end
+    around do |example|
+      ConfigHelper.load_config_yml = <<~CONFIG
+        swipe:
+          3:
+            left:
+              command: 'alt+Left'
+            right:
+              command: 'alt+Right'
+          4:
+            left:
+              command: 'super+Left'
+            right:
+              command: 'super+Right'
+        pinch:
+          in:
+            command: 'ctrl+plus'
+          out:
+            command: 'ctrl+minus'
+      CONFIG
 
-    let(:keymap_without_finger) do
-      {
-        'swipe' => {
-          'left' => { 'command' => 'alt+Left' }
-        }
-      }
-    end
+      example.run
 
-    describe '.custom_path=' do
-      before { Singleton.__init__(Config) }
-      it 'should reload keymap file' do
-        keymap = Config.instance.keymap
-        Config.custom_path = './spec/lib/dummy_config.yml'
-        custom_keymap = Config.instance.keymap
-        expect(keymap).not_to eq custom_keymap
-      end
+      ConfigHelper.clear_config_yml
     end
 
     describe '.search' do
       let(:index) { nil }
-      subject { Config::Searcher.new.search(index, location: keymap.deep_symbolize_keys) }
+      let(:location) { Config.instance.keymap[0] }
+      let(:search) { Config::Searcher.new.search(index, location: location) }
       context 'index correct order' do
         let(:index) { Config::Index.new %w[pinch in command] }
-        it { is_expected.to eq 'ctrl+plus' }
+        it { expect(Config::Searcher.new.search(index, location: location)).to eq 'ctrl+plus' }
       end
 
-      context 'index include skippable key' do
-        let(:index) do
-          Config::Index.new [
-            Config::Index::Key.new('pinch'),
-            Config::Index::Key.new(2, skippable: true),
-            Config::Index::Key.new('out'),
-            Config::Index::Key.new('command')
-          ]
-        end
-        it { expect(Config::Searcher.skip { subject }).to eq 'ctrl+minus' }
+      context 'index incorrect order' do
+        let(:index) { Config::Index.new %w[in pinch 2 command] }
+        it { expect(Config::Searcher.new.search(index, location: location)).not_to eq 'ctrl+plus' }
       end
 
-      context 'index include skippable key at first' do
-        let(:index) do
-          Config::Index.new [
-            Config::Index::Key.new(:hoge, skippable: true),
-            Config::Index::Key.new(:fuga, skippable: true),
-            Config::Index::Key.new('pinch'),
-            Config::Index::Key.new('in'),
-            Config::Index::Key.new(:piyo, skippable: true),
-            Config::Index::Key.new('command')
-          ]
+      context 'with Skip condtions' do
+        context 'when index includes skippable key' do
+          let(:index) do
+            Config::Index.new [
+              Config::Index::Key.new('pinch'),
+              Config::Index::Key.new(2, skippable: true),
+              Config::Index::Key.new('out'),
+              Config::Index::Key.new('command')
+            ]
+          end
+          it 'detects ctrl+minus with skip' do
+            condition, value = Config::Searcher.find_condition do
+              Config::Searcher.new.search(index, location: location)
+            end
+            expect([condition, value]).to eq([:skip, 'ctrl+minus'])
+          end
         end
-        it { expect(Config::Searcher.skip { subject }).to eq 'ctrl+plus' }
-      end
 
-      context 'index incorrect order' do
-        let(:index) { Config::Index.new %w[in pinch 2 command] }
-        it { is_expected.not_to eq 'ctrl+plus' }
+        context 'when index includes skippable key at first' do
+          let(:index) do
+            Config::Index.new [
+              Config::Index::Key.new(:hoge, skippable: true),
+              Config::Index::Key.new(:fuga, skippable: true),
+              Config::Index::Key.new('pinch'),
+              Config::Index::Key.new('in'),
+              Config::Index::Key.new(:piyo, skippable: true),
+              Config::Index::Key.new('command')
+            ]
+          end
+          it 'detects ctrl+plus with skip' do
+            condition, value = Config::Searcher.find_condition do
+              Config::Searcher.new.search(index, location: location)
+            end
+            expect([condition, value]).to eq([:skip, 'ctrl+plus'])
+          end
+        end
+
+        context 'with begin/update/end' do
+          around do |example|
+            ConfigHelper.load_config_yml = <<~CONFIG
+              swipe:
+                3:
+                  begin:
+                    command: 'echo begin'
+                  update:
+                    command: 'echo update'
+                  end:
+                    command: 'echo end'
+                    keypress:
+                      LEFTCTRL:
+                        command: 'echo end+ctrl'
+            CONFIG
+
+            example.run
+
+            ConfigHelper.clear_config_yml
+          end
+
+          context 'without keypress' do
+            let(:index) do
+              Config::Index.new [
+                Config::Index::Key.new(:swipe),
+                Config::Index::Key.new(3),
+                Config::Index::Key.new('left', skippable: true),
+                Config::Index::Key.new('end'),
+                Config::Index::Key.new('command')
+              ]
+            end
+
+            it 'detects with skip' do
+              condition, value = Config::Searcher.find_condition do
+                Config::Searcher.new.search(index, location: location)
+              end
+              expect([condition, value]).to eq([:skip, 'echo end'])
+            end
+          end
+          context 'with keypress' do
+            context 'with valid key existing in config.yml' do
+              let(:index) do
+                Config::Index.new [
+                  Config::Index::Key.new(:swipe),
+                  Config::Index::Key.new(3),
+                  Config::Index::Key.new('left', skippable: true),
+                  Config::Index::Key.new('end'),
+                  Config::Index::Key.new('keypress', skippable: true),
+                  Config::Index::Key.new('LEFTCTRL', skippable: true),
+                  Config::Index::Key.new('command')
+                ]
+              end
+              it 'detects end+ctrl with skip' do
+                condition, value = Config::Searcher.find_condition do
+                  Config::Searcher.new.search(index, location: location)
+                end
+                expect([condition, value]).to eq([:skip, 'echo end+ctrl'])
+              end
+            end
+            context 'with non-existing key not existing in config.yml' do
+              let(:index) do
+                Config::Index.new [
+                  Config::Index::Key.new(:swipe),
+                  Config::Index::Key.new(3),
+                  Config::Index::Key.new('up', skippable: true),
+                  Config::Index::Key.new('end'),
+                  Config::Index::Key.new('keypress', skippable: true),
+                  Config::Index::Key.new('LEFTSHIFT', skippable: true), # Invalid key
+                  Config::Index::Key.new('command')
+                ]
+              end
+              it 'detects end with skip (fallback to no keypress)' do
+                condition, value = Config::Searcher.find_condition do
+                  Config::Searcher.new.search(index, location: location)
+                end
+                expect([condition, value]).to eq([:skip, 'echo end'])
+              end
+            end
+          end
+        end
       end
     end
 

data/spec/lib/config_spec.rb

@@ -25,14 +25,6 @@ module Fusuma
       }
     end
 
-    let(:keymap_without_finger) do
-      {
-        'swipe' => {
-          'left' => { 'command' => 'alt+Left' }
-        }
-      }
-    end
-
     describe '.custom_path=' do
       before { Singleton.__init__(Config) }
       it 'should reload keymap file' do

data/spec/lib/device_spec.rb

@@ -24,11 +24,9 @@ module Fusuma
           .and_return(libinput_device_command)
 
         @dummy_io = StringIO.new('dummy')
-        allow(Process).to receive(:waitpid).and_return(nil)
-
-        allow(POSIX::Spawn).to receive(:popen4)
+        allow(Open3).to receive(:popen3)
           .with(libinput_device_command)
-          .and_return([nil, @dummy_io, list_devices_output, @dummy_io])
+          .and_return([@dummy_io, list_devices_output, @dummy_io, nil])
       end
 
       context 'with XPS-9360 (have a correct device)' do

data/spec/lib/libinput_command_spec.rb

@@ -5,7 +5,9 @@ require './lib/fusuma/libinput_command'
 
 module Fusuma
   RSpec.describe LibinputCommand do
-    let(:libinput_command) { described_class.new(libinput_options: libinput_options, commands: commands) }
+    let(:libinput_command) do
+      described_class.new(libinput_options: libinput_options, commands: commands)
+    end
     let(:libinput_options) { [] }
     let(:commands) { {} }
     describe '#version' do
@@ -79,15 +81,15 @@ module Fusuma
       before do
         dummy_io = StringIO.new('dummy')
         io = StringIO.new('dummy output')
-        allow(POSIX::Spawn).to receive(:popen4).with(anything).and_return([nil, dummy_io, io, dummy_io])
-        allow(Process).to receive(:waitpid).and_return(nil)
+        allow(Open3).to receive(:popen3).with(anything).and_return([dummy_io, io, dummy_io,
+                                                                    dummy_io, nil])
       end
 
       context 'with the alternative command' do
         let(:commands) { { list_devices_command: 'dummy_list_devices' } }
 
         it 'should call dummy events' do
-          expect(POSIX::Spawn).to receive(:popen4).with(/dummy_list_devices/)
+          expect(Open3).to receive(:popen3).with(/dummy_list_devices/)
         end
       end
 
@@ -99,7 +101,7 @@ module Fusuma
 
         it 'call `libinput list-devices`' do
           command = 'libinput list-devices'
-          expect(POSIX::Spawn).to receive(:popen4)
+          expect(Open3).to receive(:popen3)
             .with(command)
         end
       end
@@ -111,27 +113,34 @@ module Fusuma
 
         it 'call `libinput-list-devices`' do
           command = 'libinput-list-devices'
-          expect(POSIX::Spawn).to receive(:popen4)
+          expect(Open3).to receive(:popen3)
             .with(command)
         end
       end
     end
 
     describe 'debug_events' do
-      subject { libinput_command.debug_events }
       before do
-        dummy_io = StringIO.new('dummy')
-        allow(POSIX::Spawn).to receive(:popen4).with(anything).and_return([nil, dummy_io, dummy_io, dummy_io])
+        @dummy_io = StringIO.new('dummy')
+        allow(Process).to receive(:detach).with(anything).and_return(nil)
       end
+      subject { libinput_command.debug_events(@dummy_io) }
 
       context 'with the alternative command' do
-        let(:commands) { { debug_events_command: 'dummy_debug_events' } }
+        before do
+          allow(libinput_command).to receive(:debug_events_with_options).and_return 'dummy_debug_events'
+        end
 
         it 'should call dummy events' do
-          expect(POSIX::Spawn).to receive(:popen4).with(/dummy_debug_events/).once
+          expect(Process).to receive(:spawn).with('dummy_debug_events',
+                                                  { out: @dummy_io, in: '/dev/null' }).once
           subject
         end
       end
+    end
+
+    describe '#debug_events_with_options' do
+      subject { libinput_command.debug_events_with_options }
 
       context 'with new cli version' do
         before do
@@ -139,13 +148,7 @@ module Fusuma
             .to receive(:new_cli_option_available?)
             .and_return(true)
         end
-
-        it 'should call `libinput debug-events`' do
-          command = 'libinput debug-events'
-          expect(POSIX::Spawn).to receive(:popen4)
-            .with("stdbuf -oL -- #{command}")
-          subject
-        end
+        it { is_expected.to eq 'stdbuf -oL -- libinput debug-events' }
       end
 
       context 'with old cli version' do
@@ -154,13 +157,7 @@ module Fusuma
             .to receive(:new_cli_option_available?)
             .and_return(false)
         end
-
-        it 'should call `libinput-debug-events`' do
-          command = 'libinput-debug-events'
-          expect(POSIX::Spawn).to receive(:popen4)
-            .with("stdbuf -oL -- #{command}")
-          subject
-        end
+        it { is_expected.to eq 'stdbuf -oL -- libinput-debug-events' }
       end
     end
   end

data/spec/lib/plugin/detectors/detector_spec.rb

@@ -27,7 +27,7 @@ module Fusuma
 
           example.run
 
-          Config.custom_path = nil
+          ConfigHelper.clear_config_yml
         end
 
         describe '#detect' do

data/spec/lib/plugin/executors/command_executor_spec.rb

@@ -33,7 +33,7 @@ module Fusuma
           it 'spawn' do
             command = 'echo dummy'
             env = {}
-            expect(POSIX::Spawn).to receive(:spawn).with(env, command)
+            expect(Process).to receive(:spawn).with(env, command)
             expect(Process).to receive(:detach).with(anything)
             @executor.execute(@event)
           end

data/spec/lib/plugin/executors/executor_spec.rb

@@ -13,20 +13,24 @@ module Fusuma
       RSpec.describe Executor do
         before { @executor = Executor.new }
 
+        describe '#execute_key' do
+          it { expect { @executor.execute_keys }.to raise_error(NotImplementedError) }
+        end
+
         describe '#execute' do
-          it do
-            expect { @executor.execute('dummy') }.to raise_error(NotImplementedError)
-          end
+          it { expect { @executor.execute('dummy') }.to raise_error(NotImplementedError) }
         end
 
         describe '#executable?' do
-          it do
-            expect { @executor.executable?('dummy') }.to raise_error(NotImplementedError)
-          end
+          it { expect { @executor.executable?('dummy') }.to raise_error(NotImplementedError) }
         end
       end
 
       class DummyExecutor < Executor
+        def execute_keys
+          [:dummy]
+        end
+
         def execute(event)
           index = Config::Index.new([*event.record.index.keys, :dummy])
           content = Config.search(index)

data/spec/lib/plugin/inputs/libinput_command_input_spec.rb

@@ -15,7 +15,8 @@ module Fusuma
             dummy_pid = 999_999_999
             libinput_command = instance_double(LibinputCommand)
             allow(LibinputCommand).to receive(:new).and_return(libinput_command)
-            allow(libinput_command).to receive(:debug_events).and_return([dummy_pid, @dummy_io])
+            allow(libinput_command).to receive(:debug_events).with(@dummy_io).and_return(dummy_pid)
+            allow(input).to receive(:create_io).and_return [@dummy_io, @dummy_io]
           end
 
           it { expect(input.io).to eq @dummy_io }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - iberianpig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-10-01 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
   on Github(https://github.com/iberianpig/fusuma#installation).
@@ -120,7 +106,7 @@ licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,44 +121,44 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput driver, Linux
 test_files:
-- spec/lib/device_spec.rb
+- spec/helpers/config_helper.rb
 - spec/lib/config/searcher_spec.rb
-- spec/lib/libinput-list-devices_iberianpig-XPS-9360.txt
+- spec/lib/config_spec.rb
+- spec/lib/custom_process_spec.rb
+- spec/lib/device_spec.rb
 - spec/lib/dummy_config.yml
+- spec/lib/fusuma_spec.rb
+- spec/lib/libinput-list-devices_iberianpig-XPS-9360.txt
 - spec/lib/libinput-list-devices_magic_trackpad.txt
-- spec/lib/custom_process_spec.rb
+- spec/lib/libinput-list-devices_razer_razer_blade.txt
+- spec/lib/libinput-list-devices_thejinx0r.txt
+- spec/lib/libinput-list-devices_unavailable.txt
+- spec/lib/libinput_command_spec.rb
 - spec/lib/plugin/base_spec.rb
-- spec/lib/plugin/inputs/libinput_command_input_spec.rb
-- spec/lib/plugin/inputs/input_spec.rb
-- spec/lib/plugin/inputs/timer_input_spec.rb
-- spec/lib/plugin/events/records/record_spec.rb
+- spec/lib/plugin/buffers/buffer_spec.rb
+- spec/lib/plugin/buffers/dummy_buffer.rb
+- spec/lib/plugin/buffers/gesture_buffer_spec.rb
+- spec/lib/plugin/detectors/detector_spec.rb
+- spec/lib/plugin/detectors/dummy_detector.rb
+- spec/lib/plugin/detectors/pinch_detector_spec.rb
+- spec/lib/plugin/detectors/rotate_detector_spec.rb
+- spec/lib/plugin/detectors/swipe_detector_spec.rb
+- spec/lib/plugin/events/event_spec.rb
 - spec/lib/plugin/events/records/gesture_record_spec.rb
+- spec/lib/plugin/events/records/record_spec.rb
 - spec/lib/plugin/events/records/text_record_spec.rb
-- spec/lib/plugin/events/event_spec.rb
-- spec/lib/plugin/filters/libinput_filter_spec.rb
+- spec/lib/plugin/executors/command_executor_spec.rb
+- spec/lib/plugin/executors/executor_spec.rb
 - spec/lib/plugin/filters/filter_spec.rb
-- spec/lib/plugin/detectors/detector_spec.rb
-- spec/lib/plugin/detectors/swipe_detector_spec.rb
-- spec/lib/plugin/detectors/rotate_detector_spec.rb
-- spec/lib/plugin/detectors/pinch_detector_spec.rb
-- spec/lib/plugin/detectors/dummy_detector.rb
+- spec/lib/plugin/filters/libinput_filter_spec.rb
+- spec/lib/plugin/inputs/input_spec.rb
+- spec/lib/plugin/inputs/libinput_command_input_spec.rb
+- spec/lib/plugin/inputs/timer_input_spec.rb
 - spec/lib/plugin/manager_spec.rb
-- spec/lib/plugin/buffers/dummy_buffer.rb
-- spec/lib/plugin/buffers/buffer_spec.rb
-- spec/lib/plugin/buffers/gesture_buffer_spec.rb
 - spec/lib/plugin/parsers/parser_spec.rb
-- spec/lib/plugin/executors/executor_spec.rb
-- spec/lib/plugin/executors/command_executor_spec.rb
-- spec/lib/libinput-list-devices_unavailable.txt
-- spec/lib/libinput_command_spec.rb
-- spec/lib/fusuma_spec.rb
-- spec/lib/libinput-list-devices_razer_razer_blade.txt
-- spec/lib/libinput-list-devices_thejinx0r.txt
-- spec/lib/config_spec.rb
-- spec/helpers/config_helper.rb
 - spec/spec_helper.rb