uinput-device 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5cdcee9ce23ba8f3f887e2a6a74ff5cc3c796a
-  data.tar.gz: e79ee264fc67b72d779449e8b00bd25229520671
+  metadata.gz: 2503ff8c87ba140f94739e10a14f94b538a682c2
+  data.tar.gz: 2b89aa69f0e187cab4d349dfd4a856b4dfd54646
 SHA512:
-  metadata.gz: 2783dffae5319696c7f21785a1d83d52c0398cb4aa7210227105066bdb1c3b6b635c10e9f6290297ed505e4db56d3c5fdde7e25605267313d4eb55519ed2c553
-  data.tar.gz: c34d259be67c8164596f9e353802e5e14ce6922832c5e6ebd4c469a5db2c9a3cd4aec227bebc30d6402359062ef607014f5dc89c83ec40bffdb584381734d2e4
+  metadata.gz: 85bd8762b90000c510ca7e69107ffada74299c37664e53990fcd05c7184da7045017f640b528253c983849834d7e1b67dd79c514d79c470f3e901075385c362a
+  data.tar.gz: 766fd36f2ce8331df4c2e45127d37ce2e6f333dd7cd027278ab246077bb7cc58876acf7e788b87ef8725aec9bcad8953674a8f3dbf64805dc4cdd0cb6c86b5e7

data/lib/uinput/device.rb

@@ -1,7 +1,7 @@
-require 'bundler/setup'
 require 'uinput'
+
 require_relative "device/version"
-require_relative "device/system_initializer"
+require_relative "device/initializer"
 require_relative "device/error"
 
 module Uinput
@@ -9,35 +9,33 @@ module Uinput
     SYS_INPUT_DIR = '/sys/devices/virtual/input/'
 
     def initialize(&block)
-      @file = self.class::SystemInitializer.new(self, &block).create
-    end
-
-    def destroy
-      @file.ioctl(UI_DEV_DESTROY, nil)
-      @file = nil
-    end
+      @file = self.class::Initializer.new(self, &block).create
 
-    def sysname
-      @sysname ||= begin
+      @sysname = begin
         name_len = 128
         name_buffer = [' ' * name_len].pack("A#{name_len}")
         @file.ioctl(Uinput.UI_GET_SYSNAME(name_len), name_buffer)
         name_buffer.unpack("A#{name_len}").first
       end
-    end
 
-    def sys_path
-      "#{SYS_INPUT_DIR}#{sysname}"
+      @sys_path = "#{SYS_INPUT_DIR}#{@sysname}"
+
+      @dev_path = begin
+        event_dir = Dir["#{@sys_path}/event*"].first
+        event = File.basename(event_dir)
+        "/dev/input/#{event}"
+      end
     end
 
-    def dev_path
-      event_dir = Dir["#{sys_path}/event*"].first
-      event = File.basename(event_dir)
-      "/dev/input/#{event}"
+    attr_reader :file, :sysname, :sys_path, :dev_path
+
+    def destroy
+      @file.ioctl(UI_DEV_DESTROY, nil)
+      @file = nil
     end
 
     def name
-      File.read("#{sys_path}/name").strip
+      File.read("#{@sys_path}/name").strip
     end
 
     def active?

data/lib/uinput/device/initializer.rb

@@ -0,0 +1,66 @@
+require 'fcntl'
+
+module Uinput
+  class Device
+    class Initializer
+      def initialize(device, &block)
+        @file = Uinput.open_file(Fcntl::O_RDWR | Fcntl::O_NONBLOCK)
+
+        if Uinput.version == 5
+          @device = UinputSetup.new
+        else
+          @device = UinputUserDev.new
+        end
+
+        self.name = "Virtual Ruby Device"
+        self.type = LinuxInput::BUS_VIRTUAL
+        self.vendor = 0
+        self.product = 0
+        self.version = 0
+
+        instance_exec &block if block
+
+        if Uinput.version >= 5
+          @file.ioctl UI_DEV_SETUP, @device.pointer.read_bytes(@device.size)
+        else
+          @file.syswrite @device.pointer.read_bytes(@device.size)
+        end
+      end
+
+      def name=(name)
+        @device[:name] = name[0,UINPUT_MAX_NAME_SIZE]
+      end
+
+      def type=(type)
+        @device[:id][:bustype] = (type.is_a? Symbol) ? LinuxInput.const_get(type) : type
+      end
+
+      def vendor=(vendor)
+        @device[:id][:vendor] = vendor
+      end
+
+      def product=(product)
+        @device[:id][:product] = product
+      end
+
+      def version=(version)
+        @device[:id][:version] = version
+      end
+
+      def add_key(key)
+        @file.ioctl(UI_SET_KEYBIT, (key.is_a? Symbol) ? LinuxInput.const_get(key) : key)
+      end
+      alias_method :add_button, :add_key
+
+      def add_event(event)
+        @file.ioctl(UI_SET_EVBIT, (event.is_a? Symbol) ? LinuxInput.const_get(event) : event)
+      end
+
+      def create
+        if @file.ioctl(UI_DEV_CREATE).zero?
+          @file
+        end
+      end
+    end
+  end
+end

data/lib/uinput/device/version.rb

@@ -1,5 +1,5 @@
 module Uinput
   class Device
-    VERSION = "0.3.3"
+    VERSION = "0.4.0"
   end
 end

data/test.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require_relative 'lib/uinput/device'
+
+device = Uinput::Device.new do
+  add_key(:KEY_A)
+  add_event(:EV_KEY)
+  add_event(:EV_SYN)
+end
+
+puts "set up: #{device.name}"
+
+input = File.open device.dev_path
+
+# key down
+device.send_event(:EV_KEY, :KEY_A, 1)
+device.send_event(:EV_SYN, :SYN_REPORT)
+puts 'pressed a'
+
+# key up
+device.send_event(:EV_KEY, :KEY_A, 0)
+device.send_event(:EV_SYN, :SYN_REPORT)
+puts 'released a'
+
+event1 = LinuxInput::InputEvent.new FFI::MemoryPointer.from_string input.read LinuxInput::InputEvent.size
+event2 = LinuxInput::InputEvent.new FFI::MemoryPointer.from_string input.read LinuxInput::InputEvent.size
+event3 = LinuxInput::InputEvent.new FFI::MemoryPointer.from_string input.read LinuxInput::InputEvent.size
+event4 = LinuxInput::InputEvent.new FFI::MemoryPointer.from_string input.read LinuxInput::InputEvent.size
+p event1.values
+p event2.values
+p event3.values
+p event4.values
+
+device.destroy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uinput-device
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uinput
@@ -68,8 +68,9 @@ files:
 - Rakefile
 - lib/uinput/device.rb
 - lib/uinput/device/error.rb
-- lib/uinput/device/system_initializer.rb
+- lib/uinput/device/initializer.rb
 - lib/uinput/device/version.rb
+- test.rb
 - uinput-device.gemspec
 homepage: https://github.com/christopheraue/ruby-uinput-device
 licenses:
@@ -91,8 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generic ruby wrapper around uinput to create devices.
 test_files: []
+has_rdoc: 

data/lib/uinput/device/system_initializer.rb

@@ -1,56 +0,0 @@
-require 'fcntl'
-
-module Uinput
-  class Device
-    class SystemInitializer
-      FILE = '/dev/uinput'
-
-      def initialize(device, &block)
-        @file = File.open(FILE, Fcntl::O_WRONLY | Fcntl::O_NDELAY)
-        @device = UinputUserDev.new
-
-        self.name = "Virtual Ruby Device"
-        self.type = LinuxInput::BUS_VIRTUAL
-        self.vendor = 0
-        self.product = 0
-        self.version = 0
-
-        instance_exec &block if block
-      end
-
-      def name=(name)
-        @device[:name] = name
-      end
-
-      def type=(type)
-        @device[:id][:bustype] = type.is_a?(Symbol) ? LinuxInput.const_get(type) : type
-      end
-
-      def vendor=(vendor)
-        @device[:id][:vendor] = vendor
-      end
-
-      def product=(product)
-        @device[:id][:product] = product
-      end
-
-      def version=(version)
-        @device[:id][:version] = version
-      end
-
-      def add_key(key)
-        @file.ioctl(UI_SET_KEYBIT, key.is_a?(Symbol) ? LinuxInput.const_get(key) : key)
-      end
-      alias_method :add_button, :add_key
-
-      def add_event(event)
-        @file.ioctl(UI_SET_EVBIT, event.is_a?(Symbol) ? LinuxInput.const_get(event) : event)
-      end
-
-      def create
-        @file.syswrite(@device.pointer.read_bytes(@device.size))
-        @file if @file.ioctl(UI_DEV_CREATE).zero?
-      end
-    end
-  end
-end