fusuma-plugin-wmctrl 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 316ce994f0890c7b67dbb07ca8305fcc47c3fa715adc693991d3fe809aa8b808
-  data.tar.gz: 3f77d3c20e4e832adf3f40782cd1cbd9005064159575805d97e5e02193fafb63
+  metadata.gz: 2f32faf629716120700464642e1d591691413d7240e1000c2774514a57402b8d
+  data.tar.gz: 46b22611de856c05893885e04fb0e38769b7f5cda314776484cd9983fc24c38e
 SHA512:
-  metadata.gz: '0888f8dfab2a61cd9dcd71b231da45804f6ea93fc8bc2ae03dd4cbd56eac13f7f46f3df0ac1bf311ede6e531f677ca439364175744bb3338478137a99b423811'
-  data.tar.gz: 616aa9662f061ceb728007daccbee5520839d043af29715a635420738d3f5b8a3b39ad68a557ba23966db39c07595059ed2bf09ebc15c0e828426fb9837e7b7b
+  metadata.gz: eb007ac0e18cc78797e3211c269c279f4da0af4f0d8c0e95129108b533d6dc6f117800efdc751cc9b5a2ad6ab4feff9a308abb11c7f0d3d6d4ef5b81634b9a30
+  data.tar.gz: 5a2287cce23e47ed30153cc6668edce591695093c8a5323a8b0472ead69d6a9372b744be810d24ef38980d71ac5fa33300723b95cbd3a9f8c90797a628e59d2b

data/.travis.yml

@@ -3,5 +3,8 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 2.0.1
+  - 2.3.1
+  - 2.4
+  - 2.5
+  - 2.6
+before_install: gem install bundler --no-document -v 2.0.1

data/README.md

@@ -1,4 +1,5 @@
-# Fusuma::Plugin::Wmctrl
+# 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://travis-ci.com/iberianpig/fusuma-plugin-wmctrl.svg?branch=master)](https://travis-ci.com/iberianpig/fusuma-plugin-wmctrl)
+
 
 Window Manager plugin for [Fusuma](https://github.com/iberianpig/fusuma)
 
@@ -21,11 +22,21 @@ $ gem install fusuma-plugin-wmctrl
 
 ## Properties
 
+### `workspace:` property
 Add `workspace:` property in `~/.config/fusuma/config.yml`.
 
-Currently, values following are available for `workspace`.
-  * `prev`
-  * `next`
+Values following are available for `workspace`.
+
+  * `prev` is value to switch current workspace to previous workspace.
+  * `next` is value to switch current workspace to next workspace.
+
+### `window:` property for moving active window
+Add `window:` property in `~/.config/fusuma/config.yml`.
+
+Values following are available for `window`.
+
+  * `prev` is value to move active window to previous workspace.
+  * `next` is value to move active window to next workspace.
 
 
 ## Example

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

@@ -11,6 +11,7 @@ module Fusuma
         def execute(event)
           return if search_command(event).nil?
 
+          MultiLogger.info(wmctrl: search_command(event))
           pid = fork do
             Process.daemon(true)
             exec(search_command(event))
@@ -32,11 +33,33 @@ module Fusuma
         # @return [String]
         # @return [NilClass]
         def search_command(event)
+          search_workspace_command(event) || search_window_command(event)
+        end
+
+        private
+
+        # @param event [Event]
+        # @return [String]
+        # @return [NilClass]
+        def search_workspace_command(event)
           index = Config::Index.new([*event.record.index.keys, :workspace])
+
           direction = Config.search(index)
           return if direction.nil?
 
-          Workspace.move_workspace_command(direction: direction)
+          Workspace.move_command(direction: direction)
+        end
+
+        # @param event [Event]
+        # @return [String]
+        # @return [NilClass]
+        def search_window_command(event)
+          index = Config::Index.new([*event.record.index.keys, :window])
+
+          direction = Config.search(index)
+          return if direction.nil?
+
+          Window.move_command(direction: direction)
         end
 
         # Manage workspace
@@ -49,17 +72,35 @@ module Fusuma
               text.chars.first.to_i
             end
 
-            def move_workspace_command(direction:)
-              new_workspace_num = case direction
-                                  when 'next'
-                                    current_workspace_num + 1
-                                  when 'prev'
-                                    current_workspace_num - 1
-                                  else
-                                    warn "#{direction} is invalid key"
-                                    exit 1
-                                  end
-              "wmctrl -s #{new_workspace_num}"
+            def move_command(direction:)
+              workspace_num = case direction
+                              when 'next'
+                                current_workspace_num + 1
+                              when 'prev'
+                                current_workspace_num - 1
+                              else
+                                warn "#{direction} is invalid key"
+                                exit 1
+                              end
+              "wmctrl -s #{workspace_num}"
+            end
+          end
+        end
+
+        # Manage Window
+        class Window
+          class << self
+            def move_command(direction:)
+              workspace_num = case direction
+                              when 'next'
+                                Workspace.current_workspace_num + 1
+                              when 'prev'
+                                Workspace.current_workspace_num - 1
+                              else
+                                warn "#{direction} is invalid key"
+                                exit 1
+                              end
+              "wmctrl -r :ACTIVE: -t #{workspace_num} ; wmctrl -s #{workspace_num}"
             end
           end
         end

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

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Wmctrl
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-wmctrl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusuma