fusuma 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e85c17ee616861de23dfda299da1de324ebc4dd26aad155d6154641b81e332
-  data.tar.gz: f8516a7ac078ee2d600e23ebcfb2420a36a12810ded08538ee5ed178baa05283
+  metadata.gz: 2653f2589093ec363f62b29d398ed622314f30d9a8c902c3c7f893470c5549a0
+  data.tar.gz: 5076d2ee1091be519a3f1eac11b536bf66120c6b9faf485e202e6bf4ecb47d20
 SHA512:
-  metadata.gz: fac1ec6baaeb39f8e9ecd2c883b4db02cda3b2afb3f16b832ec6b5a8219dc902a0c8df68f432aa2f78b240d588f2f2734fd92e7368c7372394ab9432251ee7f7
-  data.tar.gz: 24d8e5d474fcbd318d2b8027110291585dfa71878f5e329b97d2e4f935edb1f37ae0a11d3d7bb330fdd2458d001f1da1e27022ea416bddaf96cb78a33a01cfe9
+  metadata.gz: 7433bbb5eb068c0b1f9d3d9e4492878d672105504a5603b7bd4d92c9cb61e34cbf8559e71c0b3d407bba59b5f640e9031e106e8c4cbf38c53f85f871c2517592
+  data.tar.gz: 23425a4be0e42f0b006a424e067bed3c18be3e8768173dd8bdc6df5f070339e1613a7319de4ab70fd06981871db38210c8f26aa3e5e030cc3021a5b565d2f358

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.6.0](https://github.com/iberianpig/fusuma/tree/v1.6.0) (2020-03-14)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.5.0...v1.6.0)
+
+## [v1.5.0](https://github.com/iberianpig/fusuma/tree/v1.5.0) (2020-03-02)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.4.1...v1.5.0)
+
 ## [v1.4.1](https://github.com/iberianpig/fusuma/tree/v1.4.1) (2020-02-27)
 
 [Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.4.0...v1.4.1)

data/README.md

@@ -76,6 +76,13 @@ $ mkdir -p ~/.config/fusuma        # create config directory
 $ nano ~/.config/fusuma/config.yml # edit config file.
 ```
 
+### About YAML Basic Syntax
+* Comments in YAML begins with the (#) character.
+* Comments must be separated from other tokens by whitespaces.
+* Indentation of whitespace is used to denote structure.
+* Tabs are not included as indentation for YAML files.
+
+
 ### Example 1: Gesture Mapping for elementary OS
 
 ```yaml
@@ -245,10 +252,23 @@ Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and
 | [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                 |
+
+## 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://www.youtube.com/watch?v=bn11Iwvf29I) by [Eric Adams](https://www.youtube.com/user/igster75)  
+
 
 ## Support
 
-[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/iberianpig)
+I'm a Freelance Engineer in Japan and working on these products after finishing my regular work or on my holidays.
+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!)
+* [Patreon](https://www.patreon.com/iberianpig)
+
 
 ## Contributing
 

data/lib/fusuma.rb

@@ -4,6 +4,7 @@ require_relative './fusuma/version'
 require_relative './fusuma/multi_logger'
 require_relative './fusuma/config.rb'
 require_relative './fusuma/device.rb'
+require_relative './fusuma/libinput_command.rb'
 require_relative './fusuma/plugin/manager.rb'
 
 # this is top level module
@@ -47,7 +48,7 @@ module Fusuma
 
       def print_version
         MultiLogger.info "Fusuma: #{Fusuma::VERSION}"
-        MultiLogger.info "libinput: #{Plugin::Inputs::LibinputCommandInput.new.version}"
+        MultiLogger.info "libinput: #{LibinputCommand.new.version}"
         MultiLogger.info "OS: #{`uname -rsv`}".strip
         MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
         MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION $XDG_SESSION_TYPE`}".strip
@@ -90,7 +91,7 @@ module Fusuma
         parsed = parse(filtered) || next
         buffered = buffer(parsed) || next
         detected = detect(buffered) || next
-        merged = merge(detected)
+        merged = merge(detected) || next
         execute(merged)
       end
     end

data/lib/fusuma/device.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './multi_logger'
+require_relative './libinput_command.rb'
+
 module Fusuma
   # detect input device
   class Device
@@ -56,7 +59,7 @@ module Fusuma
       # @return [Array]
       def fetch_devices
         line_parser = LineParser.new
-        Plugin::Inputs::LibinputCommandInput.new.list_devices do |line|
+        LibinputCommand.new.list_devices do |line|
           line_parser.push(line)
         end
         line_parser.generate_devices

data/lib/fusuma/libinput_command.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+module Fusuma
+  # Execute libinput command
+  class LibinputCommand
+    def initialize(libinput_options: [])
+      @libinput_options = libinput_options
+    end
+
+    # `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
+
+    # @return [Boolean]
+    def new_cli_option_available?
+      Gem::Version.new(version) >= Gem::Version.new(NEW_CLI_OPTION_VERSION)
+    end
+
+    # @return [String]
+    def version
+      # versiom_command prints "1.6.3\n"
+      @version ||= `#{version_command}`.strip
+    end
+
+    # @yieldparam [String] gives a line in libinput list-devices output to the block
+    def list_devices
+      cmd = list_devices_command
+      MultiLogger.debug(list_devices: cmd)
+      Open3.popen3(cmd) do |_i, o, _e, _w|
+        o.each { |line| yield(line) }
+      end
+    end
+
+    # @yieldparam [String] gives a line in libinput debug-events output to the block
+    def debug_events
+      prefix = 'stdbuf -oL --'
+      cmd = "#{prefix} #{debug_events_command} #{@libinput_options.join(' ')}".strip
+      MultiLogger.debug(debug_events: cmd)
+      Open3.popen3(cmd) do |_i, o, _e, _w|
+        o.each do |line|
+          yield(line.chomp)
+        end
+      end
+    end
+
+    # @return [String] command
+    # @raise [SystemExit]
+    def version_command
+      if which('libinput')
+        'libinput --version'
+      elsif which('libinput-list-devices')
+        'libinput-list-devices --version'
+      else
+        MultiLogger.error 'install libinput-tools'
+        exit 1
+      end
+    end
+
+    def list_devices_command
+      if new_cli_option_available?
+        'libinput list-devices'
+      else
+        'libinput-list-devices'
+      end
+    end
+
+    def debug_events_command
+      if new_cli_option_available?
+        'libinput debug-events'
+      else
+        'libinput-debug-events'
+      end
+    end
+
+    private
+
+    # which in ruby: Checking if program exists in $PATH from ruby
+    # (https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby)
+    # Cross-platform way of finding an executable in the $PATH.
+    #
+    #   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.each do |ext|
+          exe = File.join(path, "#{command}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative './input.rb'
-require 'open3'
 
 module Fusuma
   module Plugin
@@ -19,77 +18,11 @@ module Fusuma
         end
 
         def run
-          debug_events do |line|
+          LibinputCommand.new(libinput_options: libinput_options).debug_events do |line|
             yield event(record: line)
           end
         end
 
-        # `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
-
-        # @return [Boolean]
-        def new_cli_option_available?
-          Gem::Version.new(version) >= Gem::Version.new(NEW_CLI_OPTION_VERSION)
-        end
-
-        # @return [String]
-        def version
-          # versiom_command prints "1.6.3\n"
-          @version ||= `#{version_command}`.strip
-        end
-
-        # @yieldparam [String] gives a line in libinput list-devices output to the block
-        def list_devices
-          cmd = list_devices_command
-          MultiLogger.debug(list_devices: cmd)
-          Open3.popen3(cmd) do |_i, o, _e, _w|
-            o.each { |line| yield(line) }
-          end
-        end
-
-        # @yieldparam [String] gives a line in libinput debug-events output to the block
-        def debug_events
-          prefix = 'stdbuf -oL --'
-          options = [*libinput_options]
-          cmd = "#{prefix} #{debug_events_command} #{options.join(' ')}".strip
-          MultiLogger.debug(debug_events: cmd)
-          Open3.popen3(cmd) do |_i, o, _e, _w|
-            o.each do |line|
-              yield(line.chomp)
-            end
-          end
-        end
-
-        # @return [String] command
-        # @raise [SystemExit]
-        def version_command
-          if which('libinput')
-            'libinput --version'
-          elsif which('libinput-list-devices')
-            'libinput-list-devices --version'
-          else
-            MultiLogger.error 'install libinput-tools'
-            exit 1
-          end
-        end
-
-        def list_devices_command
-          if new_cli_option_available?
-            'libinput list-devices'
-          else
-            'libinput-list-devices'
-          end
-        end
-
-        def debug_events_command
-          if new_cli_option_available?
-            'libinput debug-events'
-          else
-            'libinput-debug-events'
-          end
-        end
-
         def libinput_options
           device = ("--device='#{config_params(:device)}'" if config_params(:device))
           enable_tap = '--enable-tap' if config_params(:'enable-tap')
@@ -104,25 +37,6 @@ module Fusuma
             verbose
           ].compact
         end
-
-        private
-
-        # which in ruby: Checking if program exists in $PATH from ruby
-        # (https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby)
-        # Cross-platform way of finding an executable in the $PATH.
-        #
-        #   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.each do |ext|
-              exe = File.join(path, "#{command}#{ext}")
-              return exe if File.executable?(exe) && !File.directory?(exe)
-            end
-          end
-          nil
-        end
       end
     end
   end

data/lib/fusuma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,7 @@ files:
 - lib/fusuma/config.yml
 - lib/fusuma/config/index.rb
 - lib/fusuma/device.rb
+- lib/fusuma/libinput_command.rb
 - lib/fusuma/multi_logger.rb
 - lib/fusuma/plugin/base.rb
 - lib/fusuma/plugin/buffers/buffer.rb