fusuma-plugin-appmatcher 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d226043c98f0533823ed38981d0a412ef2024f74651a2b637838b8c0d0fdd40a
-  data.tar.gz: c5f28764fb1382f56fb862a51fce6e891448169e886360dcccb44420c1147042
+  metadata.gz: 21759f031dfaf515588202ffbdf59be323542f1abe12ae08f037dceff4b5901f
+  data.tar.gz: f9e6365191943007c3550a4d7cc79496f529da49d7a9453ab4a672c7f35a4237
 SHA512:
-  metadata.gz: 901f6476d9350bbe963e0b38ea0e8d68593ecd5e0ca2f18b90dc253b710649d330641d6598e669396db8f5f9a92e582060a549a612964cf495b278d190cf13f3
-  data.tar.gz: 4852a78ff0c699a194ad0a325271006a84fa8c66c7c9cbfd025b0b9db8b3077a1556f39cbe11dd823d6f2b618b34e4c0c449e52426665d8a1659d9ee2d306e54
+  metadata.gz: e5ce0492eeb84aa37a82fedab27befd850a17d8dde5d10ee8cc87bfbebf61c8fc53a484b2375e8f258cfa58fc716bdfd36a1f9d1c9db89333b8e118610e4320d
+  data.tar.gz: ef0643fa7604c9a11a20314e28a84a37695659ea76f10cd1fefec6fd24c1bd520611fce9712056632f38e67ab4f3cf0f70ec81eb754301492a7af0733af0ac09

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

@@ -16,16 +16,14 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  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']
 
-  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.0'
+      VERSION = '0.1.4'
     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/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

@@ -0,0 +1,9 @@
+# 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
+  end
+end

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

@@ -0,0 +1,68 @@
+# 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_parser', 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_parser', record: record1)
+            event2 = Events::Event.new(tag: 'appmatcher_parser', 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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'fusuma/plugin/appmatcher'
+
+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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - iberianpig
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-10-03 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:
@@ -61,14 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - bin/console
 - bin/setup
 - exe/fusuma-appmatcher
@@ -83,11 +77,15 @@ 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
 homepage: https://github.com/iberianpig/fusuma-plugin-appmatcher
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +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: []
+test_files:
+- 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

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-.ruby-version

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.1
-before_install: gem install bundler -v 2.0.1

data/CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at yhkyky@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in fusuma-plugin-appmatcher.gemspec
-gemspec
-
-gem 'bundler', '~> 2.0'
-gem 'github_changelog_generator', '~> 1.14'
-gem 'lefthook'
-gem 'pry-byebug', '~> 3.4'
-gem 'pry-doc'
-gem 'pry-inline'
-gem 'rake', '~> 13.0'
-gem 'reek'
-gem 'rspec', '~> 3.0'
-gem 'rubocop'
-gem 'yard'

data/Rakefile

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
-
-require 'github_changelog_generator/task'
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'iberianpig'
-  config.project = 'fusuma-plugin-appmatcher'
-end