fusuma-plugin-appmatcher 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21759f031dfaf515588202ffbdf59be323542f1abe12ae08f037dceff4b5901f
-  data.tar.gz: f9e6365191943007c3550a4d7cc79496f529da49d7a9453ab4a672c7f35a4237
+  metadata.gz: 5e83ab4ed022583573d314044dd916c8e997d7c8ded16d6e5e92dd47977eb68f
+  data.tar.gz: b25d958c8220d36c21ff0dae24fbf8e083feef7ca4d5317401de5926480b64af
 SHA512:
-  metadata.gz: e5ce0492eeb84aa37a82fedab27befd850a17d8dde5d10ee8cc87bfbebf61c8fc53a484b2375e8f258cfa58fc716bdfd36a1f9d1c9db89333b8e118610e4320d
-  data.tar.gz: ef0643fa7604c9a11a20314e28a84a37695659ea76f10cd1fefec6fd24c1bd520611fce9712056632f38e67ab4f3cf0f70ec81eb754301492a7af0733af0ac09
+  metadata.gz: 47204d64d8ea6999328d00a6e4eb4d36823e91aaff66a8f6afcaef5bc09c6e5a471da0c09b2cbc72093c8246eaa7446e12bb84d89f986ca937e7aa8667f13720
+  data.tar.gz: d738fcde80baaa9cd61869caeb26667d04c8a1951956d0f2b0e274696e4c5b8bf57881a00ff2157e4275284fac1c53e4383b834ce931d3d6f1c3fd0a4a626276

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

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

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_spec.rb

@@ -2,8 +2,38 @@
 
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml