fusuma-plugin-appmatcher 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c04d2c342048c76a7c283be8234f8aea320df6b7a781549ff1beab90a988d3
-  data.tar.gz: a562949e3a67b209846564945c230c77079812b2491a60dd1ac134ffbdc227ac
+  metadata.gz: 5e83ab4ed022583573d314044dd916c8e997d7c8ded16d6e5e92dd47977eb68f
+  data.tar.gz: b25d958c8220d36c21ff0dae24fbf8e083feef7ca4d5317401de5926480b64af
 SHA512:
-  metadata.gz: 77472b7bdec3c9e923e39ac1267920aa4802494bfc47e49c90fe4ebe1b9cc037d77b06c3d5893a756cc1506aed0bd50b686a182f2cfd61203af2dbb7a475095f
-  data.tar.gz: a25404e58fbb3ac32e604ff61e9302387684c4086d1080ff224e141781dd0ec1002922a5f2939b5556c8966a14b098f3e192ca2aca7192f49c6dc0e8d5fc6761
+  metadata.gz: 47204d64d8ea6999328d00a6e4eb4d36823e91aaff66a8f6afcaef5bc09c6e5a471da0c09b2cbc72093c8246eaa7446e12bb84d89f986ca937e7aa8667f13720
+  data.tar.gz: d738fcde80baaa9cd61869caeb26667d04c8a1951956d0f2b0e274696e4c5b8bf57881a00ff2157e4275284fac1c53e4383b834ce931d3d6f1c3fd0a4a626276

data/README.md

@@ -1,6 +1,6 @@
 # Fusuma::Plugin::Appmatcher [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-appmatcher.svg)](https://badge.fury.io/rb/fusuma-plugin-appmatcher) [![Build Status](https://travis-ci.com/iberianpig/fusuma-plugin-appmatcher.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma-plugin-appmatcher)
 
-[Fusuma](https://github.com/iberianpig/fusuma) plugin configure per application
+[Fusuma](https://github.com/iberianpig/fusuma) plugin configure app-specific gestures
 
 * Switch gesture mappings by detecting active application.
 * Support X11, Ubuntu-Wayland
@@ -49,7 +49,7 @@ In the following example of config.yml
 * On Google-chrome, the three-finger gesture is mapped to open in tab, close tab, back in history, forward in history.
 * On Gnome-terminal, the three-finger gesture will be mapped to open in tab, close in tab.
 
-```diff
+```yaml
 # this is default context
 swipe:
   4:
@@ -62,28 +62,28 @@ swipe:
       sendkey: 'LEFTCTRL+LEFTALT+UP'
       LEFTSHIFT:
         sendkey: 'LEFTSHIFT+LEFTCTRL+LEFTALT+UP'
-+ ---
-+ context:
-+   application:  Google-chrome
-+ swipe:
-+   3:
-+     left:
-+       sendkey: 'LEFTALT+RIGHT'
-+     right:
-+       sendkey: 'LEFTALT+LEFT'
-+     up:
-+       sendkey: 'LEFTCTRL+T'
-+     down:
-+       sendkey: 'LEFTCTRL+W'
-+ ---
-+ context:
-+   application:  Gnome-terminal
-+ swipe:
-+   3: 
-+     up:
-+       sendkey: 'LEFTSHIFT+LEFTCTRL+T'
-+     down:
-+       sendkey: 'LEFTSHIFT+LEFTCTRL+W'
+---
+context:
+  application:  Google-chrome
+swipe:
+  3:
+    left:
+      sendkey: 'LEFTALT+RIGHT'
+    right:
+      sendkey: 'LEFTALT+LEFT'
+    up:
+      sendkey: 'LEFTCTRL+T'
+    down:
+      sendkey: 'LEFTCTRL+W'
+---
+context:
+  application:  Gnome-terminal
+swipe:
+  3: 
+    up:
+      sendkey: 'LEFTSHIFT+LEFTCTRL+T'
+    down:
+      sendkey: 'LEFTSHIFT+LEFTCTRL+W'
 ```
 
 ## Contributing

data/fusuma-plugin-appmatcher.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'iniparse'
+  spec.add_dependency "rexml" # ruby-dbus doesn't resolve dependency 
   spec.add_runtime_dependency 'ruby-dbus'
 
-  spec.add_dependency 'fusuma', '~> 2.0.0'
+  spec.add_dependency 'fusuma', '~> 2.0'
 end

data/lib/fusuma/plugin/appmatcher/gnome.rb

@@ -3,7 +3,6 @@
 require 'json'
 require 'dbus'
 require_relative './user_switcher'
-require 'posix/spawn'
 
 module Fusuma
   module Plugin

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Appmatcher
-      VERSION = '0.1.1'
+      VERSION = '0.1.5'
     end
   end
 end

data/lib/fusuma/plugin/appmatcher/x11.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require 'open3'
 require_relative './user_switcher'
 require 'fusuma/multi_logger'
 require 'fusuma/custom_process'
-require 'posix/spawn'
 
 module Fusuma
   module Plugin
@@ -75,7 +75,7 @@ module Fusuma
           private
 
           def active_window_id(watch: false, &block)
-            _p, i, o, e = POSIX::Spawn.popen4(xprop_active_window_id(watch))
+            i, o, e, _w = Open3.popen3(xprop_active_window_id(watch))
             i.close
             o.each do |line|
               id = line.match(/0x[\da-z]{2,}/)&.to_s
@@ -89,7 +89,8 @@ module Fusuma
             o.close
 
             return nil unless block_given?
-            sleep 1
+
+            sleep 0.5
             active_window_id(watch: watch, &block)
           rescue StandardError => e
             MultiLogger.error e.message

data/lib/fusuma/plugin/appmatcher.rb

@@ -13,11 +13,30 @@ module Fusuma
 
       # @return [Class]
       def backend_klass
-        if ENV['DESKTOP_SESSION'] == 'ubuntu-wayland'
-          Gnome
-        else
-          X11
+        case xdg_session_type
+        when /x11/
+          return X11
+        when /wayland/
+          return Gnome if xdg_current_desktop =~ /GNOME/
         end
+        MultiLogger.error(
+          <<~ERROR
+          appmatcher doesn't support
+          XDG_CURRENT_DESKTOP: '#{xdg_current_desktop}'
+          XDG_SESSION_TYPE: '#{xdg_session_type}'"
+          ERROR
+        )
+        exit 1
+      end
+
+      private
+
+      def xdg_session_type
+        ENV.fetch('XDG_SESSION_TYPE', '')
+      end
+
+      def xdg_current_desktop
+        ENV.fetch('XDG_CURRENT_DESKTOP', '')
       end
     end
   end

data/spec/fusuma/plugin/appmatcher/gnome_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require './lib/fusuma/plugin/appmatcher/gnome'
+
+module Fusuma
+  module Plugin
+    module Appmatcher
+      RSpec.describe Gnome do
+        it 'requires ruby-dbus' do
+          expect(DBus).not_to be nil
+        end
+      end
+    end
+  end
+end

data/spec/fusuma/plugin/appmatcher_spec.rb

@@ -1,9 +1,39 @@
 # frozen_string_literal: true
-#
+
 require 'spec_helper'
 
-RSpec.describe Fusuma::Plugin::Appmatcher do
-  it 'has a version number' do
-    expect(Fusuma::Plugin::Appmatcher::VERSION).not_to be nil
+module Fusuma
+  module Plugin
+    RSpec.describe Appmatcher do
+      it 'has a version number' do
+        expect(Appmatcher::VERSION).not_to be nil
+      end
+
+      describe '#backend_klass' do
+        context 'when XDG_CURRENT_DESKTOP is UNKNOWN' do
+          before { allow(Appmatcher).to receive(:xdg_current_desktop).and_return('UNKNOWN') }
+          it { expect { Appmatcher.backend_klass }.to raise_error }
+        end
+
+        context 'when XDG_SESSION_TYPE is x11' do
+          before { allow(Appmatcher).to receive(:xdg_session_type).and_return('x11') }
+          it { expect(Appmatcher.backend_klass).to eq Appmatcher::X11 }
+        end
+
+        context 'when XDG_SESSION_TYPE is wayland' do
+          before { allow(Appmatcher).to receive(:xdg_session_type).and_return('wayland') }
+
+          context 'when XDG_CURRENT_DESKTOP is ubuntu:GNOME' do
+            before { allow(Appmatcher).to receive(:xdg_current_desktop).and_return('ubuntu:GNOME') }
+            it { expect(Appmatcher.backend_klass).to eq Appmatcher::Gnome }
+          end
+
+          context 'when XDG_CURRENT_DESKTOP is UNKNOWN' do
+            before { allow(Appmatcher).to receive(:xdg_current_desktop).and_return('UNKNOWN') }
+            it { expect { Appmatcher.backend_klass }.to raise_error }
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - iberianpig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: iniparse
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 description: fusuma-plugin-appmatcher is Fusuma plugin for assigning gesture mapping
   per application.
 email:
@@ -77,6 +77,7 @@ files:
 - lib/fusuma/plugin/events/records/appmatcher_record.rb
 - lib/fusuma/plugin/inputs/appmatcher_input.rb
 - lib/fusuma/plugin/parsers/appmatcher_parser.rb
+- spec/fusuma/plugin/appmatcher/gnome_spec.rb
 - spec/fusuma/plugin/appmatcher_spec.rb
 - spec/fusuma/plugin/inputs/appmatcher_detector_spec.rb
 - spec/spec_helper.rb
@@ -84,7 +85,7 @@ homepage: https://github.com/iberianpig/fusuma-plugin-appmatcher
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -99,11 +100,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: Fusuma plugin to assign gesture mapping per application
 test_files:
-- spec/fusuma/plugin/inputs/appmatcher_detector_spec.rb
+- spec/fusuma/plugin/appmatcher/gnome_spec.rb
 - spec/fusuma/plugin/appmatcher_spec.rb
+- spec/fusuma/plugin/inputs/appmatcher_detector_spec.rb
 - spec/spec_helper.rb