fusuma-plugin-appmatcher 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe1234e9a80678a14e7511bd16f449331e01db5feff4c0817f60471021c89771
-  data.tar.gz: 1dcde6b098cc837ffb39181d8019e6caa6ad6373d4e68dfc08299d6f9bea1a3f
+  metadata.gz: 71434bb94486a82640cdb28a4162aa4ad961f37ea10d50171190674708a5bb2f
+  data.tar.gz: 5b9b925352707e6866d1bb0579f1e9e8fb32a54c403b1f369e693891fe3647ee
 SHA512:
-  metadata.gz: 2830428a3681121a3bfd2e26ead8dd9a96e44a85faea4f08b949f872f4d60804352f8b60825c3950a233f9c31e03a6b6801ad27e1d69348ed284f65bb013ad84
-  data.tar.gz: 1ab8b7590a898b43bf0499a31095e9f22693654fee3aa13c98aa97d48ec3118158ba307d5aa84aae3c64c0f45869ff04216d2f35e3393c86179d2ed736dafac8
+  metadata.gz: 401622844bdb199c250512d063389004f654c8da01e3cdfe3484743a521211da435c0b7e8a36dc61bec8495314629cf01ceaf98282800b80eae5ea85d27e2f5f
+  data.tar.gz: 325b5d4ccb1874461fa26d8d89687e12bad8289a2bde87fc66a29cf1ffa65fffb772d0857468d76f90d4d24e36aaa3f7129f3d56218762d17758a4946c8d0885

data/README.md

@@ -1,4 +1,4 @@
-# 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://github.com/iberianpig/fusuma/actions/workflows/main.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-appmatcher/actions/workflows/main.yml)
+# 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://github.com/iberianpig/fusuma-plugin-appmatcher/actions/workflows/main.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-appmatcher/actions/workflows/main.yml)
 
 [Fusuma](https://github.com/iberianpig/fusuma) plugin configure app-specific gestures
 

data/fusuma-plugin-appmatcher.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir["{bin,lib,exe}/**/*", "LICENSE*", "README*", "*.gemspec"]
-  spec.test_files = Dir["{test,spec,features}/**/*"]
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

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

@@ -2,7 +2,7 @@
 
 require "json"
 require "dbus"
-require_relative "./user_switcher"
+require_relative "user_switcher"
 
 module Fusuma
   module Plugin

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

@@ -2,7 +2,7 @@
 
 require "json"
 require "dbus"
-require_relative "./user_switcher"
+require_relative "user_switcher"
 
 module Fusuma
   module Plugin

data/lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/extension.js

@@ -0,0 +1,69 @@
+import { Extension } from 'resource:///org/gnome/shell/extensions/extension.js';
+import GLib from 'gi://GLib';
+import Gio from 'gi://Gio';
+
+const DBUS_INTERFACE = `
+<node>
+    <interface name="dev.iberianpig.Appmatcher">
+        <method name="ActiveWindow">
+            <arg type="s" direction="out" name="win"/>
+        </method>
+        <method name="ListWindows">
+            <arg type="s" direction="out" name="wins"/>
+        </method>
+        <signal name="ActiveWindowChanged">
+            <arg type="s" name="new_win"/>
+        </signal>
+    </interface>
+</node>`;
+
+export default class AppMatcherExtension extends Extension {
+  enable() {
+    this._dbus = Gio.DBusExportedObject.wrapJSObject(DBUS_INTERFACE, this);
+    this._dbus.export(Gio.DBus.session, '/dev/iberianpig/Appmatcher');
+    this._callback_id = global.display.connect('notify::focus-window', ()=> { 
+      this.activeWindowChanged()
+    })
+  }
+
+  disable() {
+    this._dbus.flush();
+    this._dbus.unexport();
+    if (this._callback_id) {
+      global.display.disconnect(this._callback_id);
+      delete this._callback_id
+    }
+    delete this._dbus;
+  }
+
+  activeWindowChanged() {
+    const w = global.display.get_focus_window();
+    if(!w) { return; }
+
+    try {
+      const obj = { wm_class: w.get_wm_class(), pid: w.get_pid(), id: w.get_id(), title: w.get_title(), focus: w.has_focus()}
+      this._dbus.emit_signal('ActiveWindowChanged', new GLib.Variant('(s)', [JSON.stringify(obj)]));
+    } catch (e) {
+      console.error(e, 'failed to Emit DBus signal');
+    }
+  }
+
+  ListWindows() {
+    const wins = global.get_window_actors()
+      .map(a => a.meta_window)
+      .map(w => ({ wm_class: w.get_wm_class(), pid: w.get_pid(), id: w.get_id(), title: w.get_title(), focus: w.has_focus()}));
+    return JSON.stringify(wins);
+  }
+
+  ActiveWindow() {
+    const actor = global.get_window_actors().find(a=>a.meta_window.has_focus()===true)
+    if(!actor) { return '{}'; }
+    const w = actor.get_meta_window()
+    try {
+      const obj = { wm_class: w.get_wm_class(), pid: w.get_pid(), id: w.get_id(), title: w.get_title(), focus: w.has_focus()}
+      return JSON.stringify(obj);
+    } catch (e) {
+      console.error(e, 'failed to fetch ActiveWindow()');
+    }
+  }
+}

data/lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/metadata.json

@@ -0,0 +1,10 @@
+{
+  "name": "Appmatcher",
+  "description": "notify focused application using D-Bus",
+  "shell-version" : [
+    "45"
+  ],
+  "url" : "https://github.com/iberianpig/fusuma-plugin-appmatcher",
+  "uuid": "appmatcher@iberianpig.dev",
+  "version" : 1
+}

data/lib/fusuma/plugin/appmatcher/gnome_extensions/installer.rb

@@ -13,9 +13,25 @@ module Fusuma
 
           EXTENSION = "./appmatcher@iberianpig.dev"
 
+          def gnome_shell_extension_path
+            output = `gnome-shell --version`
+            version = output.match(/GNOME Shell (\d+\.\d+)/)
+
+            if version
+              version_number = version[1].to_f
+              if version_number >= 45.0
+                "./appmatcher45@iberianpig.dev"
+              else
+                "./appmatcher@iberianpig.dev"
+              end
+            else
+              "./appmatcher@iberianpig.dev"
+            end
+          end
+
           def install
             pid = as_user(proctitle: self.class.name.underscore) do |user|
-              FileUtils.cp_r(source_path, user_extension_dir(user.username))
+              FileUtils.cp_r(source_path, install_path(user.username))
               puts "Installed Appmatcher Gnome Shell Extension to #{user_extension_dir(user.username)}"
               puts "Restart your session, then activate Appmatcher on gnome-extensions-app"
             end
@@ -47,7 +63,7 @@ module Fusuma
           end
 
           def source_path
-            File.expand_path(EXTENSION, __dir__)
+            File.expand_path(gnome_shell_extension_path, __dir__)
           end
 
           def login_username

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
-require_relative "./user_switcher"
+require_relative "user_switcher"
 require "fusuma/multi_logger"
 require "fusuma/custom_process"
 

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Appmatcher
-      VERSION = "0.6.0"
+      VERSION = "0.6.1"
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
-require_relative "./user_switcher"
+require_relative "user_switcher"
 require "fusuma/multi_logger"
 require "fusuma/custom_process"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -70,6 +70,8 @@ files:
 - lib/fusuma/plugin/appmatcher.rb
 - lib/fusuma/plugin/appmatcher/gnome.rb
 - lib/fusuma/plugin/appmatcher/gnome_extension.rb
+- lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/extension.js
+- lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/metadata.json
 - lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher@iberianpig.dev/extension.js
 - lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher@iberianpig.dev/metadata.json
 - lib/fusuma/plugin/appmatcher/gnome_extensions/installer.rb
@@ -81,11 +83,6 @@ files:
 - lib/fusuma/plugin/detectors/appmatcher_detector.rb
 - lib/fusuma/plugin/events/records/appmatcher_record.rb
 - lib/fusuma/plugin/inputs/appmatcher_input.rb
-- spec/fusuma/plugin/appmatcher/gnome_extensions/installer_spec.rb
-- spec/fusuma/plugin/appmatcher/gnome_spec.rb
-- spec/fusuma/plugin/appmatcher_spec.rb
-- spec/fusuma/plugin/detectors/appmatcher_detector_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/iberianpig/fusuma-plugin-appmatcher
 licenses:
 - MIT
@@ -110,9 +107,4 @@ rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Fusuma plugin to assign gesture mapping per application
-test_files:
-- spec/fusuma/plugin/appmatcher/gnome_extensions/installer_spec.rb
-- spec/fusuma/plugin/appmatcher/gnome_spec.rb
-- spec/fusuma/plugin/appmatcher_spec.rb
-- spec/fusuma/plugin/detectors/appmatcher_detector_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/fusuma/plugin/appmatcher/gnome_extensions/installer_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Fusuma
-  module Plugin
-    module Appmatcher
-      module GnomeExtensions
-        RSpec.describe Installer do
-          describe "#install" do
-            it "should copy file to users dir"
-          end
-          describe "#uninstall" do
-            context "when extension is NOT installed" do
-              it "should remove file to users dir"
-            end
-            context "when extension is NOT installed" do
-              it "should NOT execute"
-            end
-          end
-          describe "#installed?" do
-            it "check extension is in the installed path"
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-# 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,51 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-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
-        subject { Appmatcher.backend_klass }
-        context "when XDG_SESSION_TYPE is x11" do
-          before { allow(Appmatcher).to receive(:xdg_session_type).and_return("x11") }
-          it { is_expected.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") }
-
-            context "when gnome-extension is installed" do
-              before do
-                allow_any_instance_of(Appmatcher::GnomeExtensions::Installer).to receive(:installed?).and_return(true)
-              end
-              it { is_expected.to eq Appmatcher::GnomeExtension }
-            end
-
-            context "when gnome-extension is NOT installed" do
-              before do
-                allow_any_instance_of(Appmatcher::GnomeExtensions::Installer).to receive(:installed?).and_return(false)
-              end
-              it { is_expected.to eq Appmatcher::Gnome }
-            end
-          end
-
-          context "when XDG_CURRENT_DESKTOP is UNKNOWN" do
-            before do
-              allow(Appmatcher).to receive(:xdg_current_desktop).and_return("UNKNOWN")
-              allow(MultiLogger).to receive(:error)
-            end
-            it { is_expected.to eq Appmatcher::UnsupportedBackend }
-          end
-        end
-      end
-    end
-  end
-end

data/spec/fusuma/plugin/detectors/appmatcher_detector_spec.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-require "fusuma/plugin/detectors/detector"
-require "fusuma/plugin/buffers/buffer"
-
-require "./lib/fusuma/plugin/buffers/appmatcher_buffer"
-require "./lib/fusuma/plugin/detectors/appmatcher_detector"
-
-module Fusuma
-  module Plugin
-    module Detectors
-      RSpec.describe AppmatcherDetector do
-        before do
-          @detector = AppmatcherDetector.new
-          @buffer = Buffers::AppmatcherBuffer.new
-        end
-
-        describe "#detector" do
-          context "with no appmatcher event in buffer" do
-            before do
-              @buffer.clear
-            end
-
-            it { expect(@detector.detect([@buffer])).to eq nil }
-          end
-        end
-
-        context "with appmatcher events in buffer" do
-          before do
-            record = Events::Records::AppmatcherRecord.new(name: "dummy")
-            event = Events::Event.new(tag: "appmatcher_input", record: record)
-
-            @buffer.buffer(event)
-          end
-          it { expect(@detector.detect([@buffer])).to be_a Events::Event }
-          it "should detect ContextRecord" do
-            expect(@detector.detect([@buffer]).record).to be_a Events::Records::ContextRecord
-          end
-          it "should detect context: { application: dummy }" do
-            record = @detector.detect([@buffer]).record
-            expect(record.name).to eq :application
-            expect(record.value).to eq "dummy"
-          end
-        end
-
-        context "with two different appmatcher events in buffer" do
-          before do
-            record1 = Events::Records::AppmatcherRecord.new(name: "dummy1")
-            record2 = Events::Records::AppmatcherRecord.new(name: "dummy2")
-            event1 = Events::Event.new(tag: "appmatcher_input", record: record1)
-            event2 = Events::Event.new(tag: "appmatcher_input", record: record2)
-
-            @buffer.buffer(event1)
-            @buffer.buffer(event2)
-          end
-
-          it "should detect latest application" do
-            record = @detector.detect([@buffer]).record
-            expect(record.name).to eq :application
-            expect(record.value).to eq "dummy2"
-          end
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "fusuma/plugin/appmatcher"
-require 'rspec/debug'
-
-RSpec.configure do |config|
-  # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
-
-  # Disable RSpec exposing methods globally on `Module` and `main`
-  config.disable_monkey_patching!
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end