fusuma 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216f8562a1a8273c5067e09b85d558669ad8b929
-  data.tar.gz: 19dd9a739ae9e3050dc5ac121d66499b3c084000
+  metadata.gz: fc1ccc23a12924fc5af5527efd39b3561cad0023
+  data.tar.gz: 69321805a249c2a3a6fcc6209eccf439d0d1039e
 SHA512:
-  metadata.gz: a0c05bba807ab4569b2de22142713cc1a45c66b783e90785c7195bf58e39249a4d6b31a7a1ad72cb16b7275e62ad896a579c1fb214de4187f1b0df7cdb93ddc3
-  data.tar.gz: 07d4d793259309e26b5809cd5d8d7005ccb36b2de07dc6595e3a28ac17b45572e24ef77871549198085e3d90804a1f52c76bcbe103abfeea7537400589fdab82
+  metadata.gz: 99f14ae299cd0f106df6b5504d7787101f8ac7e399c671726baaf8e750189882d4f99294c965a67ff460d7ed177ee4cfea6b86f69638fe2076f72f9f3f9ee4ed
+  data.tar.gz: 6d0c33ad2b6e63a838b0985f8f3fbd46926c248c1456ec2bd8de9b9de7ea34f86517f83be262afe484f3661ab6f7d9ade81757f14bd61aa79f9d137931b9f842

data/README.md

@@ -1,4 +1,4 @@
-# Fusuma
+# Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma)
 
 Fusuma is multitouch gesture recognizer.
 This gem makes your linux PC able to recognize swipes or pinchs and assign shortcuts to them.
@@ -30,9 +30,15 @@ Install Fusuma:
 
     $ fusuma
 
+## Update
+
+    $ gem update fusuma
+
 ## Customize
 
-You can customize the settings for gestues to put and edit `~/.config/fusuma/config.yml`.
+You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.  
+*NOTE*: You will need to create the `~.config/fusuma` directory if it doesn't exist yet.
+
 
 ### Sample (default keymap for Elementary OS)
 

data/bin/console

@@ -7,8 +7,6 @@ require "fusuma"
 # 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!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require "pry"
+require "pry-byebug"
+Pry.start

data/fusuma.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rubocop'
 end

data/lib/fusuma.rb

@@ -10,9 +10,6 @@ require 'logger'
 require 'open3'
 require 'yaml'
 
-# for debug
-# require 'pry-byebug'
-
 # this is top level module
 module Fusuma
   # main class
@@ -33,7 +30,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_name)
+          gesture_action = GestureAction.initialize_by(line, device_names)
           next if gesture_action.nil?
           @action_stack ||= ActionStack.new
           @action_stack.push gesture_action
@@ -46,28 +43,34 @@ module Fusuma
     private
 
     def libinput_command
+      return @libinput_command if @libinput_command
       # NOTE: --enable-dwt means "disable while typing"
-      @libinput_command ||= "stdbuf -oL -- libinput-debug-events --device \
-      /dev/input/#{device_name} --enable-dwt"
+      prefix = 'stdbuf -oL --'
+      command = 'libinput-debug-events --enable-dwt'
+      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 device_name
-      return @device_name unless @device_name.nil?
-      Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
-        o.each do |line|
+    def device_names
+      @device_names ||= Open3.popen3('libinput-list-devices') do |_i, o, _e, _w|
+        device_names = []
+        o.map do |line|
           MultiLogger.debug(line)
-          extracted_input_device_from(line)
+          device_name = extracted_input_device_from(line)
+          device_names << device_name unless device_name.nil?
           next unless touch_is_available?(line)
-          return @device_name
+          device_names.pop
         end
-      end
+      end.compact
     end
 
     def extracted_input_device_from(line)
       return unless line =~ /^Kernel: /
-      @device_name = line.match(/event[0-9]+/).to_s
+      line.match(/event[0-9]+/).to_s
     end
 
     def touch_is_available?(line)

data/lib/fusuma/gesture_action.rb

@@ -13,8 +13,10 @@ module Fusuma
                 :move_x, :move_y, :zoom
 
     class << self
-      def initialize_by(line, device_name)
-        return unless line.to_s =~ /^\s?#{device_name}/
+      def initialize_by(line, device_names)
+        return if device_names.none? do |device_name|
+          line.to_s =~ /^\s?#{device_name}/
+        end
         return if line.to_s =~ /_BEGIN/
         return unless line.to_s =~ /GESTURE_SWIPE|GESTURE_PINCH/
         time, action, finger, directions = gesture_action_arguments(line)

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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-byebug
   requirement: !ruby/object:Gem::Requirement