fusuma 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 134ea9e98557e1475809d32c0fff6a636721118b6923eec3a74d69ac94659126
-  data.tar.gz: 40c33331caa554239fd5c56187c5273bd5abe0c9b83f1498a4cb8e4ff821d2d5
+  metadata.gz: 8c6f872a195572cd05d5cbf86ff5a55e3b7419b9ddc3a2e1b1b09bd395adde36
+  data.tar.gz: 51c32b562df304b04a0b607b9e4404bfb7fb031fee73388a2902b56a6a94c4a5
 SHA512:
-  metadata.gz: eb7e3ee14cce7f5efa087fa48ded433068e2b5ab3c4e083e282ac0cc5d837bef84c43c755d8c2b3d70d931883076856579797d104e414c89360478eb71ec9134
-  data.tar.gz: 61dc019f239f4bcd0e9398c0791cf2e16def41f82a458b20cb76a34aa36e414f3fea6e287eca731c7537d30fc4352f8c172dc95e1b23763f352085d2446a0d09
+  metadata.gz: 90da79d6210fc47324fda9d3b5e4f9ed1f4e820ccead8c2dc0341d2bb69e3bd691c34db39bdb83cd94529f9e69efe478d02c1cca43f4b953bddd4b0eb46f8888
+  data.tar.gz: adbd22a0b5a1d8213d96994e33a38c4cf2c6f667d33d16019cf1e4f90dee7d114301fee0c544e18e1e532fa7f10c5aa13c09963d5694072c63721bbc8f5ab065

data/README.md

@@ -99,6 +99,38 @@ For sending shortcuts:
 sudo pacman -S xdotool
 ```
 
+### For Fedora
+
+#### 1. Install libinput-tools
+
+You need `libinput` release 1.0 or later.
+
+```bash
+sudo dnf install libinput
+```
+
+#### 2. Install Ruby
+
+Fusuma runs in Ruby, so you must install it first.
+
+```bash
+sudo dnf install ruby
+```
+
+#### 3. Install Fusuma
+
+```bash
+sudo gem install fusuma
+```
+
+#### 4. Install xdotool (optional)
+
+For sending shortcuts:
+
+```bash
+sudo dnf install xdotool
+```
+
 ### Touchpad not working in GNOME
 
 Ensure the touchpad events are being sent to the GNOME desktop by running the following command:

data/fusuma.gemspec

@@ -1,30 +1,29 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fusuma/version'
+require "fusuma/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'fusuma'
-  spec.version       = Fusuma::VERSION
-  spec.authors       = ['iberianpig']
-  spec.email         = ['yhkyky@gmail.com']
+  spec.name = "fusuma"
+  spec.version = Fusuma::VERSION
+  spec.authors = ["iberianpig"]
+  spec.email = ["yhkyky@gmail.com"]
 
-  spec.summary       = 'Multitouch gestures with libinput driver, Linux'
-  spec.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).'
-  spec.homepage      = 'https://github.com/iberianpig/fusuma'
-  spec.license       = 'MIT'
+  spec.summary = "Multitouch gestures with libinput driver, Linux"
+  spec.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)."
+  spec.homepage = "https://github.com/iberianpig/fusuma"
+  spec.license = "MIT"
 
-  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']
+  spec.files = Dir["{bin,lib,exe}/**/*", "LICENSE*", "README*", "*.gemspec"]
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
   spec.metadata = {
-    'rubygems_mfa_required' => 'true',
-    'yard.run' => 'yri' # use "yard" to build full HTML docs.
+    "rubygems_mfa_required" => "true",
+    "yard.run" => "yri" # use "yard" to build full HTML docs.
   }
 
-  spec.required_ruby_version = '>= 2.5.1' # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
+  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
 end

data/lib/fusuma/config/index.rb

@@ -7,17 +7,17 @@ module Fusuma
     class Index
       def initialize(keys)
         @keys = case keys
-                when Array
-                  keys.map do |key|
-                    if key.is_a? Key
-                      key
-                    else
-                      Key.new(key)
-                    end
-                  end
-                else
-                  [Key.new(keys)]
-                end
+        when Array
+          keys.map do |key|
+            if key.is_a? Key
+              key
+            else
+              Key.new(key)
+            end
+          end
+        else
+          [Key.new(keys)]
+        end
       end
 
       def inspect
@@ -29,11 +29,11 @@ module Fusuma
       def cache_key
         case @keys
         when Array
-          @keys.map(&:symbol).join(',')
+          @keys.map(&:symbol).join(",")
         when Key
           @keys.symbol
         else
-          raise 'invalid keys'
+          raise "invalid keys"
         end
       end
 
@@ -56,7 +56,7 @@ module Fusuma
         def initialize(symbol_word, skippable: false, fallback: nil)
           @symbol = begin
             symbol_word.to_sym
-          rescue StandardError
+          rescue
             symbol_word
           end
 
@@ -64,14 +64,14 @@ module Fusuma
 
           @fallback = begin
             fallback.to_sym
-          rescue StandardError
+          rescue
             fallback
           end
         end
 
         def inspect
-          skip_marker = @skippable && Searcher.skip? ? '(skip)' : ''
-          fallback_marker = @fallback && Searcher.fallback? ? '(fallback)' : ''
+          skip_marker = @skippable && Searcher.skip? ? "(skip)" : ""
+          fallback_marker = @fallback && Searcher.fallback? ? "(fallback)" : ""
           "#{@symbol}#{skip_marker}#{fallback_marker}"
         end
 

data/lib/fusuma/config/searcher.rb

@@ -55,7 +55,7 @@ module Fusuma
 
       def cache(key)
         @cache ||= {}
-        key = key.join(',') if key.is_a? Array
+        key = key.join(",") if key.is_a? Array
         if @cache.key?(key)
           @cache[key]
         else

data/lib/fusuma/config/yaml_duplication_checker.rb

@@ -7,13 +7,13 @@ module Fusuma
     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 = 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
         return unless tree
 
         traverse(tree, &on_duplicated)

data/lib/fusuma/config.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative './multi_logger'
-require_relative './config/index'
-require_relative './config/searcher'
-require_relative './config/yaml_duplication_checker'
-require_relative './hash_support'
-require 'singleton'
-require 'yaml'
+require_relative "./multi_logger"
+require_relative "./config/index"
+require_relative "./config/searcher"
+require_relative "./config/yaml_duplication_checker"
+require_relative "./hash_support"
+require "singleton"
+require "yaml"
 
 # module as namespace
 module Fusuma
@@ -51,6 +51,9 @@ module Fusuma
       MultiLogger.info "reload config: #{path}"
       @keymap = validate(path)
       self
+    rescue InvalidFileError => e
+      MultiLogger.error e.message
+      exit 1
     end
 
     # @return [Hash] If check passes
@@ -64,10 +67,11 @@ module Fusuma
       raise InvalidFileError, "Detect duplicate keys #{duplicates}" unless duplicates.empty?
 
       yamls = YAML.load_stream(File.read(path)).compact
-      yamls.map(&:deep_symbolize_keys)
-    rescue StandardError => e
-      MultiLogger.error e.message
-      raise InvalidFileError, e.message
+      yamls.map do |yaml|
+        raise InvalidFileError, "invalid config.yml: #{path}" unless yaml.is_a? Hash
+
+        yaml.deep_symbolize_keys
+      end
     end
 
     # @param index [Index]
@@ -86,13 +90,13 @@ module Fusuma
       execute_params = search(index)
       return if execute_params.nil? || !execute_params.is_a?(Hash)
 
-      @execute_keys.find { |k| execute_params.keys.include?(k) }
+      @execute_keys.find { |k| execute_params.key?(k) }
     end
 
     private
 
     def find_filepath
-      filename = 'fusuma/config.yml'
+      filename = "fusuma/config.yml"
       if custom_path
         return expand_custom_path if File.exist?(expand_custom_path)
 

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
@@ -46,7 +46,7 @@ module Fusuma
       def available
         @available ||= all.select(&:available).tap do |d|
           MultiLogger.debug(available_devices: d)
-          raise 'Touchpad is not found' if d.empty?
+          raise "Touchpad is not found" if d.empty?
         end
       rescue RuntimeError => e
         # FIXME: should not exit without Runner class
@@ -106,40 +106,40 @@ module Fusuma
       # @return [Hash]
       def extract_attribute(line:)
         if (id = id_from(line))
-          { id: id }
+          {id: id}
         elsif (name = name_from(line))
-          { name: name }
+          {name: name}
         elsif (capabilities = capabilities_from(line))
-          { capabilities: capabilities }
+          {capabilities: capabilities}
         elsif (available = available_from(line))
-          { available: available }
+          {available: available}
         else
           {}
         end
       end
 
       def id_from(line)
-        line.match('^Kernel:[[:space:]]*') do |m|
+        line.match("^Kernel:[[:space:]]*") do |m|
           m.post_match.match(/event[0-9]+/).to_s
         end
       end
 
       def name_from(line)
-        line.match('^Device:[[:space:]]*') do |m|
+        line.match("^Device:[[:space:]]*") do |m|
           m.post_match.strip
         end
       end
 
       def capabilities_from(line)
-        line.match('^Capabilities:[[:space:]]*') do |m|
+        line.match("^Capabilities:[[:space:]]*") do |m|
           m.post_match.strip
         end
       end
 
       def available_from(line)
         # NOTE: is natural scroll available?
-        if line =~ /^Nat.scrolling: /
-          return false if line =~ %r{n/a}
+        if /^Nat.scrolling: /.match?(line)
+          return false if %r{n/a}.match?(line)
 
           return true # disabled / enabled
         end

data/lib/fusuma/environment.rb

@@ -1,19 +1,19 @@
 # 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
   class Environment
     class << self
       def dump_information
-        MultiLogger.info '---------------------------------------------'
+        MultiLogger.info "---------------------------------------------"
         print_version
-        MultiLogger.info '---------------------------------------------'
+        MultiLogger.info "---------------------------------------------"
         print_enabled_plugins
-        MultiLogger.info '---------------------------------------------'
+        MultiLogger.info "---------------------------------------------"
       end
 
       def print_version
@@ -27,11 +27,11 @@ module Fusuma
       end
 
       def print_enabled_plugins
-        MultiLogger.info 'Enabled Plugins: '
+        MultiLogger.info "Enabled Plugins: "
         Plugin::Manager.plugins
-                       .reject { |k, _v| k.to_s =~ /Base/ }
-                       .map { |_base, plugins| plugins.map { |plugin| "  #{plugin}" } }
-                       .flatten.sort.each { |name| MultiLogger.info(name) }
+          .reject { |k, _v| k.to_s =~ /Base/ }
+          .map { |_base, plugins| plugins.map { |plugin| "  #{plugin}" } }
+          .flatten.sort.each { |name| MultiLogger.info(name) }
       end
 
       def print_device_list

data/lib/fusuma/hash_support.rb

@@ -6,7 +6,7 @@ class Hash
   def deep_symbolize_keys
     deep_transform_keys do |key|
       key.to_sym
-    rescue StandardError
+    rescue
       key
     end
   end

data/lib/fusuma/libinput_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'open3'
+require "open3"
 
 module Fusuma
   # Execute libinput command
@@ -13,7 +13,7 @@ module Fusuma
 
     # `libinput-list-devices` and `libinput-debug-events` are deprecated,
     # use `libinput list-devices` and `libinput debug-events` from 1.8.
-    NEW_CLI_OPTION_VERSION = '1.8'
+    NEW_CLI_OPTION_VERSION = "1.8"
 
     # @return [Boolean]
     def new_cli_option_available?
@@ -40,10 +40,9 @@ module Fusuma
     # @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
+        t = Open3.pipeline_start([debug_events_with_options], ["grep -v POINTER_ --line-buffered"],
+          out: writer, in: "/dev/null")
+        t[0].pid
       end
     end
 
@@ -52,12 +51,12 @@ module Fusuma
     def version_command
       if @debug_events_command && @list_devices_command
         "#{@list_devices_command} --version"
-      elsif which('libinput')
-        'libinput --version'
-      elsif which('libinput-list-devices')
-        'libinput-list-devices --version'
+      elsif which("libinput")
+        "libinput --version"
+      elsif which("libinput-list-devices")
+        "libinput-list-devices --version"
       else
-        MultiLogger.error 'Please install libinput-tools'
+        MultiLogger.error "Please install libinput-tools"
         exit 1
       end
     end
@@ -66,9 +65,9 @@ module Fusuma
       if @list_devices_command
         @list_devices_command
       elsif new_cli_option_available?
-        'libinput list-devices'
+        "libinput list-devices"
       else
-        'libinput-list-devices'
+        "libinput-list-devices"
       end
     end
 
@@ -76,15 +75,15 @@ module Fusuma
       if @debug_events_command
         @debug_events_command
       elsif new_cli_option_available?
-        'libinput debug-events'
+        "libinput debug-events"
       else
-        'libinput-debug-events'
+        "libinput-debug-events"
       end
     end
 
     def debug_events_with_options
-      prefix = 'stdbuf -oL --'
-      "#{prefix} #{debug_events_command} #{@libinput_options.join(' ')}".strip
+      prefix = "stdbuf -oL --"
+      "#{prefix} #{debug_events_command} #{@libinput_options.join(" ")}".strip
     end
 
     private
@@ -96,8 +95,8 @@ module Fusuma
     #   which('ruby') #=> /usr/bin/ruby
     # @return [String, nil]
     def which(command)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
           exe = File.join(path, "#{command}#{ext}")
           return exe if File.executable?(exe) && !File.directory?(exe)

data/lib/fusuma/multi_logger.rb

@@ -2,8 +2,8 @@
 
 # module as namespace
 module Fusuma
-  require 'logger'
-  require 'singleton'
+  require "logger"
+  require "singleton"
   # logger separate between stdout and strerr
   class MultiLogger < Logger
     include Singleton
@@ -16,9 +16,9 @@ module Fusuma
     end
 
     def initialize
-      filepath = self.class.instance_variable_get('@filepath')
+      filepath = self.class.instance_variable_get(:@filepath)
       if filepath
-        logfile = File.new(filepath, 'a')
+        logfile = File.new(filepath, "a")
         logfile.sync = true
         super(logfile)
         $stderr = logfile

data/lib/fusuma/plugin/base.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './manager'
-require_relative '../config'
-require_relative '../custom_process'
+require_relative "./manager"
+require_relative "../config"
+require_relative "../custom_process"
 
 module Fusuma
   module Plugin
@@ -44,15 +44,15 @@ module Fusuma
 
             next if param_types.any? { |klass| val.is_a?(klass) }
 
-            MultiLogger.error('Please fix config.yml.')
+            MultiLogger.error("Please fix config.yml.")
             MultiLogger.error(":#{base.keys.map(&:symbol)
-            .join(' => :')} => :#{key} should be #{param_types.join(' OR ')}.")
+            .join(" => :")} => :#{key} should be #{param_types.join(" OR ")}.")
             exit 1
           end
       end
 
       def config_index
-        Config::Index.new(self.class.name.gsub('Fusuma::', '').underscore.split('/'))
+        Config::Index.new(self.class.name.gsub("Fusuma::", "").underscore.split("/"))
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../base'
+require_relative "../base"
 
 module Fusuma
   module Plugin
@@ -16,7 +16,7 @@ module Fusuma
 
         # @return [String]
         def type
-          @type ||= self.class.name.underscore.split('/').last.gsub('_buffer', '')
+          @type ||= self.class.name.underscore.split("/").last.gsub("_buffer", "")
         end
 
         # @param event [Event]
@@ -28,7 +28,8 @@ module Fusuma
 
         # clear old events
         # @param current_time [Time]
-        def clear_expired(current_time: Time.now); end
+        def clear_expired(current_time: Time.now)
+        end
 
         # clear buffer
         def clear
@@ -38,7 +39,7 @@ module Fusuma
         # Set source for tag from config.yml.
         # DEFAULT_SOURCE is defined in each plugins.
         def source
-          @source ||= config_params(:source) || self.class.const_get('DEFAULT_SOURCE')
+          @source ||= config_params(:source) || self.class.const_get(:DEFAULT_SOURCE)
         end
       end
     end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative './buffer'
+require_relative "./buffer"
 
 module Fusuma
   module Plugin
     module Buffers
       # manage events and generate command
       class GestureBuffer < Buffer
-        DEFAULT_SOURCE = 'libinput_gesture_parser'
+        DEFAULT_SOURCE = "libinput_gesture_parser"
         DEFAULT_SECONDS_TO_KEEP = 100
 
         def config_param_types
@@ -47,7 +47,7 @@ module Fusuma
           return false if empty?
 
           case @events.last.record.status
-          when 'end', 'cancelled'
+          when "end", "cancelled"
             true
           else
             false
@@ -63,7 +63,7 @@ module Fusuma
         end
 
         def updating_events
-          @events.select { |e| e.record.status == 'update' }
+          @events.select { |e| e.record.status == "update" }
         end
 
         # @param attr [Symbol]
@@ -90,7 +90,7 @@ module Fusuma
         end
 
         def select_by_events(&block)
-          return enum_for(:select_by_events) unless block_given?
+          return enum_for(:select_by_events) unless block
 
           events = @events.select(&block)
           self.class.new events
@@ -99,7 +99,7 @@ module Fusuma
         def select_from_last_begin
           return self if empty?
 
-          index_from_last = @events.reverse.find_index { |e| e.record.status == 'begin' }
+          index_from_last = @events.reverse.find_index { |e| e.record.status == "begin" }
           return GestureBuffer.new([]) if index_from_last.nil?
 
           index_last_begin = events.length - index_from_last - 1

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative './buffer'
+require_relative "./buffer"
 
 module Fusuma
   module Plugin
     module Buffers
       # manage events and generate command
       class TimerBuffer < Buffer
-        DEFAULT_SOURCE = 'timer_input'
+        DEFAULT_SOURCE = "timer_input"
         DEFAULT_SECONDS_TO_KEEP = 3
 
         def config_param_types