fusuma 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31810cc1a7b95244f5d8ad8a70dfd58dbefc9505
-  data.tar.gz: e125f50146a9a43a6f2778f2908ece4d076413b0
+  metadata.gz: dc924ac29b2c4dbdb4af8a4244f3562f8c691e13
+  data.tar.gz: cfc5aed1ddfa5ef0e5c3804344159f9a4275fb26
 SHA512:
-  metadata.gz: cf96ebc00127e1365d00ab306b06c8dc49376a1558b48ad765b4edce77e99613b4a96340188d5387f4863c18c95130f57a81922c521c7f187d90024be67065e4
-  data.tar.gz: 5326d9d6a307640752ab526e10b5890b64207fa076b9287f2418b43fb025903c3e67f05f52024806b0dc99802bb7a11c889d631936a34a0745947f633f1629f9
+  metadata.gz: e89d9e3ad941b4e87cee08f216867c89c6e57095ae6eb9d536a58f89eb7fb446378694aaa2dfc0edbb18f4f13101fa5867ac2703b9f3e400db528ade75302909
+  data.tar.gz: db29831ba20d5962a18a5fb8957a84eb58167a962660d900373628e442d97f3c9b77c49046fbeae824b0b658efda36e5ad6ddcf28b6a052319564b8334d04144

data/README.md

@@ -14,7 +14,7 @@ IMPORTANT: You must be a member of the _input_ group to have permission
 
     $ sudo gpasswd -a $USER input
 
-You must log out and back in or restart to assign this group.
+**You must log out and back in or restart** to assign this group.
 
 You need libinput release 1.0 or later. Install libinput-tools: 
 

data/lib/fusuma.rb

@@ -6,6 +6,7 @@ require_relative 'fusuma/swipe.rb'
 require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
 require_relative 'fusuma/config.rb'
+require_relative 'fusuma/device.rb'
 require 'logger'
 require 'open3'
 require 'yaml'
@@ -35,7 +36,7 @@ module Fusuma
     def read_libinput
       Open3.popen3(libinput_command) do |_i, o, _e, _w|
         o.each do |line|
-          gesture_action = GestureAction.initialize_by(line, device_names)
+          gesture_action = GestureAction.initialize_by(line, Device.names)
           next if gesture_action.nil?
           @action_stack ||= ActionStack.new
           @action_stack.push gesture_action
@@ -45,48 +46,19 @@ module Fusuma
       end
     end
 
-    def device_names
-      return @device_names unless @device_names.nil?
-      names = []
-      @device_names = list_devices_logs.map do |line|
-        MultiLogger.debug(line)
-        name = extracted_input_device_from(line)
-        names << name unless name.nil?
-        next unless natural_scroll_is_available?(line)
-        names.pop
-      end.compact
-    end
-
     private
 
-    def list_devices_logs
-      Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
-        return o.to_a
-      end
-    end
-
     def libinput_command
       return @libinput_command if @libinput_command
       # NOTE: --enable-dwt means "disable while typing"
       prefix = 'stdbuf -oL --'
       command = 'libinput-debug-events --enable-dwt'
-      device_option = if device_names.size == 1
-                        "--device /dev/input/#{device_names.first}"
+      device_option = if Device.names.size == 1
+                        "--device /dev/input/#{Device.names.first}"
                       end
       @libinput_command = [prefix, command, device_option].join(' ')
       MultiLogger.debug(libinput_command: @libinput_command)
       @libinput_command
     end
-
-    def extracted_input_device_from(line)
-      return unless line =~ /^Kernel: /
-      line.match(/event[0-9]+/).to_s
-    end
-
-    def natural_scroll_is_available?(line)
-      return false unless line =~ /^Nat.scrolling: /
-      return false if line =~ %r{n/a}
-      true
-    end
   end
 end

data/lib/fusuma/device.rb

@@ -0,0 +1,45 @@
+module Fusuma
+  # detect input device
+  class Device
+    class << self
+      def names
+        return @names unless @names.nil?
+        device_names = fetch_device_names
+        MultiLogger.debug(device_names: device_names)
+        raise 'Touchpad is not found' if device_names.empty?
+        @names = device_names
+      rescue => ex
+        MultiLogger.error(ex.message)
+        exit 1
+      end
+
+      private
+
+      def fetch_device_names
+        current_device = nil
+        list_devices_logs.map do |line|
+          current_device = extracted_input_device_from(line) || current_device
+          next unless natural_scroll_is_available?(line)
+          current_device
+        end.compact
+      end
+
+      def list_devices_logs
+        Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
+          return o.to_a
+        end
+      end
+
+      def extracted_input_device_from(line)
+        return unless line =~ /^Kernel: /
+        line.match(/event[0-9]+/).to_s
+      end
+
+      def natural_scroll_is_available?(line)
+        return false unless line =~ /^Nat.scrolling: /
+        return false if line =~ %r{n/a}
+        true
+      end
+    end
+  end
+end

data/lib/fusuma/gesture_info.rb

@@ -9,7 +9,7 @@ module Fusuma
     attr_reader :finger, :direction, :action_type
 
     def trigger_keyevent
-      MultiLogger.debug("trigger keyevent: #{shortcut}")
+      MultiLogger.info("trigger keyevent: #{shortcut}")
       exec_xdotool(shortcut)
     end
 

data/lib/fusuma/multi_logger.rb

@@ -16,7 +16,6 @@ module Fusuma
     end
 
     def info(msg)
-      return unless debug_mode?
       super(msg)
     end
 
@@ -31,7 +30,6 @@ module Fusuma
     end
 
     def error(msg)
-      return unless debug_mode?
       err_logger.error(msg)
     end
 

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2018-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - lib/fusuma/action_stack.rb
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
+- lib/fusuma/device.rb
 - lib/fusuma/gesture_action.rb
 - lib/fusuma/gesture_info.rb
 - lib/fusuma/multi_logger.rb
@@ -162,8 +163,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux
 test_files: []
+has_rdoc: