fusuma-plugin-wmctrl 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d929c23fcedce401d4fa3c9ac1f5a39e2aba97eb7fdce00864a385da0b391723
-  data.tar.gz: 6ad065e14cb5f184ce47e8ae8925f93bc14fb54c0740822937d45137571ac179
+  metadata.gz: 0f71997270e34b8604038cf56d738cfdcf56d99c727042b595b35e39e72cd5a2
+  data.tar.gz: 6836062464b71982a80abf152a258807bebe9ee911da23175c1c3f899e40b9b7
 SHA512:
-  metadata.gz: a35a9f5ca6338b8c62a58905c7d03f7f4738eb104cd792e03b23cba48faf3a5dec8b957a3cfcc294f78d7c20120537d687b52d9541b965f5c485fb1e0ceff63a
-  data.tar.gz: 5ad6fd27a381ce6698e974dbcddd04369c5f9741859866cfcf0bf5a311c3478565e809b3150c2cc43507ebc9379a14e29753de3cd5280d7557721bb1b0fd2d31
+  metadata.gz: 4a3958f82aba9d729f9c33ac3bbd03f400eeba382aebf69a32abf62a6d2ccdfdf1a1785fa6169f2f060d89537d4e0665a948c8676bb26c4c7d0e5b43dea506cc
+  data.tar.gz: cd8f468211d2380e9aae329e9d4c86abbc4bca1ab75cc95fe7cccbba6b28a04061ac5dd1a191f87d41025d7c3813b1f0d55d12ed84e1928c31a1875a9f2b7147

data/README.md

@@ -1,4 +1,4 @@
-# Fusuma::Plugin::Remap [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-wmctrl.svg)](https://badge.fury.io/rb/fusuma-plugin-wmctrl) [![Build Status](https://github.com/iberianpig/fusuma-plugin-wmctrl/actions/workflows/main.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-wmctrl/actions/workflows/main.yml)
+# Fusuma::Plugin::Wmctrl [![Gem Version](https://badge.fury.io/rb/fusuma-plugin-wmctrl.svg)](https://badge.fury.io/rb/fusuma-plugin-wmctrl) [![Build Status](https://github.com/iberianpig/fusuma-plugin-wmctrl/actions/workflows/main.yml/badge.svg)](https://github.com/iberianpig/fusuma-plugin-wmctrl/actions/workflows/main.yml)
 
 
 Window Manager plugin for [Fusuma](https://github.com/iberianpig/fusuma)

data/fusuma-plugin-wmctrl.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.1" # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
-  # support bionic (18.04LTS) 2.5.1
+  spec.required_ruby_version = ">= 2.7"
+  # https://packages.ubuntu.com/search?keywords=ruby&searchon=names&exact=1&suite=all&section=main
+  # support focal (20.04LTS) 2.7
   spec.add_dependency "fusuma", ">= 3.1"
 end

data/lib/fusuma/plugin/executors/wmctrl_executor.rb

@@ -8,6 +8,9 @@ module Fusuma
     module Executors
       # Control Window or Workspaces by executing wctrl
       class WmctrlExecutor < Executor
+        class InvalidOption < StandardError; end
+        class NotInstalledError < StandardError; end
+
         # executor properties on config.yml
         # @return [Array<Symbol>]
         def execute_keys
@@ -54,17 +57,44 @@ module Fusuma
         # @return [String]
         # @return [NilClass]
         def search_command(event)
+          must_install!("wmctrl")
+
           search_workspace_command(event) || search_window_command(event)
-        rescue Workspace::InvalidOption => e
+        rescue InvalidOption, NotInstalledError => e
           MultiLogger.error(e.message)
           exit 1
         end
 
         private
 
+        # @return [NilClass] when wmctrl is installed
+        # @raise [NotInstalledError] when wmctrl is not installed
+        def must_install!(cmd)
+          return if @_installed
+
+          if which(cmd)
+            @_installed = true
+          else
+            raise NotInstalledError, "`#{cmd}` is not executable. Please install `#{cmd}`"
+          end
+        end
+
+        # which('ruby') #=> /usr/bin/ruby
+        def which(cmd)
+          exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+          ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+            exts.each do |ext|
+              exe = File.join(path, "#{cmd}#{ext}")
+              return exe if File.executable?(exe) && !File.directory?(exe)
+            end
+          end
+          nil
+        end
+
         # @param event [Event]
         # @return [String]
         # @return [NilClass]
+        # @raise [InvalidOption]
         def search_workspace_command(event)
           index = Config::Index.new([*event.record.index.keys, :workspace])
 
@@ -76,13 +106,16 @@ module Fusuma
           when nil
             nil
           else
-            raise "#{property} is invalid key"
+            raise InvalidOption, "#{property} is invalid key"
           end
+        rescue Workspace::MissingMatrixOption => e
+          raise  InvalidOption, e.message
         end
 
         # @param event [Event]
         # @return [String]
         # @return [NilClass]
+        # @raise [InvalidOption]
         def search_window_command(event)
           index = Config::Index.new([*event.record.index.keys, :window])
 
@@ -106,8 +139,10 @@ module Fusuma
           when nil
             nil
           else
-            raise "#{property} is invalid key"
+            raise InvalidOption, "#{property} is invalid key"
           end
+        rescue Workspace::MissingMatrixOption => e
+          raise  InvalidOption, e.message
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Wmctrl
-      VERSION = "1.3.1"
+      VERSION = "1.4.0"
     end
   end
 end

data/lib/fusuma/plugin/wmctrl/workspace.rb

@@ -31,6 +31,7 @@ module Fusuma
           next_workspace_num
         end
 
+        # @raise [MissingMatrixOption]
         # @return [Array<Integer>]
         def matrix_size(total_workspace_num)
           must_have_matrix_option!
@@ -39,6 +40,7 @@ module Fusuma
           [row_size.to_i, col_size.to_i]
         end
 
+        # @raise [MissingMatrixOption]
         def must_have_matrix_option!
           return if @matrix_col_size
 
@@ -57,7 +59,8 @@ module Fusuma
         end
 
         # @return [Integer]
-        # @raise RuntimeError
+        # @raise [RuntimeError]
+        # @raise [MissingMatrixOption]
         def next_workspace_num_for_matrix(direction:)
           must_have_matrix_option!
           current_workspace_num, total_workspace_num = workspace_values
@@ -131,6 +134,7 @@ module Fusuma
           "wmctrl -r :ACTIVE: -t #{workspace_num} ; wmctrl -s #{workspace_num}"
         end
 
+        # @raise [MissingMatrixOption]
         def move_window_command_for_matrix(direction:)
           workspace_num = next_workspace_num_for_matrix(direction: direction)
           "wmctrl -r :ACTIVE: -t #{workspace_num} ; wmctrl -s #{workspace_num}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-wmctrl
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma
@@ -56,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Wmctrl plugin for Fusuma