fusuma-plugin-tap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4bc96ae652bcda2a8d1cf2377ba820a07ee825153d6e1882522e58b2ab6858d
-  data.tar.gz: f4f4d27eb30547306affe7b89667bbf8eea53e7da2aa0799acd88641593b1b22
+  metadata.gz: 60bbd57c723571a4116d0faf32b84b4857896be3fc13100095f612dde65c3a61
+  data.tar.gz: b6c3a85d4d2c97ddd8d465ea4489e970e0aec92e46bf1a85424c90a32531f0db
 SHA512:
-  metadata.gz: e7b8e79803a6d2e2cbd0d3469a041620b7b89fb4e240815b6a91716a67142a42e02192e1fa32a68a964428fb90adc48955dd63894e6cbc551c6509892a34473c
-  data.tar.gz: 2abf4137e293d5f0ed47a43258ee8027623347b1b178ccb665e27dccc06bfa49517af73f6902d0f41ca83a523f1899e2e8ce60b5764de02f87b3b86342d345bd
+  metadata.gz: 4cd7807637d102af21685411058462c2c1c895c655fb7de337bdc72d4e068bd883e7e8dc97fe8d37a7486e1bf6a71cae987d330517c33bd793512bc5a708e24b
+  data.tar.gz: d8513da9b395013a7cb5042d0b5d71f9645f09022d872decc5983ff9c860cf7e410bf6bcf336ec9cc4bcb059bdefeab821d12528c972852c04fd7bc244a1e293

data/.gitignore

@@ -10,3 +10,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# direnv
+.envrc

data/.rubocop.yml

@@ -3,8 +3,24 @@ inherit_from: .rubocop_todo.yml
 Metrics/ModuleLength:
   Exclude:
     - "**/*_spec.rb"
+    - 'lib/fusuma/plugin/parsers/tap_parser.rb'
+    - 'lib/fusuma/plugin/parsers/tap_detector.rb'
 
 Metrics/BlockLength:
   Exclude:
     - "**/*_spec.rb"
     - "fusuma.gemspec"
+    - 'lib/fusuma/plugin/parsers/tap_parser.rb'
+    - 'lib/fusuma/plugin/parsers/tap_detector.rb'
+
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/fusuma/plugin/parsers/tap_parser.rb'
+    - 'lib/fusuma/plugin/parsers/tap_detector.rb'
+
+Layout/LineLength:
+  Max: 100
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fusuma/plugin/parsers/tap_parser.rb'
+    - 'lib/fusuma/plugin/parsers/tap_detector.rb'

data/.rubocop_todo.yml

@@ -1,12 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-20 13:09:40 +0900 using RuboCop version 0.80.0.
+# on 2020-04-20 01:40:44 +0900 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'fusuma-plugin-tap.gemspec'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'fusuma-plugin-tap.gemspec'
+
+# Offense count: 5
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 38
 
@@ -14,36 +30,26 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 26
+  Max: 33
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 22
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 64
+  Max: 45
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 10
 
 # Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/fusuma/plugin/detectors/tap_detector.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
+Style/Documentation:
   Exclude:
-    - 'lib/fusuma/plugin/detectors/tap_detector.rb'
-
-# Offense count: 32
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 135
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'bin/evemu_recorder.rb'

data/.travis.yml

@@ -2,6 +2,20 @@
 sudo: false
 language: ruby
 cache: bundler
+
+env:
+  matrix:
+    - SPEC_LIBINPUT_VERSION=1.10.4
+    - SPEC_LIBINPUT_VERSION=1.14.1
+
+cache:
+  directories:
+  - vendor/bundle
+
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 2.0.1
+  - 2.3.1
+  - 2.4
+  - 2.5
+  - 2.6
+
+before_install: gem install bundler --no-document -v 2.0.1

data/bin/console

@@ -9,5 +9,21 @@ require 'fusuma/plugin/tap'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
+def reload!(print = true)
+  puts 'Reloading ...' if print
+  # Main project directory.
+  root_dir = File.expand_path('..', __dir__)
+  # Directories within the project that should be reloaded.
+  reload_dirs = %w[lib]
+  # Loop through and reload every file in all relevant project directories.
+  reload_dirs.each do |dir|
+    glob = Dir.glob("#{root_dir}/#{dir}/**/*.rb")
+    additional = ['bin/libinput_debug_events_generator.rb']
+    (glob | additional).each { |f| load(f) }
+  end
+  # Return true when complete.
+  true
+end
+
 require 'pry'
 Pry.start

data/bin/evemu_recorder.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'optparse'
+require 'fusuma/device'
+
+class EvemuRecorder
+  def initialize(option)
+    @gesture_name = option[:gesture_name]
+    @overwrite = option[:overwrite]
+    @record_command = 'evemu-record'
+  end
+
+  def record
+    if File.exist?(filepath)
+      raise "exist file: #{@filepath}" unless @overwrite
+    end
+
+    puts '----DO NOT TOUCH YOUR TRACKPAD----'
+
+    require 'pty'
+    require 'timeout'
+    PTY.spawn("#{@record_command} /dev/input/#{device_id}") do |r, w, pid|
+      w.close_write
+      r.sync = true
+      log = ''
+
+      begin
+        log = r.read_nonblock(100_000)
+      rescue IO::EAGAINWaitReadable
+        retry
+      end
+
+      begin
+        Timeout.timeout(5) do
+          loop { log += r.getc }
+        end
+      rescue Timeout::Error
+        puts 'cut out device infos'
+      end
+
+      file = File.open(filepath, 'w')
+      file.puts log
+      file.close
+
+      puts Process.kill(:TERM, pid)
+      Process.wait(pid)
+    end
+  end
+
+  private
+
+  def mkdir
+    dir = 'spec/fusuma/plugin/parsers/evemu'
+    FileUtils.mkdir_p(dir)
+  end
+
+  def filepath
+    "#{mkdir.first}/#{@gesture_name}"
+  end
+
+  def device_id
+    Fusuma::Device.available.first.id
+  end
+
+  def version
+    @version ||= `#{@list_devices} --version`.chomp
+  end
+end
+
+option = {}
+opt = OptionParser.new
+
+opt.on('-f', 'force overwrite record file') do |v|
+  option[:overwrite] = v
+end
+
+opt.on('-g', '--gesture_name=', 'gesture filename: like 1finger-tap.txt') do |v|
+  option[:gesture_name] = v
+end
+
+opt.parse!(ARGV)
+
+raise 'require filename -g 1finger-tap.txt' unless option[:gesture_name]
+
+EvemuRecorder.new(option).record

data/bin/libinput_debug_events_generator.rb

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'pathname'
+require 'fusuma/device'
+
+# Generate libinput generator
+class LibinputDebugEventsGenerator
+  def initialize(evemu_record:)
+    @evemu_record = evemu_record
+    @gesture_name = Pathname.new(evemu_record).basename
+    @list_devices = ENV.fetch('LIBINPUT_LIST_DEVICES', 'libinput list-devices')
+    @debug_events = ENV.fetch('LIBINPUT_DEBUG_EVENTS', 'libinput debug-events')
+  end
+
+  def generate_debug_events
+    if File.exist?(filepath)
+      puts "exist file: #{filepath}"
+      return
+    end
+
+    require 'pty'
+    require 'timeout'
+
+    puts "----#{@gesture_name}--------------"
+    puts '----DO NOT TOUCH YOUR TRACKPAD----'
+    sleep 3
+
+    options = "--enable-tap --verbose --device=/dev/input/#{device_id}"
+
+    PTY.spawn("#{@debug_events} #{options}") do |r, w, pid|
+      w.close_write
+      r.sync = true
+
+      begin
+        Timeout.timeout(5) do
+          loop { print r.getc }
+        end
+      rescue Timeout::Error
+        puts 'cut out device infos'
+      end
+
+      command = "evemu-play /dev/input/#{device_id} < #{@evemu_record}"
+
+      begin
+        Timeout.timeout(3) do
+          Kernel.system(command)
+        end
+      rescue Timeout::Error
+        puts command
+      end
+
+      log = ''
+      begin
+        Timeout.timeout(5) do
+          loop { log += r.getc }
+        end
+      rescue Timeout::Error
+        puts 'cut out device infos'
+      end
+
+      r.close
+      puts log
+
+      file = File.open(filepath, 'w')
+      file.puts log
+      file.close
+
+      puts Process.kill(:TERM, pid)
+      Process.wait(pid)
+      sleep 3
+    end
+  end
+
+  private
+
+  def mkdir
+    dir = "spec/fusuma/plugin/parsers/#{version}"
+    FileUtils.mkdir_p(dir)
+  end
+
+  def filepath
+    "#{mkdir.first}/#{@gesture_name}"
+  end
+
+  def device_id
+    Fusuma::Device.available.first.id
+  end
+
+  def version
+    @version ||= `#{@list_devices} --version`.chomp
+  end
+end
+
+evemu_records = Dir.glob 'spec/fusuma/plugin/parsers/evemu/*'
+
+evemu_records.each do |evemu_record|
+  LibinputDebugEventsGenerator
+    .new(evemu_record: evemu_record)
+    .generate_debug_events
+end

data/fusuma-plugin-tap.gemspec

@@ -28,11 +28,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'fusuma', '~> 1.5'
 
+  spec.add_development_dependency 'systemu'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'
-  spec.add_development_dependency 'pry-byebug', '~> 3.4'
-  spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'pry-inline'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'reek'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/fusuma/plugin/detectors/tap_detector.rb

@@ -38,9 +38,9 @@ module Fusuma
 
           index = create_index(finger: finger, direction: direction)
 
-          return create_event(record: Events::Records::IndexRecord.new(index: index)) if enough?(index: index, direction: direction)
+          return unless enough?(index: index, direction: direction)
 
-          nil
+          create_event(record: Events::Records::IndexRecord.new(index: index))
         end
 
         # @return [Config::Index]
@@ -56,7 +56,9 @@ module Fusuma
         def hold?(buffer, holding_time)
           return false if holding_time < 1
 
-          true if buffer.finger == 4 || buffer.events.any? { |e| e.record.status == 'hold' }
+          return true if buffer.finger == 4
+
+          true if buffer.events.any? { |e| e.record.status == 'hold' }
         end
 
         def tap?(buffer, holding_time)

data/lib/fusuma/plugin/parsers/tap_parser.rb

@@ -55,12 +55,12 @@ module Fusuma
 
           case record.to_s
             # BEGIN
-          when /\stap state:\s.*TAP_STATE_IDLE → TAP_EVENT_TOUCH → TAP_STATE_TOUCH/
+          when /\stap(| state):\s.*TAP_STATE_IDLE → TAP_EVENT_TOUCH → TAP_STATE_TOUCH/
             status = 'begin'
             finger = 1
 
             # TOUCH
-          when /\stap state:\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_TOUCH → (#{STATE[:touches].join('|')})/
+          when /\stap(| state):\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_TOUCH → (#{STATE[:touches].join('|')})/
 
             status = 'touch'
 
@@ -76,7 +76,7 @@ module Fusuma
                      end
 
           # HOLD
-          when /\stap state:\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_TIMEOUT → (#{STATE[:holds].join('|')})/
+          when /\stap(| state):\s.*(#{STATE[:touches].join('|')}) → TAP_EVENT_TIMEOUT → (#{STATE[:holds].join('|')})/
 
             status = 'hold'
 
@@ -93,13 +93,13 @@ module Fusuma
                        1
                      end
           # KEEP
-          when /\sgesture state:\s/
-            # NOTE: treat the "gesture state:" as KEEP
+          when /\sgesture(| state):\s/
+            # NOTE: treat the "gesture(| state):" as KEEP
             status = 'keep'
             finger = 0
 
           # RELEASE
-          when /\stap state:\s.*(#{(STATE[:touches] | STATE[:holds]).join('|')}) → TAP_EVENT_RELEASE → (#{STATE[:releases].join('|')})/
+          when /\stap(| state):\s.*(#{(STATE[:touches] | STATE[:holds]).join('|')}) → TAP_EVENT_RELEASE → (#{STATE[:releases].join('|')})/
 
             status = 'release'
             matched = Regexp.last_match
@@ -116,7 +116,7 @@ module Fusuma
                      end
 
           # END
-          when /\stap state:\s.*(#{STATE[:releases].join('|')}) → TAP_EVENT_(.*) → #{STATE[:idle]}/
+          when /\stap(| state):\s.*(#{STATE[:releases].join('|')}) → TAP_EVENT_(.*) → #{STATE[:idle]}/
             status = 'end'
 
             matched = Regexp.last_match

data/lib/fusuma/plugin/tap/version.rb

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Tap
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/lib/fusuma/plugin/tap.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'fusuma/plugin/detectors/detector.rb'
+require 'fusuma/plugin/parsers/parser.rb'
+require 'fusuma/plugin/buffers/buffer.rb'
+
 require_relative './tap/version'
 require_relative './detectors/tap_detector.rb'
 require_relative './parsers/tap_parser.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-tap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,49 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github_changelog_generator
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.14'
   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'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: pry-inline
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,6 +168,8 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/evemu_recorder.rb
+- bin/libinput_debug_events_generator.rb
 - bin/setup
 - fusuma-plugin-tap.gemspec
 - lib/fusuma/plugin/buffers/tap_buffer.rb