fusuma-plugin-sendkey 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27660bea09b33620ab905e3b112cf0f9884b3617097daadd6d8ca03d2d5c14b
-  data.tar.gz: 70b1f7ddffaa8d874a44feaec361c60d0bca6744f30ec6a5c6f3c3efb1fe2a9f
+  metadata.gz: 23d68a2efd5f41fe72149b824d2ccb15d9153b70e177e0c6547c6fdc531d7015
+  data.tar.gz: 206d32b21db53813a0213aa6efa7f4005132332ad06f5d360bb57aed291bd61c
 SHA512:
-  metadata.gz: 0257fa54b43876536bb7729c74f05ff06d0a12e57885b5d544b9bdd209815780811496296339efca5353102f14fb811c1be7b82839b51542463c3cbbc90ad6b4
-  data.tar.gz: '049d2d9cf06c538800189db3addb7508e4c98a4390c3da8eb1a41dae2eb007fe11246fbfb86fe2ac76c131a81c7fa7255d2f7951f23d37fea92780920761617a'
+  metadata.gz: d8565fdb87ae1ed53a903587c45fc529b780983e845be2f81601e72160244de3852fdc63d8d1f9960cb20c30b82e86713a4c56c393064cf67e04548f1c187323
+  data.tar.gz: 84f81cc005e1cfe105844f0108241a8e4c2c99f454a2ae5dbfa52023c4c094efb534f87f7c6f6705647b5f4fd556387c8d3ef6def58a6141c39cc94faa6dd6a2

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
   - 2.6.1
 before_install: 
  - gem install bundler -v 2.0.1
- - sudo apt-get -y install evemu-tools libevdev-dev
+ - sudo apt-get -y install libevdev-dev

data/README.md

@@ -1,8 +1,8 @@
 # Fusuma::Plugin::Sendkey [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-sendkey.svg)](https://badge.fury.io/rb/fusuma-plugin-sendkey) [![Build Status](https://travis-ci.com/iberianpig/fusuma-plugin-sendkey.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma-plugin-sendkey)
 
-[Fusuma](https://github.com/iberianpig/fusuma) plugin that sending virtual keyboard events
+[Fusuma](https://github.com/iberianpig/fusuma) plugin to send keyboard events
 
-* Send keyboard events with writing event /dev/input/eventN
+* Emulate keyboard events with evdev
 * This plugin is wayland compatible and alternative to xdotool
 
 ## Installation
@@ -12,7 +12,7 @@ Run the following code in your terminal.
 ### Install dependencies
 
 ```sh
-$ sudo apt-get install libevdev-dev ruby-ffi
+$ sudo apt-get install libevdev-dev
 ```
 
 ### Install fusuma-plugin-sendkey

data/exe/fusuma-sendkey

@@ -20,7 +20,7 @@ end
 opt.parse!(ARGV)
 
 if option[:list]
-  puts Fusuma::Plugin::Sendkey::Keyboard.new.search_codes
+  puts Fusuma::Plugin::Sendkey::Keyboard.new(name_pattern: nil).search_codes
   return
 end
 

data/fusuma-plugin-sendkey.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['iberianpig']
   spec.email         = ['yhkyky@gmail.com']
 
-  spec.summary       = 'Fusuma plugin that sending virtual keyboard events'
-  spec.description   = 'Fusuma::Plugin::Sendkey emulate keyboard events with evemu-event'
+  spec.summary       = 'Fusuma plugin to send keyboard events'
+  spec.description   = 'Fusuma::Plugin::Sendkey emulate keyboard events with evdev'
   spec.homepage      = 'https://github.com/iberianpig/fusuma-plugin-sendkey'
   spec.license       = 'MIT'
 
@@ -24,9 +24,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'evdev', '~> 1.0'
-  spec.add_dependency 'fusuma', '~> 1.5'
-  spec.add_dependency 'linux_input', '~> 1.1'
+  spec.add_dependency 'fusuma', '~> 1.7'
+  spec.add_dependency 'revdev'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.14'

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

@@ -9,7 +9,7 @@ module Fusuma
       class SendkeyExecutor < Executor
         def config_param_types
           {
-            'device_path': String
+            'device_name': String
           }
         end
 
@@ -39,8 +39,8 @@ module Fusuma
 
         def keyboard
           @keyboard ||= begin
-                          device = Sendkey::Device.new(path: config_params(:device_path))
-                          Sendkey::Keyboard.new(device: device)
+                          name_pattren = config_params(:device_name)
+                          Sendkey::Keyboard.new(name_pattern: name_pattren)
                         end
         end
 

data/lib/fusuma/plugin/sendkey/device.rb

@@ -1,23 +1,12 @@
 # frozen_string_literal: true
 
-require 'evdev'
-
 module Fusuma
   module Plugin
     module Sendkey
       # handle Evdev device
       class Device
-        def initialize(path: nil)
-          return if path && (@evdev = Evdev.new(path))
-
-          (0..99).lazy.find do |i|
-            evdev = Evdev.new("/dev/input/event#{i}")
-            # NOTE: find keyboard device
-            @evdev = evdev if evdev.supports_event?('KEY_LEFTALT')
-          rescue Errno::ENOENT # No such file or directory
-            false
-            # TODO: rescue Errno::EACCES
-          end
+        def initialize(path:)
+          @evdev = Revdev::EventDevice.new(path)
         end
 
         def path
@@ -26,10 +15,8 @@ module Fusuma
           @path ||= @evdev.file.path
         end
 
-        def support?(keycode)
-          @evdev.supports_event?(keycode)
-        rescue NameError
-          false
+        def write_event(event)
+          @evdev.write_input_event(event)
         end
       end
     end

data/lib/fusuma/plugin/sendkey/keyboard.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'linux_input'
-require 'fcntl'
+require 'revdev'
+require 'fusuma/device'
+
 require_relative './device.rb'
 
 module Fusuma
@@ -9,10 +10,20 @@ module Fusuma
     module Sendkey
       # Emulate Keyboard
       class Keyboard
-        def initialize(device: nil)
-          @device = device || Device.new
+        def initialize(name_pattern: nil)
+          name_pattern ||= 'keyboard'
+          device = find_device(name_pattern: name_pattern)
+
+          if device.nil?
+            warn "sendkey: Keyboard /#{name_pattern}/ is not found"
+            exit(1)
+          end
+
+          @device = Device.new(path: "/dev/input/#{device.id}")
         end
 
+        attr_writer :device
+
         # @param param [String]
         def type(param:)
           return unless param.is_a?(String)
@@ -24,7 +35,6 @@ module Fusuma
           key_sync(press: true)
           keycodes.reverse.map { |keycode| key_event(keycode: keycode, press: false) }
           key_sync(press: false)
-          device_file.close
         end
 
         # @param param [String]
@@ -35,55 +45,54 @@ module Fusuma
           keycodes.all? { |keycode| support?(keycode) }
         end
 
-        def device_file
-          return @device_file if @device_file && !@device_file.closed?
-
-          @device_file = File.open(@device.path, Fcntl::O_WRONLY | Fcntl::O_NDELAY)
-        end
-
         def key_event(keycode:, press: true)
-          event = LinuxInput::InputEvent.new
-          event[:time] = LinuxInput::Timeval.new
-          event[:time][:tv_sec] = Time.now.to_i
-          event[:type] = LinuxInput::EV_KEY
-          event[:code] = keycode_const(keycode)
-          event[:value] = press ? 1 : 0
-          device_file.syswrite(event.pointer.read_bytes(event.size))
+          event = Revdev::InputEvent.new(
+            nil,
+            Revdev.const_get(:EV_KEY),
+            Revdev.const_get(keycode),
+            press ? 1 : 0
+          )
+          @device.write_event(event)
         end
 
         def key_sync(press: true)
-          event = LinuxInput::InputEvent.new
-          event[:time] = LinuxInput::Timeval.new
-          event[:time][:tv_sec] = Time.now.to_i
-          event[:type] = LinuxInput::EV_SYN
-          event[:code] = LinuxInput::SYN_REPORT
-          event[:value] = press ? 1 : 0
-          device_file.syswrite(event.pointer.read_bytes(event.size))
+          event = Revdev::InputEvent.new(
+            nil,
+            Revdev.const_get(:EV_SYN),
+            Revdev.const_get(:SYN_REPORT),
+            press ? 1 : 0
+          )
+          @device.write_event(event)
         end
 
         def support?(keycode)
           @supported_code ||= {}
-          @supported_code[keycode] ||= if @device.support?(keycode)
+          @supported_code[keycode] ||= if find_code(keycode: keycode)
                                          true
                                        else
                                          search_candidates(keycode: keycode)
-                                         exit(1)
                                        end
         end
 
         def search_candidates(keycode:)
-          candidates = search_codes(keycode: keycode)
+          query = keycode&.upcase&.gsub('KEY_', '')
+
+          candidates = search_codes(query: query)
 
           warn "Did you mean? #{candidates.join(' / ')}" unless candidates.empty?
           warn "sendkey: #{remove_prefix(keycode)} is unsupported."
         end
 
-        def search_codes(keycode: nil)
+        def search_codes(query: nil)
+          Revdev.constants
+                .select { |c| c[/KEY_.*#{query}.*/] }
+                .map { |c| c.to_s.gsub('KEY_', '') }
+        end
+
+        def find_code(keycode: nil)
           query = keycode&.upcase&.gsub('KEY_', '')
-          LinuxInput.constants
-                    .select { |c| c[/KEY_.*#{query}.*/] }
-                    .select { |c| @device.support?(c) }
-                    .map { |c| c.to_s.gsub('KEY_', '') }
+
+          Revdev.constants.find { |c| c == "KEY_#{query}".to_sym }
         end
 
         def keycode_const(keycode)
@@ -98,6 +107,10 @@ module Fusuma
 
         private
 
+        def find_device(name_pattern:)
+          Fusuma::Device.all.find { |d| d.name.match(/#{name_pattern}/) }
+        end
+
         def split_param(param)
           param.split('+').map { |code| key_prefix(code) }
         end

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Sendkey
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-sendkey
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: evdev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fusuma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: linux_input
+  name: revdev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fusuma::Plugin::Sendkey emulate keyboard events with evemu-event
+description: Fusuma::Plugin::Sendkey emulate keyboard events with evdev
 email:
 - yhkyky@gmail.com
 executables:
@@ -241,5 +227,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Fusuma plugin that sending virtual keyboard events
+summary: Fusuma plugin to send keyboard events
 test_files: []