fusuma 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34ecf279d76838ff817767328b76558273a56504
-  data.tar.gz: bf0aa51f796c7beb50e8a2ebc9a291700f39042a
+  metadata.gz: 7f719afc170aa08c1023728ae58f00f769a2d1df
+  data.tar.gz: 5dc2ed61e4eae799af55db3ebbadaedad68452ed
 SHA512:
-  metadata.gz: 2b7c17545e6655bfba041d1ef4917fae35ea4c2db40b74c9eb8a9de553952994ebb25de6bcce503cefb6495d72ee9fb20ac630a89a7c1ec05150eb0f32dec334
-  data.tar.gz: 0d1eeb2f783b3b4cd64d05c9368c8c3710d9d8e636436baba54cad0b6160bd932f25ca187d2370e421c827ef7587ed8ee565a76b7fb329c3c852ceb18761416a
+  metadata.gz: b7cb5c250d0ae33c0d7699a50f837a578476e8c38d5b5d0c64d3e27e660f7905c3000f45ef921aacda1252021a8280a0c0ed68886bcda42d5bc2df98f422127c
+  data.tar.gz: b95463eaeb8c2c363eb8702df14416c79563a7595fe1ca86f1f4d8857b2a27d7d953f253fd901aa57816dde5332343b252b95e6f264d870ea17dac885f39cc3e

data/.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+

data/.travis.yml

@@ -4,4 +4,6 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.1
+  - 2.4
+  - 2.5
 before_install: gem install bundler -v 1.13.2

data/README.md

@@ -1,7 +1,7 @@
 # Fusuma [![Gem Version](https://badge.fury.io/rb/fusuma.svg)](https://badge.fury.io/rb/fusuma) [![Build Status](https://travis-ci.org/iberianpig/fusuma.svg?branch=master)](https://travis-ci.org/iberianpig/fusuma)
 
 Fusuma is multitouch gesture recognizer.
-This gem makes your linux PC able to recognize swipes or pinchs and assign shortcuts to them.
+This gem makes your linux PC able to recognize swipes or pinchs and assign commands to them.
 
 [![https://gyazo.com/757fef526310b9d68f68e80eb1e4540f](https://i.gyazo.com/757fef526310b9d68f68e80eb1e4540f.png)](https://gyazo.com/757fef526310b9d68f68e80eb1e4540f)
 
@@ -20,7 +20,7 @@ You need libinput release 1.0 or later. Install libinput-tools:
 
     $ sudo apt-get install libinput-tools
 
-For sending shortcuts:
+For sending shortcuts(optional):
 
     $ sudo apt-get install xdotool
 
@@ -47,8 +47,15 @@ Ensure the touchpad events are being sent to the GNOME desktop by running the fo
 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.
 
+### `Command: ` property
+On fusuma version 1.0 `Command: ` property is available!
+You can assign any command each gestures.
 
-### Sample (default keymap for Elementary OS)
+**`shortcut: ` property is deprecated**, **it will be removed on fusuma version 1.0**.
+You need to replace to `command: ` property.
+
+
+#### before
 
 ```yaml
 swipe:
@@ -57,24 +64,46 @@ swipe:
       shortcut: 'alt+Left'
     right: 
       shortcut: 'alt+Right'
+```
+
+#### after
+
+```yaml
+swipe:
+  3: 
+    left: 
+      command: 'xdotool key alt+Left'
+    right: 
+      command: 'xdotool key alt+Right'
+```
+
+### Sample (default keymap for Elementary OS)
+
+```yaml
+swipe:
+  3: 
+    left: 
+      command: 'xdotool key alt+Left'
+    right: 
+      command: 'xdotool key alt+Right'
     up: 
-      shortcut: 'ctrl+t'
+      command: 'xdotool key ctrl+t'
     down: 
-      shortcut: 'ctrl+w'
+      command: 'xdotool key ctrl+w'
   4:
     left: 
-      shortcut: 'super+Left'
+      command: 'xdotool key super+Left'
     right: 
-      shortcut: 'super+Right'
+      command: 'xdotool key super+Right'
     up: 
-      shortcut: 'super+a'
+      command: 'xdotool key super+a'
     down: 
-      shortcut: 'super+s'
+      command: 'xdotool key super+s'
 pinch:
   in:
-    shortcut: 'ctrl+plus'
+    command: 'xdotool key ctrl+plus'
   out:
-     shortcut: 'ctrl+minus'
+    command: 'xdotool key ctrl+minus'
 
 threshold:
   swipe: 1
@@ -85,7 +114,7 @@ interval:
   pinch: 1
 ```
 
-if `shortcut: ` is blank, the swipe/pinch doesn't trigger a keyevent.
+if `command: ` properties are blank, the swipe/pinch doesn't trigger command.
 
 `threshold:` is sensitivity to swipe/pinch. Default value is 1.
 If the swipe's threshold is `0.5`, shorten swipe-length by half.

data/exe/fusuma

@@ -12,8 +12,8 @@ OptionParser.new do |opt|
   end
   opt.on('-c',
          '--config=path/to/file',
-         'Use an alternative config file') do |v|
-    option[:config] = v
+         'Use an alternative config file') do |c|
+    option[:config] = c
   end
   opt.parse!(ARGV)
 end

data/fusuma.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

data/lib/fusuma.rb

@@ -1,7 +1,7 @@
 require_relative 'fusuma/version'
 require_relative 'fusuma/action_stack'
 require_relative 'fusuma/gesture_action'
-require_relative 'fusuma/gesture_info'
+require_relative 'fusuma/event_trigger'
 require_relative 'fusuma/swipe.rb'
 require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
@@ -40,8 +40,8 @@ module Fusuma
           next if gesture_action.nil?
           @action_stack ||= ActionStack.new
           @action_stack.push gesture_action
-          gesture_info = @action_stack.gesture_info
-          gesture_info.trigger_keyevent unless gesture_info.nil?
+          event_trigger = @action_stack.generate_event_trigger
+          event_trigger.send_command unless event_trigger.nil?
         end
       end
     end

data/lib/fusuma/action_stack.rb

@@ -7,7 +7,7 @@ module Fusuma
       super(*args)
     end
 
-    def gesture_info
+    def generate_event_trigger
       return unless enough_actions?
       action_type = detect_action_type
       direction = detect_direction(action_type)
@@ -15,7 +15,7 @@ module Fusuma
       @last_triggered_time = last.time
       finger = detect_finger
       clear
-      GestureInfo.new(finger, direction, action_type)
+      EventTrigger.new(finger, direction, action_type)
     end
 
     def push(gesture_action)

data/lib/fusuma/config.rb

@@ -6,8 +6,12 @@ module Fusuma
     include Singleton
 
     class << self
-      def shortcut(gesture_info)
-        instance.shortcut(gesture_info)
+      def command(event_trigger)
+        instance.command(event_trigger)
+      end
+
+      def shortcut(event_trigger)
+        instance.shortcut(event_trigger)
       end
 
       def threshold(action_type)
@@ -37,8 +41,13 @@ module Fusuma
       self
     end
 
-    def shortcut(gesture_info)
-      seek_index = [*action_index(gesture_info), 'shortcut']
+    def command(event_trigger)
+      seek_index = [*action_index(event_trigger), 'command']
+      cache(seek_index) { search_config(keymap, seek_index) }
+    end
+
+    def shortcut(event_trigger)
+      seek_index = [*action_index(event_trigger), 'shortcut']
       cache(seek_index) { search_config(keymap, seek_index) }
     end
 
@@ -89,10 +98,10 @@ module Fusuma
       File.expand_path "../../#{filename}", __FILE__
     end
 
-    def action_index(gesture_info)
-      action_type = gesture_info.action_type
-      finger      = gesture_info.finger
-      direction   = gesture_info.direction
+    def action_index(event_trigger)
+      action_type = event_trigger.action_type
+      finger      = event_trigger.finger
+      direction   = event_trigger.direction
       [action_type, finger, direction]
     end
 

data/lib/fusuma/config.yml

@@ -1,31 +1,31 @@
 swipe:
   3:
     left:
-      shortcut: 'alt+Left'
+      command: 'xdotool key alt+Right'
     right:
-      shortcut: 'alt+Right'
+      command: 'xdotool key alt+Left'
     up:
-      shortcut: 'ctrl+t'
+      command: 'xdotool key ctrl+t'
     down:
-      shortcut: 'ctrl+w'
+      command: 'xdotool key ctrl+w'
   4:
     left:
-      shortcut: 'super+Left'
+      command: 'xdotool key super+Right'
     right:
-      shortcut: 'super+Right'
+      command: 'xdotool key super+Left'
     up:
-      shortcut: 'super+a'
+      command: 'xdotool key super+a'
     down:
-      shortcut: 'super+s'
+      command: 'xdotool key super+s'
 pinch:
   in:
-    shortcut: 'ctrl+plus'
+    command: 'xdotool key ctrl+plus'
   out:
-    shortcut: 'ctrl+minus'
+    command: 'xdotool key ctrl+minus'
 
 threshold:
-  swipe: 1
-  pinch: 1
+  swipe: 0.3
+  pinch: 0.1
 
 interval:
   swipe: 1

data/lib/fusuma/{gesture_info.rb → event_trigger.rb}

@@ -1,6 +1,6 @@
 module Fusuma
   # manage actions
-  class GestureInfo
+  class EventTrigger
     def initialize(finger, direction, action_type)
       @finger      = finger.to_i
       @direction   = direction
@@ -8,19 +8,19 @@ module Fusuma
     end
     attr_reader :finger, :direction, :action_type
 
-    def trigger_keyevent
-      MultiLogger.info("trigger keyevent: #{shortcut}")
-      exec_xdotool(shortcut)
+    def send_command
+      MultiLogger.info("trigger event: #{command}")
+      exec_command(command)
     end
 
     private
 
-    def exec_xdotool(keys)
-      `xdotool key #{keys}` unless keys.nil?
+    def exec_command(command)
+      `#{command}` unless command.nil?
     end
 
-    def shortcut
-      Config.shortcut(self)
+    def command
+      Config.command(self) || "xdotool key #{Config.shortcut(self)}"
     end
   end
 end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -137,8 +138,8 @@ files:
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
 - lib/fusuma/device.rb
+- lib/fusuma/event_trigger.rb
 - lib/fusuma/gesture_action.rb
-- lib/fusuma/gesture_info.rb
 - lib/fusuma/multi_logger.rb
 - lib/fusuma/pinch.rb
 - lib/fusuma/swipe.rb
@@ -168,4 +169,3 @@ signing_key:
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux
 test_files: []
-has_rdoc: