uh-wm 0.0.2.pre → 0.0.2

data/features/manager/x_errors.feature

@@ -0,0 +1,17 @@
+Feature: X errors logging
+
+  Scenario: logs error details
+    Given a file named layout.rb with:
+      """
+      class Layout
+        def register _; end
+
+        # Focusing a client before mapping will force an error
+        def << client
+          client.focus
+        end
+      end
+      """
+    And uhwm is running with options -v -r./layout -l Layout
+    When a window requests to be mapped
+    Then the output must match /x.*error.+x_setinputfocus.+/i

data/features/run_control/evaluation.feature

@@ -0,0 +1,18 @@
+Feature: run control file evaluation
+
+  Scenario: evaluates the default run control file when present
+    Given a run control file with:
+      """
+      puts 'run control evaluation'
+      """
+    When I start uhwm
+    Then the output must contain "run control evaluation"
+
+  Scenario: reports run control code in backtrace on errors
+    Given a run control file with:
+      """
+      'no error on first line'
+      fail 'fails on second line'
+      """
+    When I start uhwm
+    Then the output must match /\.uhwmrc\.rb:2:.+fails on second line/

data/features/run_control/key.feature

@@ -0,0 +1,33 @@
+Feature: `key' run control keyword
+
+  Scenario: defines code to run when given key is pressed
+    Given uhwm is running with this run control file:
+      """
+      key(:f) { puts 'trigger f key code' }
+      """
+    When I press the alt+f keys
+    Then the output must contain "trigger f key code"
+
+  Scenario: defines code to run when given keys are pressed
+    Given uhwm is running with this run control file:
+      """
+      key(:f, :shift) { puts 'trigger f key code' }
+      """
+    When I press the alt+shift+f keys
+    Then the output must contain "trigger f key code"
+
+  Scenario: translates common key names to their X equivalent
+    Given uhwm is running with this run control file:
+      """
+      key(:enter) { puts 'trigger return key code' }
+      """
+    When I press the alt+Return keys
+    Then the output must contain "trigger return key code"
+
+  Scenario: translates upcased key names to combination with shift key
+    Given uhwm is running with this run control file:
+      """
+      key(:F) { puts 'trigger shift+f key code' }
+      """
+    When I press the alt+shift+f keys
+    Then the output must contain "trigger shift+f key code"

data/features/run_control/modifier.feature

@@ -0,0 +1,10 @@
+Feature: `modifier' run control keyword
+
+  Scenario: configures the modifier key
+    Given a run control file with:
+      """
+      modifier :ctrl
+      """
+    And uhwm is running
+    When I press the ctrl+shift+q keys
+    Then uhwm must terminate successfully

data/features/run_control/worker.feature

@@ -0,0 +1,9 @@
+Feature: `worker' run control keyword
+
+  Scenario: configures the modifier key
+    Given a run control file with:
+      """
+      worker :mux
+      """
+    And I start uhwm
+    Then the output must match /work.+event.+mux/i

data/features/session/connection.feature

@@ -0,0 +1,5 @@
+Feature: connection to X server
+
+  Scenario: connects to X server
+    When I start uhwm
+    Then it must connect to X display

data/features/session/termination.feature

@@ -0,0 +1,13 @@
+Feature: program termination
+
+  Background:
+    Given uhwm is running
+
+  Scenario: terminates on quit request
+    When I tell uhwm to quit
+    Then uhwm must terminate successfully
+
+  Scenario: logs about termination
+    When I tell uhwm to quit
+    Then uhwm must terminate successfully
+    And the output must match /terminat/i

data/features/steps/filesystem_steps.rb

@@ -0,0 +1,3 @@
+Given /^a file named ([^ ]+) with:$/ do |path, content|
+  write_file path, content
+end

data/features/steps/output_steps.rb

@@ -0,0 +1,44 @@
+Then /^the output must contain exactly the usage$/ do
+  assert_exact_output <<-eoh, all_output
+Usage: uhwm [options]
+
+options:
+    -v, --verbose                    enable verbose mode
+    -d, --debug                      enable debug mode
+    -f, --run-control PATH           specify alternate run control file
+    -r, --require PATH               require ruby feature
+    -l, --layout LAYOUT              specify layout
+    -w, --worker WORKER              specify worker
+
+    -h, --help                       print this message
+    -V, --version                    print version
+  eoh
+end
+
+Then /^the output must contain exactly the version$/ do
+  assert_exact_output "%s\n" % Uh::WM::VERSION, all_output
+end
+
+Then /^the output must match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|
+  uhwm_wait_output Regexp.new(pattern, options)
+end
+
+Then /^the output must not match \/([^\/]+)\/([a-z]*)$/ do |pattern, options|
+  expect(all_output).not_to match Regexp.new(pattern, options)
+end
+
+Then /^the output must contain:$/ do |content|
+  uhwm_wait_output content.to_s
+end
+
+Then /^the output must contain "([^"]+)"$/ do |content|
+  uhwm_wait_output content.to_s
+end
+
+Then /^the output must contain current display$/ do
+  uhwm_wait_output ENV['DISPLAY']
+end
+
+Then /^the output must contain the window name$/ do
+  uhwm_wait_output x_window_name
+end

data/features/steps/run_control_steps.rb

@@ -0,0 +1,3 @@
+Given /^a run control file with:$/ do |content|
+  write_file '.uhwmrc.rb', content
+end

data/features/steps/run_steps.rb

@@ -0,0 +1,41 @@
+Given /^another window manager is running$/ do
+  expect(other_wm).to be_alive
+end
+
+Given /^uhwm is running$/ do
+  uhwm_run_wait_ready
+end
+
+Given /^uhwm is running with options? (-.+)$/ do |options|
+  uhwm_run_wait_ready options
+end
+
+Given /^uhwm is running with this run control file:$/ do |rc|
+  write_file '.uhwmrc.rb', rc
+  uhwm_run_wait_ready
+end
+
+When /^I start uhwm$/ do
+  uhwm_run
+end
+
+When /^I run uhwm with options? (-.+)$/ do |options|
+  uhwm_run options
+end
+
+When /^I tell uhwm to quit$/ do
+  x_key 'alt+shift+q'
+end
+
+When /^I quit uhwm$/ do
+  x_key 'alt+shift+q'
+  assert_exit_status 0
+end
+
+Then /^the exit status must be (\d+)$/ do |exit_status|
+  assert_exit_status exit_status.to_i
+end
+
+Then /^uhwm must terminate successfully$/ do
+  assert_exit_status 0
+end

data/features/steps/x_steps.rb

@@ -0,0 +1,53 @@
+Given /^a (\w+) window is mapped$/ do |ident|
+  x_window_map ident: ident
+end
+
+Given /^a window is managed$/ do
+  x_window_map
+  uhwm_wait_output /manag.+#{x_window_name}/i
+end
+
+When /^I press the ([^ ]+) keys?$/ do |keys|
+  x_key keys
+end
+
+When /^a window requests to be mapped$/ do
+  x_window_map
+end
+
+When /^the window requests to be unmapped$/ do
+  x_window_unmap
+end
+
+When /^the (\w+) window requests to be unmapped$/ do |ident|
+  x_window_unmap ident: ident
+end
+
+When /^a window requests to be mapped (\d+) times$/ do |times|
+  x_window_map times: times.to_i
+end
+
+When /^the window is destroyed$/ do
+  x_window_destroy
+end
+
+Then /^it must connect to X display$/ do
+  uhwm_wait_output 'Connected to'
+  expect(x_socket_check uhwm_pid).to be true
+end
+
+Then /^the window must be mapped$/ do
+  expect(x_window_map_state).to eq 'IsViewable'
+end
+
+Then /^the (\w+) window must be mapped$/ do |ident|
+  expect(x_window_map_state ident: ident).to eq 'IsViewable'
+end
+
+Then /^the window must be focused$/ do
+  expect(x_focused_window_id).to eq x_window_id
+end
+
+Then /^the input event mask must include (.+)$/ do |mask|
+  expect(x_input_event_masks).to include mask
+end

data/features/support/env.rb

@@ -0,0 +1,33 @@
+require 'aruba/cucumber'
+require 'headless'
+
+require 'uh/wm/testing/acceptance_helpers'
+
+module Aruba
+  class SpawnProcess
+    def pid
+      @process.pid
+    end
+  end
+end
+
+World(Uh::WM::Testing::AcceptanceHelpers)
+
+Headless.new.start
+
+Before do
+  set_env 'HOME', File.expand_path(current_dir)
+end
+
+After do
+  uhwm_ensure_stop
+  x_clients_ensure_stop
+end
+
+Around '@other_wm_running' do |_, block|
+  with_other_wm { block.call }
+end
+
+if ENV.key? 'TRAVIS'
+  ENV['UHWMTEST_TIMEOUT'] = 8.to_s
+end

data/lib/uh/wm.rb

@@ -3,13 +3,21 @@ require 'logger'
 require 'optparse'
 require 'uh'
 
+require 'uh/wm/env_logging'
+
 require 'uh/wm/actions_handler'
 require 'uh/wm/cli'
+require 'uh/wm/client'
 require 'uh/wm/dispatcher'
 require 'uh/wm/env'
+require 'uh/wm/logger_formatter'
 require 'uh/wm/manager'
 require 'uh/wm/run_control'
 require 'uh/wm/runner'
+require 'uh/wm/workers'
+require 'uh/wm/workers/base'
+require 'uh/wm/workers/blocking'
+require 'uh/wm/workers/mux'
 
 module Uh
   module WM

data/lib/uh/wm/actions_handler.rb

@@ -1,6 +1,11 @@
 module Uh
   module WM
     class ActionsHandler
+      include EnvLogging
+
+      extend Forwardable
+      def_delegator :@env, :layout
+
       def initialize env, events
         @env, @events = env, events
       end
@@ -10,8 +15,49 @@ module Uh
       end
 
       def quit
+        log 'Quit requested'
         @events.emit :quit
       end
+
+      def execute command
+        log "Execute: #{command}"
+        pid = fork do
+          fork do
+            Process.setsid
+            begin
+              exec command
+            rescue Errno::ENOENT => e
+              log_error "ExecuteError: #{e}"
+            end
+          end
+        end
+        Process.waitpid pid
+      end
+
+      def method_missing(m, *args, &block)
+        if respond_to? m
+          meth = layout_method m
+          log "#{layout.class.name}##{meth} #{args.inspect}"
+          begin
+            layout.send(meth, *args)
+          rescue NoMethodError
+            log_error "Layout does not implement `#{meth}'"
+          end
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(m, *)
+        m.to_s =~ /\Alayout_/ || super
+      end
+
+
+      private
+
+      def layout_method(m)
+        m.to_s.gsub(/\Alayout_/, 'handle_').to_sym
+      end
     end
   end
 end

data/lib/uh/wm/cli.rb

@@ -3,6 +3,8 @@ module Uh
     class CLI
       ArgumentError = Class.new(ArgumentError)
 
+      include EnvLogging
+
       USAGE = "Usage: #{File.basename $0} [options]".freeze
 
       EX_USAGE    = 64
@@ -49,33 +51,38 @@ module Uh
           opts.separator ''
           opts.separator 'options:'
 
-          opts.on '-h', '--help', 'print this message' do
-            @env.print opts
-            exit
-          end
-
-          opts.on '-v', '--version', 'enable verbose mode' do
+          opts.on '-v', '--verbose', 'enable verbose mode' do
             @env.verbose = true
             @env.log_logger_level
           end
-
           opts.on '-d', '--debug', 'enable debug mode' do
             @env.debug = true
             @env.log_logger_level
           end
-
           opts.on '-f', '--run-control PATH',
-            'specify alternate run control file' do |e|
+              'specify alternate run control file' do |e|
             @env.rc_path = e
           end
-
           opts.on '-r', '--require PATH', 'require ruby feature' do |feature|
             require feature
-            @env.log "Loaded `#{feature}' ruby feature"
+            log "Loaded `#{feature}' ruby feature"
           end
-
           opts.on '-l', '--layout LAYOUT', 'specify layout' do |layout|
-            @env.layout_class = self.class.const_get layout.to_sym
+            @env.layout_class = Object.const_get layout.to_sym
+          end
+          opts.on '-w', Workers.types, '--worker WORKER',
+              'specify worker' do |worker|
+            @env.worker = worker.to_sym
+          end
+
+          opts.separator ''
+          opts.on_tail '-h', '--help', 'print this message' do
+            @env.print opts
+            exit
+          end
+          opts.on_tail '-V', '--version', 'print version' do
+            @env.puts VERSION
+            exit
           end
         end
       end