fusuma 1.9.0 → 2.0.0.pre

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative './buffer.rb'
+
+module Fusuma
+  module Plugin
+    module Buffers
+      # manage events and generate command
+      class TimerBuffer < Buffer
+        DEFAULT_SOURCE = 'timer_input'
+        DEFAULT_SECONDS_TO_KEEP = 60
+
+        def config_param_types
+          {
+            'source': [String],
+            'seconds_to_keep': [Float, Integer]
+          }
+        end
+
+        # @param event [Event]
+        # @return [Buffer, NilClass]
+        def buffer(event)
+          return if event&.tag != source
+
+          @events.push(event)
+          self
+        end
+
+        def clear_expired(current_time: Time.now)
+          @seconds_to_keep ||= (config_params(:seconds_to_keep) || DEFAULT_SECONDS_TO_KEEP)
+          @events.each do |e|
+            break if current_time - e.time < @seconds_to_keep
+
+            MultiLogger.debug("#{self.class.name}##{__method__}")
+
+            @events.delete(e)
+          end
+        end
+
+        def empty?
+          @events.empty?
+        end
+      end
+    end
+  end
+end

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

@@ -14,10 +14,13 @@ module Fusuma
           Delta = Struct.new(:move_x, :move_y, :zoom, :rotate)
 
           # @param status [String]
+          # @param gesture [String]
+          # @param finger [String, Integer]
+          # @param direction [Delta, NilClass]
           def initialize(status:, gesture:, finger:, direction:)
             @status  = status
             @gesture = gesture
-            @finger  = finger
+            @finger  = finger.to_i
             @direction = direction
           end
         end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'posix/spawn'
 require_relative './executor.rb'
 
 module Fusuma
@@ -12,11 +13,8 @@ module Fusuma
             break unless command
 
             MultiLogger.info(command: command)
-            pid = fork do
-              Process.daemon(true)
-              exec(command.to_s)
-            end
 
+            pid = POSIX::Spawn.spawn(command.to_s)
             Process.detach(pid)
           end
         end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative './filter.rb'
+require_relative '../../libinput_command.rb'
+
+module Fusuma
+  module Plugin
+    module Filters
+      # Filter device log
+      class LibinputTimeoutFilter < Filter
+        DEFAULT_SOURCE = 'libinput_command_input'
+
+        # @return [TrueClass] when keeping it
+        # @return [FalseClass] when discarding it
+        def keep?(record)
+          record.to_s == LibinputCommand::TIMEOUT_MESSAGE
+        end
+      end
+    end
+  end
+end

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

@@ -5,15 +5,37 @@ require_relative '../events/event.rb'
 
 module Fusuma
   module Plugin
-    # input class
     module Inputs
       # Inherite this base
+      # @abstract Subclass and override {#io} to implement
       class Input < Base
-        def run
+        # Wait multiple inputs until it becomes readable
+        # and read lines with nonblock
+        # @param inputs [Array<Input>]
+        # @return Event
+        def self.select(inputs)
+          ios = IO.select(inputs.map(&:io))
+          io = ios&.first&.first
+
+          input = inputs.find { |i| i.io == io }
+
+          begin
+            line = io.readline_nonblock("\n").chomp
+          rescue StandardError => e
+            warn e
+            exit 1
+          end
+
+          input.create_event(record: line)
+        end
+
+        # @return [IO]
+        def io
           raise NotImplementedError, "override #{self.class.name}##{__method__}"
         end
 
-        def event(record: 'dummy input')
+        # @return [Event]
+        def create_event(record: 'dummy input')
           Events::Event.new(tag: tag, record: record).tap do |e|
             MultiLogger.debug(input_event: e)
           end
@@ -26,3 +48,24 @@ module Fusuma
     end
   end
 end
+
+# ref: https://github.com/Homebrew/brew/blob/6b2dbbc96f7d8aa12f9b8c9c60107c9cc58befc4/Library/Homebrew/extend/io.rb
+class IO
+  def readline_nonblock(sep = $INPUT_RECORD_SEPARATOR)
+    line = +''
+    buffer = +''
+
+    loop do
+      break if buffer == sep
+
+      read_nonblock(1, buffer)
+      line.concat(buffer)
+    end
+
+    line.freeze
+  rescue IO::WaitReadable, EOFError => e
+    raise e if line.empty?
+
+    line.freeze
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../../libinput_command.rb'
 require_relative './input.rb'
 
 module Fusuma
@@ -13,16 +14,29 @@ module Fusuma
             'enable-dwt': [TrueClass, FalseClass],
             'enable-tap': [TrueClass, FalseClass],
             'show-keycodes': [TrueClass, FalseClass],
-            'verbose': [TrueClass, FalseClass]
+            'verbose': [TrueClass, FalseClass],
+            'libinput-debug-events': [String],
+            'libinput-list-devices': [String]
           }
         end
 
-        def run
-          LibinputCommand.new(libinput_options: libinput_options).debug_events do |line|
-            yield event(record: line)
-          end
+        # @return [IO]
+        def io
+          @io ||= command.debug_events
         end
 
+        # @return [LibinputCommand]
+        def command
+          @command ||= LibinputCommand.new(
+            libinput_options: libinput_options,
+            commands: {
+              debug_events_command: debug_events_command,
+              list_devices_command: list_devices_command
+            }
+          )
+        end
+
+        # @return [Array]
         def libinput_options
           device = ("--device='#{config_params(:device)}'" if config_params(:device))
           enable_tap = '--enable-tap' if config_params(:'enable-tap')
@@ -37,6 +51,14 @@ module Fusuma
             verbose
           ].compact
         end
+
+        def debug_events_command
+          config_params(:'libinput-debug-events')
+        end
+
+        def list_devices_command
+          config_params(:'libinput-list-devices')
+        end
       end
     end
   end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative './input.rb'
+
+module Fusuma
+  module Plugin
+    module Inputs
+      # libinput commands wrapper
+      class TimerInput < Input
+        DEFAULT_INTERVAL = 0.3
+        def config_param_types
+          {
+            'interval': [Float]
+          }
+        end
+
+        attr_reader :writer
+
+        def io
+          @io ||= begin
+                    reader, writer = create_io
+                    @pid = start(reader, writer)
+
+                    reader
+                  end
+        end
+
+        def start(reader, writer)
+          pid = fork do
+            timer_loop(reader, writer)
+          end
+          Process.detach(pid)
+          writer.close
+          pid
+        end
+
+        def timer_loop(reader, writer)
+          reader.close
+          begin
+            loop do
+              sleep interval
+              writer.puts 'timer'
+            end
+          rescue Errno::EPIPE
+            exit 0
+          rescue StandardError => e
+            MultiLogger.error e
+          end
+        end
+
+        private
+
+        def create_io
+          IO.pipe
+        end
+
+        def interval
+          config_params(:interval) || DEFAULT_INTERVAL
+        end
+      end
+    end
+  end
+end

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = '1.9.0'
+  VERSION = '2.0.0.pre'
 end

metadata

@@ -1,163 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - iberianpig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-inline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -177,6 +37,7 @@ files:
 - ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/pull_request_template.md"
 - ".github/stale.yml"
 - ".gitignore"
 - ".reek.yml"
@@ -186,6 +47,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -198,6 +60,8 @@ files:
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
 - lib/fusuma/config/index.rb
+- lib/fusuma/config/searcher.rb
+- lib/fusuma/config/yaml_duplication_checker.rb
 - lib/fusuma/device.rb
 - lib/fusuma/environment.rb
 - lib/fusuma/libinput_command.rb
@@ -205,6 +69,7 @@ files:
 - lib/fusuma/plugin/base.rb
 - lib/fusuma/plugin/buffers/buffer.rb
 - lib/fusuma/plugin/buffers/gesture_buffer.rb
+- lib/fusuma/plugin/buffers/timer_buffer.rb
 - lib/fusuma/plugin/detectors/detector.rb
 - lib/fusuma/plugin/detectors/pinch_detector.rb
 - lib/fusuma/plugin/detectors/rotate_detector.rb
@@ -218,8 +83,10 @@ files:
 - lib/fusuma/plugin/executors/executor.rb
 - lib/fusuma/plugin/filters/filter.rb
 - lib/fusuma/plugin/filters/libinput_device_filter.rb
+- lib/fusuma/plugin/filters/libinput_timeout_filter.rb
 - lib/fusuma/plugin/inputs/input.rb
 - lib/fusuma/plugin/inputs/libinput_command_input.rb
+- lib/fusuma/plugin/inputs/timer_input.rb
 - lib/fusuma/plugin/manager.rb
 - lib/fusuma/plugin/parsers/libinput_gesture_parser.rb
 - lib/fusuma/plugin/parsers/parser.rb
@@ -229,7 +96,7 @@ licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,12 +107,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux
 test_files: []