fusuma 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f639aca336e61fc9c2a68d32bb31c52964c30eefb9c32ab2caba61dc6f37a9e7
-  data.tar.gz: 8055c1d8250c7062f314371129d51adc54f27c4a5f7e18e07452462233047c18
+  metadata.gz: 548a968eabf08c31b6ed710a8cfcc698d8a4cbca97ce15b6f7850138957a9617
+  data.tar.gz: 7d282246f87f40834ea414cd694b945d56be4deb37f59f7f6802a1eb756d46cb
 SHA512:
-  metadata.gz: 40f9f9aae6f9b281c474fbb65e2bb48ef4b1082c9065adbaea06dc51559504f5b652fb8716517a43d827f8b3e02f63961661d592e75fcfdf0d478c1723b9667f
-  data.tar.gz: d3ca5a6136544f760e8277e2629838e6903f5028478fd43b647218ee19b1b4fd4a8bb744ce6e5a9b8b708614a7689cf2f6178db77180bab4105b0db55430c457
+  metadata.gz: c0d7dc5649dcf6ee8bc8cb5cfd3ecb590196d64fbcf175b31fdfe402b9eb81ac76d01fcd37ce630af165fc1891005fdba9c93c46b04e3a97bb73e3d3ccccef14
+  data.tar.gz: 1109fa1abb0afdca1b3557debc7bf0d2f1dac945d72336f6f58864ffdfe7aa2cebf0f9687b1b7ad315fffae8b142a8d22686d5b806f3babbd0142f00121a897f

data/.travis.yml

@@ -1,9 +1,10 @@
 sudo: false
+
 language: ruby
+cache: bundler
 rvm:
   - 2.3.1
   - 2.4
   - 2.5
-before_install:
-  - travis_retry gem update --system || travis_retry gem update --system 2.7.8
-  - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
+  - 2.6
+before_install: gem install bundler --no-document -v 2.0.1

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [v1.2.1](https://github.com/iberianpig/fusuma/tree/v1.2.1) (2019-10-19)
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.2...v1.2.1)
+
+**Fixed bugs:**
+
+- Fusuma must be started after connecting bluetooth trackpad [\#125](https://github.com/iberianpig/fusuma/issues/125)
+
+**Merged pull requests:**
+
+- Reload Filter when new device is added [\#137](https://github.com/iberianpig/fusuma/pull/137) ([iberianpig](https://github.com/iberianpig))
+
+## [v1.2](https://github.com/iberianpig/fusuma/tree/v1.2) (2019-10-13)
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.1...v1.2)
+
 ## [v1.1](https://github.com/iberianpig/fusuma/tree/v1.1) (2019-10-12)
 [Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.0...v1.1)
 

data/lib/fusuma.rb

@@ -33,8 +33,9 @@ module Fusuma
         Plugin::Manager.require_plugins_from_relative
         Plugin::Manager.require_plugins_from_config
 
-        print_version(then_exit: option[:version])
+        print_version
         print_enabled_plugins
+        Kernel.exit(0) if option[:version]
 
         print_device_list if option[:list]
         # TODO: remove keep_device_from_option from command line options
@@ -42,8 +43,7 @@ module Fusuma
         Process.daemon if option[:daemon]
       end
 
-      # TODO: print after reading plugins
-      def print_version(then_exit: false)
+      def print_version
         MultiLogger.info '---------------------------------------------'
         MultiLogger.info "Fusuma: #{Fusuma::VERSION}"
         MultiLogger.info "libinput: #{Plugin::Inputs::LibinputCommandInput.new.version}"
@@ -51,17 +51,16 @@ module Fusuma
         MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
         MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION`}".strip
         MultiLogger.info '---------------------------------------------'
-        Kernel.exit(0) if then_exit
       end
 
       def print_enabled_plugins
-        MultiLogger.debug '---------------------------------------------'
-        MultiLogger.debug 'Enabled Plugins: '
+        MultiLogger.info '---------------------------------------------'
+        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.debug name }
-        MultiLogger.debug '---------------------------------------------'
+                       .flatten.sort.each { |name| MultiLogger.info(name) }
+        MultiLogger.info '---------------------------------------------'
       end
 
       def print_device_list
@@ -74,11 +73,6 @@ module Fusuma
 
         Config.custom_path = config_path
       end
-
-      def debug_mode
-        MultiLogger.instance.debug_mode = true
-        print_version
-      end
     end
 
     def initialize
@@ -97,16 +91,17 @@ module Fusuma
         parsed = parse(filtered)
         buffered = buffer(parsed)
         detected = detect(buffered)
-        execute(detected)
+        merged = merge(detected)
+        execute(merged)
       end
     end
 
     def filter(event)
-      @filters.reduce(event) { |e, f| f.filter(e) if e }
+      event if @filters.any? { |f| f.filter(event) }
     end
 
     def parse(event)
-      @parsers.reduce(event) { |e, p| p.parse(e) if e  }
+      @parsers.reduce(event) { |e, p| p.parse(e) if e }
     end
 
     def buffer(event)
@@ -114,28 +109,35 @@ module Fusuma
     end
 
     # @param buffers [Array<Buffer>]
-    # @return [Event] if event is detected
-    # @return [NilClass] if event is NOT detected
+    # @return [Array<Event>]
     def detect(buffers)
-      @detectors.each_with_object([]) do |detector, index_records|
-        event = detector.detect(buffers) # event
-
-        if event&.record&.mergable?
-          event.record.merge(records: index_records)
-          buffers.each(&:clear) # clear buffer
-          break(event)
+      @detectors.reduce([]) do |detected, detector|
+        if (event = detector.detect(buffers))
+          detected << event
+        else
+          detected
         end
-
-        break nil if @detectors.last == detector
       end
     end
 
+    # @param events [Array<Event>]
+    # @return [Event] a Event merged all records from arguments
+    # @return [NilClass] when event is NOT given
+    def merge(events)
+      main_events, modifiers = events.partition { |event| event.record.mergable? }
+      return nil unless (main_event = main_events.first)
+
+      main_event.record.merge(records: modifiers.map(&:record))
+      main_event
+    end
+
     def execute(event)
       return unless event
 
       executor = @executors.find do |e|
         e.executable?(event)
       end
+
       executor&.execute(event)
     end
   end

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

@@ -16,7 +16,6 @@ module Fusuma
           # - window event buffer
           # - other event buffer
           return if event&.tag != source
-          return if event.record.type != :gesture
 
           @events.push(event)
           clear unless updating?

data/lib/fusuma/plugin/events/records/gesture_record.rb

@@ -20,10 +20,6 @@ module Fusuma
             @finger  = finger
             @direction = direction
           end
-
-          def type
-            :gesture
-          end
         end
       end
     end

data/lib/fusuma/plugin/events/records/index_record.rb

@@ -9,6 +9,7 @@ module Fusuma
         class IndexRecord < Record
           # define gesture format
           attr_reader :index
+          attr_reader :position
 
           # @param [Config::Index] index
           # @param [Symbol] position [:prefix, :body, :surfix]
@@ -26,12 +27,12 @@ module Fusuma
           def merge(records:)
             raise "position is NOT body: #{self}" unless mergable?
 
-            @index = records.each_with_object(@index) do |record, merged_index|
+            @index = records.reduce(@index) do |merged_index, record|
               case record.position
               when :prefix
-                Index.new([*record.index.keys, *merged_index.keys])
+                Config::Index.new([*record.index.keys, *merged_index.keys])
               when :surfix
-                Index.new([*merged_index.keys, *record.index.keys])
+                Config::Index.new([*merged_index.keys, *record.index.keys])
               else
                 raise "invalid index position: #{record}"
               end
@@ -42,10 +43,6 @@ module Fusuma
           def mergable?
             @position == :body
           end
-
-          protected
-
-          attr_reader :position
         end
       end
     end

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

@@ -4,22 +4,19 @@ require_relative '../base.rb'
 
 module Fusuma
   module Plugin
-    # filter class
     module Filters
-      # Filter record to keep
+      # Filter to keep/discard events from input plugin
       class Filter < Base
         # Filter input event
         # @param event [Event]
-        # @return [Event, nil]
+        # @return [Event] when keeping event
+        # @return [NilClass] when discarding record
         def filter(event)
-          event.tap do |e|
-            next if e.tag != source
-            next if keep?(e.record)
+          return event if event.tag !~ /#{source}/
 
-            MultiLogger.debug(filtered: e)
+          return event if keep?(event.record)
 
-            break nil
-          end
+          nil
         end
 
         # @abstract override `#keep?` to implement

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

@@ -10,9 +10,10 @@ module Fusuma
       class LibinputCommandInput < Input
         def config_param_types
           {
-            'enable-tap': [TrueClass, FalseClass],
+            'device': [String],
             'enable-dwt': [TrueClass, FalseClass],
-            'device': [String]
+            'enable-tap': [TrueClass, FalseClass],
+            'show-keycodes': [TrueClass, FalseClass]
           }
         end
 
@@ -88,21 +89,21 @@ module Fusuma
           end
         end
 
-        private
-
-        # TODO: add specs
         def libinput_options
+          device = ("--device='#{config_params(:device)}'" if config_params(:device))
           enable_tap = '--enable-tap' if config_params(:'enable-tap')
-          device = ("--device=#{config_params(:device)}" if config_params(:device))
           enable_dwt = '--enable-dwt' if config_params(:'enable-dwt')
-
+          show_keycodes = '--show-keycodes' if config_params(:'show-keycodes')
           [
-            enable_tap,
             device,
-            enable_dwt
+            enable_dwt,
+            enable_tap,
+            show_keycodes
           ].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.

data/lib/fusuma/version.rb

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

metadata

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