uh-wm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f89b584c49ab089cb76ac61c10f9383151005b7
-  data.tar.gz: 67b389410be855c1c38c456824b26f9254fd8fcd
+SHA256:
+  metadata.gz: bdfaa9044850872fdb32698f87fe8323e5e846519b6c6bec7815db47169ca8d1
+  data.tar.gz: b5fc6c161f4c491d6cf80f32eaa7ea2f494c21bda689424baa3bb7e6ea4628f0
 SHA512:
-  metadata.gz: 8a998780ee5f376ac50fb6611452f938344083de3d47881ad70131eedf398d4a1ed7d069d37e574ac3d4fc8666e219bb01b803eff2fdae1f6b6c7198b0c4627b
-  data.tar.gz: 0d1877cb56acd61d78652645606baf1e8f3f9bea393eba673fc70d00c588382a1a68b104a75d54e26a3067cbaeaac29fe2e2962634c3a43106314e346167da86
+  metadata.gz: c36a250861f7afa38a3fef39a72979d71576bfd71083e46e7405d42c4c050fa38f21374b8abbcbac6485c39c5c51bf9a240a5d08d4db073f8e229f496b7c70f0
+  data.tar.gz: fcfe9ec464a7ee86e725bb2fd93c02151d429057764fe987db90ceee1887adcb1aec4770ea3dbc571a9a3ebc86a9e967c4f90dd679b780725c2711795532b896

data/README.md

@@ -7,7 +7,7 @@ directly with ruby code.
 
   The layout behavior can be changed, the default one being
 implemented by the `uh-layout` ruby gem. A layout is a simple ruby
-object responding to specific messages, so you can wrote your own in
+object responding to specific messages, so you can write your own in
 plain ruby without any dependency.
 
   Main features:
@@ -16,7 +16,7 @@ plain ruby without any dependency.
   * different adapters for event handling: blocking, multiplexing
     with `select()` or `kqueue()`;
   * configuration with a run control file;
-  * key bindings with user defined code as callback;
+  * key bindings with user defined callbacks;
   * configurable modifier key;
   * user-defined layout behavior (ruby);
   * external program execution;
@@ -67,8 +67,7 @@ BROWSERS  = %w[
 
 modifier :mod1                # This key is added to the modifier mask for *all*
                               # key bindings.
-key(:p)     { execute DMENU } # Execute given command in a shell when mod1+shift
-                              # is pressed.
+key(:p)     { execute DMENU } # Execute given command in a shell with mod1+p.
 key(:Q)     { quit }          # Quit when mod1+shift+q is pressed (a capitalized
                               # key adds shift to mod mask).
 key(:enter) { execute VT }    # Common key names (`enter') are translated to

data/lib/uh/wm/actions_handler.rb

@@ -68,16 +68,16 @@ module Uh
       end
 
       # Forwards unhandled messages prefixed with `layout_` to the layout,
-      # without the prefix
+      # replacing the prefix with `handle_`
       # @example
-      #   layout_foo # delegates to `layout.foo'
+      #   layout_foo # delegates to `layout.handle_foo'
       def method_missing m, *args, &block
         if respond_to? m
           meth = layout_method m
           log "#{layout.class.name}##{meth} #{args.inspect}"
-          begin
+          if layout.respond_to? meth
             layout.send meth, *args
-          rescue NoMethodError
+          else
             log_error "Layout does not implement `#{meth}'"
           end
         else
@@ -100,7 +100,7 @@ module Uh
     private
 
       def layout_method m
-        m.to_s.gsub(/\Alayout_/, 'handle_').to_sym
+        m.to_s.sub(/\Alayout_/, 'handle_').to_sym
       end
     end
   end

data/lib/uh/wm/env.rb

@@ -24,7 +24,7 @@ module Uh
       attr_accessor :rc_path, :modifier, :modifier_ignore, :worker, :layout,
                     :layout_class, :layout_options, :rules, :launch
 
-      def initialize output: $stdout, **_
+      def initialize **_
         super
         @rc_path          = RC_PATH
         @modifier         = MODIFIER

data/lib/uh/wm/run_control.rb

@@ -75,7 +75,7 @@ module Uh
       # @param arg [Class, Object, Hash] A layout class, a layout instance, or
       #   options for the default layout
       # @param options [Hash] Layout options
-      def layout arg, **options
+      def layout arg, options = {}
         case arg
         when Class
           if options.any?
@@ -144,7 +144,7 @@ module Uh
         translated_keysym = KEYSYM_TRANSLATIONS.key?(translate_key) ?
           KEYSYM_TRANSLATIONS[translate_key] :
           translate_key
-        keysym =~ /[A-Z]/ ? [translated_keysym, :shift] : translated_keysym
+        keysym.to_s =~ /[A-Z]/ ? [translated_keysym, :shift] : translated_keysym
       end
     end
   end

data/lib/uh/wm/testing/acceptance_helpers.rb

@@ -1,4 +1,4 @@
-require 'baf/testing/cucumber/steps/output_wait'
+require 'baf/testing/process'
 
 require 'uh'
 require 'uh/wm/testing/x_client'
@@ -13,7 +13,8 @@ module Uh
         attr_reader :other_wm
 
         def icccm_window_start
-          @icccm_window = ChildProcess.build(*%w[xmessage window])
+          @icccm_window = Baf::Testing::Process.new %w[xmessage window],
+            env_allow: %w[DISPLAY]
           @icccm_window.start
         end
 
@@ -33,20 +34,21 @@ module Uh
           uhwm_request_quit
         end
 
-        def uhwm_wait_ready
-          wait_output! LOG_READY
-        end
-
         def uhwm_run_wait_ready options = '-v'
-          program_run wait: false, opts: options
-          uhwm_wait_ready
+          cmd = $_baf[:program] + options.split(' ')
+          env = Baf::Testing::ENV_WHITELIST + $_baf[:env_allow]
+          Baf::Testing::Process.new(cmd, env_allow: env).tap do |uhwm|
+            uhwm.start
+            Baf::Testing.wait_output LOG_READY, stream: -> { uhwm.output }
+          end
         end
 
-        def with_other_wm
-          @other_wm = ChildProcess.build('./bin/uhwm')
+        def with_other_wm uhwm_command
+          env = Baf::Testing::ENV_WHITELIST + $_baf[:env_allow]
+          @other_wm = Baf::Testing::Process.new uhwm_command, env_allow: env
           @other_wm.start
           yield
-          @other_wm.stop
+          uhwm_request_quit
           @other_wm = nil
         end
 

data/lib/uh/wm/testing/headless.rb

@@ -1,4 +1,4 @@
-require 'childprocess'
+require 'baf/testing/process'
 
 module Uh
   module WM
@@ -8,15 +8,18 @@ module Uh
         DISPLAY_SCREEN  = '640x480x24'
 
         def with_xvfb
-          xvfb = ChildProcess.build(*%W[
+          xvfb = Baf::Testing::Process.new %W[
             Xvfb -ac #{DISPLAY_NAME} -screen 0 #{DISPLAY_SCREEN}
-          ])
+          ]
           xvfb.start
           original_display = ENV['DISPLAY']
           ENV['DISPLAY'] = DISPLAY_NAME
-          yield
-          ENV['DISPLAY'] = original_display
-          xvfb.stop
+          begin
+            yield
+          ensure
+            ENV['DISPLAY'] = original_display
+            xvfb.stop
+          end
         end
       end
     end

data/lib/uh/wm/testing/x_client.rb

@@ -26,7 +26,7 @@ module Uh
         end
 
         def window_id
-          @window.id
+          window.id
         end
 
         def window_name

data/lib/uh/wm/version.rb

@@ -1,5 +1,5 @@
 module Uh
   module WM
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/uh/wm/workers/base.rb

@@ -4,7 +4,7 @@ module Uh
       class Base
         CALLBACKS = %w[before_watch on_timeout on_read on_read_next].freeze
 
-        def initialize **_options
+        def initialize *_options
           @ios = []
         end
 

data/lib/uh/wm/workers.rb

@@ -2,9 +2,9 @@ module Uh
   module WM
     module Workers
       FACTORIES = {
-        block:  ->(options) { Blocking.new(options) },
-        kqueue: ->(options) { KQueue.new(options) },
-        mux:    ->(options) { Mux.new(options) }
+        block:  ->(options) { Blocking.new(**options) },
+        kqueue: ->(options) { KQueue.new(**options) },
+        mux:    ->(options) { Mux.new(**options) }
       }.freeze
 
       class << self
@@ -16,7 +16,7 @@ module Uh
           FACTORIES.key? type
         end
 
-        def build type, **options
+        def build type, options = {}
           (FACTORIES[type] or fail ArgumentError, "unknown worker: `#{type}'")
             .call options
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-wm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Thibault Jouan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baf
@@ -79,33 +79,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: baf-testing
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '3.11'
 description: |2
     uhwm is a minimalistic tiling and stacking window manager for X. It
   shares some similarities with dwm and wmii, but is written in ruby so
@@ -145,7 +159,7 @@ homepage: https://rubygems.org/gems/uh-wm
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,9 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: minimalistic tiling and stacking X window manager
 test_files: []