fusuma 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8572f753f134496b8ffc0f36c3aafbf142357aad913edd9fd5f5d494d32259
-  data.tar.gz: 6adf4afa35ca59305efa6bde88b2ccf808c3025b5a577cc917d0b32d6b794058
+  metadata.gz: 5d8b83e60047931022dab6daf54c40da12ec392b638d44c21491528ec7e13bed
+  data.tar.gz: 6e491edb08ad8b2c7f277986cf7d9226663867c1013fec52b04740649e35770d
 SHA512:
-  metadata.gz: 68dbe15577eb01891537a573c96ab0a2c532e919588c4fdb62899b236382630d8f575f913c9de282bf9a66b5ae8f91cc820067eedc7ecaa42e839f25d090afd8
-  data.tar.gz: cd74e943167bff03bf2eb1d3eaa9d170f28fd921c3736bcc1a981e49f0c7b755de10ecd8b9b6f314bce76377568441e04cd5228222cfe3c3afd32448569a754c
+  metadata.gz: 015112ebf7229f9d48c00735007a598d727bda17e16f4da3b4a6b1d3c8f05ce106d709aabe300414c1232cebc1f52e834fb6cca1961507a60ce6f7528058513a
+  data.tar.gz: c489bd3dbf6c6dd1227e3864abe9c075f6288cf448b8a2b7e85ef092c0586e75b24c76dda16e370ee92bc749fbe378e73bfa376d732dca474cfa43e580af6bfe

data/README.md

@@ -330,12 +330,13 @@ 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
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'posix/spawn'
+require 'open3'
 
 module Fusuma
   # Execute libinput command
@@ -33,21 +33,16 @@ 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]
-      end
+    # @return [Integer] return a latest line libinput debug-events
+    def debug_events(writer)
+      @debug_events ||= Process.spawn(debug_events_with_options, out: writer, in: '/dev/null')
     end
 
     # @return [String] command

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'posix/spawn'
 require_relative './executor'
 
 module Fusuma
@@ -20,11 +19,12 @@ module Fusuma
 
             MultiLogger.info(command: command, args: event.record.args)
 
+            accel = args_accel(event)
             additional_env = event.record.args
                                   .deep_transform_keys(&:to_s)
-                                  .deep_transform_values { |v| (v * args_accel(event)).to_s }
+                                  .deep_transform_values { |v| (v * accel).to_s }
 
-            pid = POSIX::Spawn.spawn(additional_env, command.to_s)
+            pid = Process.spawn(additional_env, command.to_s)
             Process.detach(pid)
           end
         end

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.0.3'
 end

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

@@ -79,15 +79,14 @@ 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 +98,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 +110,33 @@ 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(:spawn).with(anything).and_return(0)
       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 +144,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 +153,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/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/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.0.3
 platform: ruby
 authors:
 - iberianpig
 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-04-20 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).