fusuma-plugin-appmatcher 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3fa8f1ed20945e4d49be89c46c3929fa1d15917f220ba7b21d6c91b1b20c879
-  data.tar.gz: 299aeeea9b8c25fb9434283f6543e918603172647d9f1e650050ea633da942e8
+  metadata.gz: 6bc3fbffcc3befbf8fc3d63baa992e737d0fa52233bbf47c0cb0645f4ab3f720
+  data.tar.gz: c6b3fcac639693631347643f479b950202a9e001fdc1bf0ed6d9fc2591b0ebde
 SHA512:
-  metadata.gz: a110f9d5a00243c414da59079f49224c242cb68f686ac3f38798b0c9af3efe10c232a7fada48bce31b391434a58f484e5f4128af46f573de5f244328d433a9eb
-  data.tar.gz: ab561b7c1e9c506259c1be0920811c894e897d8fd0d9c380a58409b640a96d32c2b2fdaf5781b004059a26654bcfe2b262682a7782b8363ca041add78488d172
+  metadata.gz: ee31ba4d167fc3f13bf64cbac3063776e6eb34b64b8f60524b5580470db313f1fc48ec165c278554401ccc633a59c15e60b4634ccf7534bb2260fb2af71811e8
+  data.tar.gz: df1e4f4624a4c71da254adc2a25a91e04be6b7fe7569eaa64763cd4202d18d80c007e35078088b7d959809fdc21e40bcfa6b817330e0e9e6cb35e23d2b44811f

data/README.md

@@ -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,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  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/version.rb

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Appmatcher
-      VERSION = '0.1.2'
+      VERSION = '0.1.6'
     end
   end
 end

data/lib/fusuma/plugin/appmatcher.rb

@@ -13,11 +13,28 @@ 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
+
+      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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - iberianpig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
   requirement: !ruby/object:Gem::Requirement
@@ -30,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:
@@ -63,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
@@ -70,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
@@ -85,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