uh-wm 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f36b28780f56841b401c23d062a1a46bb420ad91
-  data.tar.gz: d42c2d7864fd8211115c0f975436f6aa57184a0e
+  metadata.gz: a3607acc6f3a156a4fe6ecfdd4c960daecdde3bc
+  data.tar.gz: 9aac8a32b1d1619e055e0c5af14e28d8033dfe9f
 SHA512:
-  metadata.gz: 789e6b27ddb37be96a2d766843139256334fb7891967b3ab8a9a051fe0163e09315a7ea216ec5158028d1c0e9ea7fc55889d688c0ef2df3886023fb466d39c52
-  data.tar.gz: 7d3d6b8fdbd28b553a474777a1fa5316fbfa8c73521f9e4efbeb2eebc438754c4374e98124e60562699ea681ebf51571995a2aac83df389fc1eb98b97a4c97ba
+  metadata.gz: f332e7a7d0b81b91d356f7e6345f073eb551d0ea6cabe361285df90c62a14b3cecb29c32f339b5fb032d47c343135b7bb676fb026111ef66463bd38f548a504e
+  data.tar.gz: 2e0fbe32e68ef89136a64045f55180fcf3211bd9dc1a4b6dfba461356e3a8076be7d64dcbb989fcacd07d4058dd756c6748315a484c0376d1cacbf304b134a98

data/lib/uh/wm/actions_handler.rb

@@ -38,6 +38,15 @@ module Uh
         Process.waitpid pid
       end
 
+      def kill_current
+        return unless layout.current_client
+        layout.current_client.kill
+      end
+
+      def log_separator
+        log '- ' * 24
+      end
+
       def method_missing(m, *args, &block)
         if respond_to? m
           meth = layout_method m

data/lib/uh/wm/cli.rb

@@ -35,7 +35,7 @@ module Uh
       def parse_arguments!
         option_parser.parse! @arguments
       rescue OptionParser::InvalidOption => e
-        fail ArgumentError, option_parser
+        raise ArgumentError, option_parser
       end
 
       def run

data/lib/uh/wm/client.rb

@@ -66,6 +66,20 @@ module Uh
         @window.focus
         self
       end
+
+      def kill
+        if @window.icccm_wm_protocols.include? :WM_DELETE_WINDOW
+          @window.icccm_wm_delete
+        else
+          @window.kill
+        end
+        self
+      end
+
+      def kill!
+        window.kill
+        self
+      end
     end
   end
 end

data/lib/uh/wm/env.rb

@@ -16,13 +16,14 @@ module Uh
 
       extend Forwardable
       def_delegator   :logger, :info,   :log
+      def_delegator   :logger, :fatal,  :log_fatal
       def_delegator   :logger, :error,  :log_error
       def_delegator   :logger, :debug,  :log_debug
       def_delegators  :@output, :print, :puts
 
       attr_reader   :output, :keybinds
       attr_accessor :verbose, :debug, :rc_path, :modifier, :worker,
-                    :layout, :layout_class
+                    :layout, :layout_class, :rules, :launch
 
       def initialize output
         @output   = output
@@ -30,6 +31,7 @@ module Uh
         @modifier = MODIFIER
         @keybinds = KEYBINDS.dup
         @worker   = :block
+        @rules    = {}
       end
 
       def verbose?

data/lib/uh/wm/env_logging.rb

@@ -2,7 +2,7 @@ module Uh
   module WM
     module EnvLogging
       extend Forwardable
-      def_delegators :@env, :log, :log_error, :log_debug
+      def_delegators :@env, :log, :log_fatal, :log_error, :log_debug
     end
   end
 end

data/lib/uh/wm/launcher.rb

@@ -0,0 +1,73 @@
+module Uh
+  module WM
+    class Launcher
+      class << self
+        def launch runner, instructions
+          new(runner.actions, runner.rules, runner.method(:run_until))
+            .launch instructions
+        end
+      end
+
+      def initialize actions, rules, run_until
+        @actions    = actions
+        @rules      = rules
+        @run_until  = run_until
+      end
+
+      def launch instructions
+        with_clean_rules do
+          rules = @rules
+          DSL.new(@actions).evaluate(instructions).each do |m, args, block|
+            if m == :execute!
+              @rules[//] = -> { rules.clear }
+              @actions.execute *args, &block
+              @run_until.call { @rules.empty? }
+            else
+              @actions.send m, *args, &block
+            end
+          end
+        end
+      end
+
+
+      private
+
+      def with_clean_rules
+        original_rules = @rules.dup
+        @rules.clear
+        yield
+        @rules.clear
+        @rules.merge! original_rules
+      end
+
+
+      class DSL
+        def initialize actions
+          @actions  = actions
+          @messages = []
+        end
+
+        def evaluate instructions
+          instance_eval &instructions
+          self
+        end
+
+        def each
+          @messages.each { |m| yield *m }
+        end
+
+        def method_missing m, *args, &block
+          if respond_to? m
+            @messages << [m, args, block]
+          else
+            super
+          end
+        end
+
+        def respond_to_missing? m, _
+          m == :execute! || @actions.respond_to?(m) || super
+        end
+      end
+    end
+  end
+end

data/lib/uh/wm/run_control.rb

@@ -22,6 +22,8 @@ module Uh
 
       def evaluate code, path
         instance_eval code, path
+      rescue ::StandardError, ::ScriptError => e
+        raise RunControlEvaluationError, e.message, e.backtrace
       end
 
       def modifier mod
@@ -48,6 +50,14 @@ module Uh
         @env.worker = [type, options]
       end
 
+      def rule selectors = '', &block
+        [*selectors].each { |selector| @env.rules[/\A#{selector}/i] = block }
+      end
+
+      def launch &block
+        @env.launch = block
+      end
+
 
       private
 

data/lib/uh/wm/runner.rb

@@ -17,7 +17,7 @@ module Uh
       extend Forwardable
       def_delegator :@env, :layout
 
-      attr_reader :env, :events, :actions
+      attr_reader :env, :events, :actions, :rules
 
       def initialize env, manager: nil, stopped: false
         @env      = env
@@ -25,6 +25,7 @@ module Uh
         @manager  = manager
         @actions  = ActionsHandler.new(@env, @events)
         @stopped  = stopped
+        @rules    = @env.rules
       end
 
       def stopped?
@@ -44,7 +45,7 @@ module Uh
       end
 
       def register_event_hooks
-        %w[runner manager layout keybinds]
+        %w[runner manager layout keybinds rules launcher]
           .map  { |e| "register_#{e}_hooks".to_sym }
           .each { |e| send e }
       end
@@ -74,7 +75,7 @@ module Uh
       end
 
       def terminate
-        log "Terminating..."
+        log 'Terminating...'
         manager.disconnect
       end
 
@@ -92,9 +93,15 @@ module Uh
         @events.on :connected do |display|
           log "Connected to X server on `#{display}'"
         end
-        @events.on(:disconnected) { log "Disconnected from X server" }
+        @events.on(:disconnected) { log 'Disconnected from X server' }
         @events.on(:xevent) { |event| XEventLogger.new(env).log_event event }
-        @events.on(:xerror) { |*error| XEventLogger.new(env).log_xerror *error }
+        @events.on(:xerror) do |*error|
+          if error.none?
+            log_fatal 'Fatal X IO Error received'
+          else
+            XEventLogger.new(env).log_xerror *error
+          end
+        end
       end
 
       def register_layout_hooks
@@ -130,6 +137,20 @@ module Uh
         end
       end
 
+      def register_rules_hooks
+        @events.on :manage do |client|
+          @rules.each do |selector, code|
+            @actions.evaluate code if client.wclass =~ selector
+          end
+        end
+      end
+
+      def register_launcher_hooks
+        @events.on :connected do
+          Launcher.launch(self, @env.launch) if @env.launch
+        end
+      end
+
 
       class XEventLogger
         include EnvLogging

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

@@ -1,4 +1,5 @@
 require 'uh'
+require 'uh/wm/testing/x_client'
 
 module Uh
   module WM
@@ -8,6 +9,29 @@ module Uh
         QUIT_KEYBINDING = 'alt+shift+q'.freeze
         LOG_READY       = 'Working events'.freeze
 
+        def build_regexp pattern, options
+          Regexp.new(pattern, options.each_char.inject(0) do |m, e|
+            m | case e
+            when ?i then Regexp::IGNORECASE
+            when ?m then Regexp::MULTILINE
+            when ?x then Regexp::EXTENDED
+            end
+          end)
+        end
+
+        def icccm_window_start
+          @icccm_window = ChildProcess.build(*%w[xmessage window])
+          @icccm_window.start
+        end
+
+        def icccm_window_ensure_stop
+          @icccm_window.stop
+        end
+
+        def icccm_window_name
+          'xmessage'
+        end
+
         def uhwm_run options = '-v'
           command = %w[uhwm]
           command << options if options
@@ -39,7 +63,7 @@ module Uh
           end
           value
         rescue TimeoutError => e
-          fail <<-eoh
+          raise <<-eoh
 expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
   ```\n#{output.call.lines.map { |e| "  #{e}" }.join}  ```
           eoh
@@ -85,21 +109,19 @@ expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
             .grep /Mask\z/
         end
 
-        def x_key k
+        def x_key *k, delay: 12
+          k = k.join " key --delay #{delay} "
           fail "cannot simulate X key `#{k}'" unless system "xdotool key #{k}"
         end
 
-        def x_socket_check pid
-          case RbConfig::CONFIG['host_os']
-          when /linux/
-            `netstat -xp 2> /dev/null`.lines.grep /\s+#{pid}\/ruby/
-          else
-            `sockstat -u`.lines.grep /\s+ruby.+\s+#{pid}/
-          end.any?
-        end
-
-        def x_window_map_state window_id
-          `xwininfo -id #{window_id}`[/Map State: (\w+)/, 1]
+        def x_window_map_state window_selector
+          select_args = case window_selector
+            when Integer  then "-id #{window_selector}"
+            when String   then "-name #{window_selector}"
+            else fail ArgumentError,
+              "not an Integer nor a String: `#{window_selector.inspect}'"
+          end
+          `xwininfo #{select_args} 2> /dev/null`[/Map State: (\w+)/, 1]
         end
 
 
@@ -116,7 +138,7 @@ expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
             end
           end
         rescue Timeout::Error
-          fail TimeoutError.new(message % timeout, timeout)
+          raise TimeoutError.new(message % timeout, timeout)
         end
 
 
@@ -128,57 +150,6 @@ expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
             @timeout = timeout
           end
         end
-
-        class XClient
-          attr_reader :name
-
-          def initialize name = object_id
-            @name     = "#{self.class.name.split('::').last}/#{name}"
-            @geo      = Geo.new(0, 0, 640, 480)
-            @display  = Display.new.tap { |o| o.open }
-          end
-
-          def terminate
-            @display.close
-          end
-
-          def sync
-            @display.sync false
-          end
-
-          def window
-            @window ||= @display.create_window(@geo).tap { |o| o.name = @name }
-          end
-
-          def window_id
-            @window.id
-          end
-
-          def window_name
-            @name
-          end
-
-          def window_name= name
-            @name = @window.name = name
-            window.name
-          end
-
-          def map times: 1
-            times.times { window.map }
-            window.map
-            self
-          end
-
-          def unmap
-            window.unmap
-            self
-          end
-
-          def destroy
-            window.destroy
-            self
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,63 @@
+require 'uh'
+
+module Uh
+  module WM
+    module Testing
+      class XClient
+        attr_reader :name
+
+        def initialize name = object_id
+          @name     = "#{self.class.name.split('::').last}/#{name}"
+          @geo      = Geo.new(0, 0, 640, 480)
+          @display  = Display.new.tap &:open
+        end
+
+        def terminate
+          @display.close
+        end
+
+        def sync
+          @display.sync false
+          self
+        end
+
+        def window
+          @window ||= @display.create_window(@geo).tap { |o| o.name = @name }
+        end
+
+        def window_id
+          @window.id
+        end
+
+        def window_name
+          @name
+        end
+
+        def window_name= name
+          @name = window.name = name
+          window.name
+        end
+
+        def window_class= wclass
+          window.wclass = [wclass] * 2
+        end
+
+        def map times: 1
+          times.times { window.map }
+          window.map
+          self
+        end
+
+        def unmap
+          window.unmap
+          self
+        end
+
+        def destroy
+          window.destroy
+          self
+        end
+      end
+    end
+  end
+end

data/lib/uh/wm/version.rb

@@ -1,5 +1,5 @@
 module Uh
   module WM
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

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

@@ -9,7 +9,7 @@ module Uh
         end
 
         def watch io
-          @ios << io
+          @ios << io.to_io
         end
 
         CALLBACKS.each do |m|

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

@@ -2,7 +2,9 @@ module Uh
   module WM
     module Workers
       class Mux < Base
-        def initialize timeout: 1
+        TIMEOUT_DEFAULT = 1
+
+        def initialize timeout: TIMEOUT_DEFAULT
           super
           @timeout = timeout
         end

data/lib/uh/wm.rb

@@ -10,6 +10,7 @@ require 'uh/wm/cli'
 require 'uh/wm/client'
 require 'uh/wm/dispatcher'
 require 'uh/wm/env'
+require 'uh/wm/launcher'
 require 'uh/wm/logger_formatter'
 require 'uh/wm/manager'
 require 'uh/wm/run_control'
@@ -21,9 +22,10 @@ require 'uh/wm/workers/mux'
 
 module Uh
   module WM
-    Error               = Class.new(StandardError)
-    RuntimeError        = Class.new(RuntimeError)
-    ArgumentError       = Class.new(Error)
+    Error                     = Class.new(StandardError)
+    RuntimeError              = Class.new(RuntimeError)
+    ArgumentError             = Class.new(Error)
+    RunControlEvaluationError = Class.new(RuntimeError)
 
     class OtherWMRunningError < RuntimeError
       def message