fusuma 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b012552c1ff9c6bedfd50b1e7bb69c86c5c7707c7fb33a18c01680d20ebd727
-  data.tar.gz: 9e67721caad84d06736b68e7c1eedf43dc71d1ad72be48675b6508effc5b0e40
+  metadata.gz: f16929054076669742906dca54ea4cc907c5b4adb12d6454261dce202baa5280
+  data.tar.gz: '08cbb875607091af2b3ae0a27f96bb735532527f4e64df534f19dda6c0ea74af'
 SHA512:
-  metadata.gz: 2adcbd119334a2050cfd01e9b75ee74e7ba5061f8ca5bb96c9c3472096c43d431a151851129db0099ac24b39bb8c04db8811ccc740034d409fb9d814fa218c06
-  data.tar.gz: 691e7617d19b4670a8e4e3b1c3ed01fd4a01745632d9be6b6a6e33a45834ba046baa6ae5f19bac0d7c1721e7dc981bbeeb9c2b189499e17bd26240f368df9619
+  metadata.gz: '08fa7c0802ba80260e7c3c7a06e3509d363d314cb49618c8af728f1eb5ee33bc44f9c71f4197d010485583d6c251eb8796c2e62fa30aa81a6bb6124ec0d73caf'
+  data.tar.gz: a01441b1995ec469729deb899c68ff54955a0b4083d943ee137f293d7b0b0202f186263d47dd3f96d1a3f1257686a5394677a8da667311b05870606bfc9ba9f3

data/.gitignore

@@ -11,5 +11,7 @@
 # rspec failure tracking
 .rspec_status
 
+.ruby-version
+
 # todo
 todo.md

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [Unreleased](https://github.com/iberianpig/fusuma/tree/HEAD)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.3.3...HEAD)
+
+**Closed issues:**
+
+- Can not use fusuma with a error: NoMethodError [\#149](https://github.com/iberianpig/fusuma/issues/149)
+
+## [v1.3.3](https://github.com/iberianpig/fusuma/tree/v1.3.3) (2020-02-10)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.3.2...v1.3.3)
+
 ## [v1.3.2](https://github.com/iberianpig/fusuma/tree/v1.3.2) (2020-01-07)
 
 [Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.3.1...v1.3.2)
@@ -107,7 +119,6 @@
 
 - Interval and threshold specific for a trigger [\#92](https://github.com/iberianpig/fusuma/pull/92) ([irq](https://github.com/irq))
 - Fix spelling: Elementary to elementary [\#90](https://github.com/iberianpig/fusuma/pull/90) ([ryonakano](https://github.com/ryonakano))
-- Update rake requirement to ~\> 12.3 [\#72](https://github.com/iberianpig/fusuma/pull/72) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v0.9.2](https://github.com/iberianpig/fusuma/tree/v0.9.2) (2018-07-19)
 
@@ -197,6 +208,7 @@
 **Merged pull requests:**
 
 - Assigning commands [\#73](https://github.com/iberianpig/fusuma/pull/73) ([iberianpig](https://github.com/iberianpig))
+- Update rake requirement to ~\> 12.3 [\#72](https://github.com/iberianpig/fusuma/pull/72) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v0.3.5](https://github.com/iberianpig/fusuma/tree/v0.3.5) (2018-01-01)
 

data/README.md

@@ -1,4 +1,4 @@
-# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://travis-ci.org/iberianpig/fusuma.svg?branch=master)](https://travis-ci.org/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)
 
 Fusuma is multitouch gesture recognizer.
 This gem makes your linux able to recognize swipes or pinchs and assign commands to them.

data/lib/fusuma.rb

@@ -127,9 +127,6 @@ module Fusuma
       main_events, modifiers = events.partition { |event| event.record.mergable? }
       return nil unless (main_event = main_events.first)
 
-      # NOTE: clear buffers after detected main_event
-      @buffers.each(&:clear)
-
       main_event.record.merge(records: modifiers.map(&:record))
       main_event
     end

data/lib/fusuma/device.rb

@@ -61,71 +61,71 @@ module Fusuma
         end
         line_parser.generate_devices
       end
+    end
 
-      # parse line and generate devices
-      class LineParser
-        attr_reader :lines
-
-        def initialize
-          @lines = []
-        end
+    # parse line and generate devices
+    class LineParser
+      attr_reader :lines
 
-        # @param line [String]
-        def push(line)
-          lines.push(line)
-        end
+      def initialize
+        @lines = []
+      end
 
-        # @return [Array]
-        def generate_devices
-          lines.each_with_object([]) do |line, devices|
-            attributes = extract_attribute(line: line)
+      # @param line [String]
+      def push(line)
+        lines.push(line)
+      end
 
-            next if attributes == {}
+      # @return [Array]
+      def generate_devices
+        lines.each_with_object([]) do |line, devices|
+          attributes = extract_attribute(line: line)
 
-            if attributes[:name]
-              # when detected new line including device name
-              devices << Device.new # next device
-            end
+          next if attributes == {}
 
-            devices.last.assign_attributes(attributes) unless devices.empty?
+          if attributes[:name]
+            # when detected new line including device name
+            devices << Device.new # next device
           end
+
+          devices.last.assign_attributes(attributes) unless devices.empty?
         end
+      end
 
-        # @param line [String]
-        # @return [Hash]
-        def extract_attribute(line:)
-          if (id = id_from(line))
-            { id: id }
-          elsif (name = name_from(line))
-            { name: name }
-          elsif (available = available_from(line))
-            { available: available }
-          else
-            {}
-          end
+      # @param line [String]
+      # @return [Hash]
+      def extract_attribute(line:)
+        if (id = id_from(line))
+          { id: id }
+        elsif (name = name_from(line))
+          { name: name }
+        elsif (available = available_from(line))
+          { available: available }
+        else
+          {}
         end
+      end
 
-        def id_from(line)
-          line.match('^Kernel:[[:space:]]*') do |m|
-            m.post_match.match(/event[0-9]+/).to_s
-          end
+      def id_from(line)
+        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|
-            m.post_match.strip
-          end
+      def name_from(line)
+        line.match('^Device:[[: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}
+      def available_from(line)
+        # NOTE: is natural scroll available?
+        if line =~ /^Nat.scrolling: /
+          return false if line =~ %r{n/a}
 
-            return true # disabled / enabled
-          end
-          nil
+          return true # disabled / enabled
         end
+        nil
       end
     end
   end

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

@@ -8,6 +8,14 @@ module Fusuma
       # manage events and generate command
       class GestureBuffer < Buffer
         DEFAULT_SOURCE = 'libinput_gesture_parser'
+        DEFAULT_SECONDS_TO_KEEP = 0.1
+
+        def config_param_types
+          {
+            'source': [String],
+            'seconds_to_keep': [Float, Integer]
+          }
+        end
 
         # @param event [Event]
         def buffer(event)
@@ -17,6 +25,8 @@ module Fusuma
           # - other event buffer
           return if event&.tag != source
 
+          delete_old_events
+
           @events.push(event)
           clear unless updating?
         end
@@ -60,6 +70,16 @@ module Fusuma
 
         private
 
+        # Delete old events pushed before 0.1sec
+        def delete_old_events
+          @seconds_to_keep ||= (config_params(:seconds_to_keep) || DEFAULT_SECONDS_TO_KEEP)
+          @events.each do |e|
+            break if Time.now - e.time < @seconds_to_keep
+
+            @events.delete(e)
+          end
+        end
+
         def updating?
           return true unless @events.last.record.status =~ /begin|end/
         end

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

@@ -38,7 +38,7 @@ module Fusuma
           @version ||= `#{version_command}`.strip
         end
 
-        # @yield [line] gives a line in libinput list-devices output to the block
+        # @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)
@@ -47,7 +47,7 @@ module Fusuma
           end
         end
 
-        # @yield [line] gives a line in libinput debug-events output to the block
+        # @yieldparam [String] gives a line in libinput debug-events output to the block
         def debug_events
           prefix = 'stdbuf -oL --'
           options = [*libinput_options]

data/lib/fusuma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler