uh-wm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959239c4e633cdfa25d86371729560ddf40afa4a
-  data.tar.gz: 704626fb3cfe89b8ea8d84fe5f6e1200d9000ffa
+  metadata.gz: 27b71703a3d4d2c882d1b7eb6a972959dae65c49
+  data.tar.gz: ead216935237c4e923b9e9469ce86681555daaba
 SHA512:
-  metadata.gz: e2a06d4832cfff8ffdb1ed5bf6c59f999b51c8d6e3f055f449e5414be799fd0c88beaf0b054a0c9054d0930d0bfb5a170fc1b5090966c3f60f90b1a9778de3ff
-  data.tar.gz: 5f96afa7bc57f3ea5e48dc7a8ba8544b9472b29957c06ef0a760a3ba8423c6d0ce26614e2cee2f9e1f70e57aa3253ff724962f2c9b4bfcd8043bda5953442cb7
+  metadata.gz: e62db9a4023fe8ca1f9237135c5bb4349ea74842614808bd64c72d41a1b1dcab8094cf1419faba6de0ee5068e1e0f30be683684604a105dd78720a19579da731
+  data.tar.gz: 5d5d760b11fc9c6c21365ae3c9a06a5a25dc3ba49508588c6dbdd196c2aa34e9d8f07bac4186bff6c53342584f8274729f4a4fbf326279a819e909777724b96a

data/lib/uh/wm.rb

@@ -1,3 +1,4 @@
+require 'baf/cli'
 require 'forwardable'
 require 'logger'
 require 'optparse'

data/lib/uh/wm/cli.rb

@@ -1,90 +1,39 @@
 module Uh
   module WM
-    class CLI
-      ArgumentError = Class.new(ArgumentError)
-
-      include EnvLogging
-
-      USAGE = "Usage: #{File.basename $0} [options]".freeze
-
-      EX_USAGE    = 64
-      EX_SOFTWARE = 70
-
+    class CLI < Baf::CLI
       class << self
-        def run arguments, stdout: $stdout, stderr: $stderr
-          cli = new arguments, stdout: stdout
-          cli.parse_arguments!
-          cli.run
-        rescue ArgumentError => e
-          stderr.puts e
-          exit EX_USAGE
-        rescue RuntimeError => e
-          stderr.puts "#{e.class.name}: #{e.message}"
-          stderr.puts e.backtrace.map { |l| '  %s' % l } if cli.env.debug?
-          exit EX_SOFTWARE
+        def handle_error env, ex
+          env.puts_error "#{ex.class.name}: #{ex.message}"
+          env.puts_error ex.backtrace.map { |l| '  %s' % l } if env.debug?
         end
       end
 
-      attr_reader :env
+      def setup
+        flag_verbose
+        flag_debug
+        flag_version WM::VERSION
 
-      def initialize args, stdout: $stdout
-        @arguments  = args
-        @env        = Env.new(stdout.tap { |o| o.sync = true })
-      end
+        option :f, :run_control, 'PATH', 'specify alternate run control file' do |path|
+          @env.rc_path = path
+        end
+        option :r, :require, 'PATH', 'require ruby feature' do |feature|
+          require feature
+          env.log "Loaded `#{feature}' ruby feature"
+        end
+        option :l, :layout, 'LAYOUT', 'specify layout' do |layout|
+          env.layout_class = Object.const_get layout.to_sym
+        end
+        option :w, :worker, 'WORKER', 'specify worker' do |worker|
+          env.worker = worker.to_sym
+        end
 
-      def parse_arguments!
-        option_parser.parse! @arguments
-      rescue OptionParser::InvalidOption
-        raise ArgumentError, option_parser
+        env.sync_output
       end
 
       def run
+        env.log_logger_level
         Runner.run env
       end
-
-    private
-
-      def option_parser
-        OptionParser.new do |opts|
-          opts.banner = USAGE
-          opts.separator ''
-          opts.separator 'options:'
-
-          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|
-            @env.rc_path = e
-          end
-          opts.on '-r', '--require PATH', 'require ruby feature' do |feature|
-            require feature
-            log "Loaded `#{feature}' ruby feature"
-          end
-          opts.on '-l', '--layout LAYOUT', 'specify layout' do |layout|
-            @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 WM::VERSION
-            exit
-          end
-        end
-      end
     end
   end
 end

data/lib/uh/wm/env.rb

@@ -1,6 +1,6 @@
 module Uh
   module WM
-    class Env
+    class Env < Baf::Env
       RC_PATH = '~/.uhwmrc.rb'.freeze
 
       MODIFIER  = :mod1
@@ -15,19 +15,17 @@ module Uh
       LOGGER_LEVEL_STRINGS  = %w[DEBUG INFO WARN ERROR FATAL UNKNOWN].freeze
 
       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
+      def_delegator :logger, :info,   :log
+      def_delegator :logger, :fatal,  :log_fatal
+      def_delegator :logger, :error,  :log_error
+      def_delegator :logger, :debug,  :log_debug
 
-      attr_reader   :output, :keybinds
-      attr_accessor :verbose, :debug, :rc_path, :modifier, :modifier_ignore,
-                    :worker, :layout, :layout_class, :layout_options, :rules,
-                    :launch
+      attr_reader   :keybinds
+      attr_accessor :rc_path, :modifier, :modifier_ignore, :worker, :layout,
+                    :layout_class, :layout_options, :rules, :launch
 
-      def initialize output
-        @output           = output
+      def initialize output: $stdout, **_
+        super
         @rc_path          = RC_PATH
         @modifier         = MODIFIER
         @modifier_ignore  = []
@@ -37,14 +35,6 @@ module Uh
         @rules            = {}
       end
 
-      def verbose?
-        !!@verbose
-      end
-
-      def debug?
-        !!@debug
-      end
-
       def layout
         @layout ||= if layout_class
           layout_class.new @layout_options

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

@@ -1,3 +1,5 @@
+require 'baf/testing/cucumber/steps/output_wait'
+
 require 'uh'
 require 'uh/wm/testing/x_client'
 
@@ -5,22 +7,11 @@ module Uh
   module WM
     module Testing
       module AcceptanceHelpers
-        TIMEOUT_DEFAULT = 2
         QUIT_KEYBINDING = 'alt+shift+q'.freeze
         LOG_READY       = 'Working events'.freeze
 
         attr_reader :other_wm
 
-        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
@@ -34,49 +25,20 @@ module Uh
           'xmessage'
         end
 
-        def uhwm_run options = '-v'
-          command = %w[uhwm]
-          command << options if options
-          @interactive = @process = run command.join ' '
-        end
-
-        def uhwm
-          @process
-        end
-
         def uhwm_request_quit
           x_key QUIT_KEYBINDING
         end
 
         def uhwm_ensure_stop
-          if @process
-            x_key 'alt+shift+q'
-            @process.terminate
-          end
-        end
-
-        def uhwm_wait_output message, times = 1, value = nil
-          output = -> { @process.stdout + @process.stderr }
-          timeout_until do
-            case message
-            when Regexp then (value = output.call.scan(message)).size >= times
-            when String then output.call.include? message
-            end
-          end
-          value
-        rescue TimeoutError => e
-          raise <<-eoh
-expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
-  ```\n#{output.call.lines.map { |l| "  #{l}" }.join}  ```
-          eoh
+          uhwm_request_quit
         end
 
         def uhwm_wait_ready
-          uhwm_wait_output LOG_READY
+          wait_output! LOG_READY
         end
 
-        def uhwm_run_wait_ready options = nil
-          if options then uhwm_run options else uhwm_run end
+        def uhwm_run_wait_ready options = '-v'
+          program_run wait: false, opts: options
           uhwm_wait_ready
         end
 
@@ -116,31 +78,6 @@ expected `#{message}' (#{times}) not seen after #{e.timeout} seconds in:
           end
           `xwininfo #{select_args} 2> /dev/null`[/Map State: (\w+)/, 1]
         end
-
-      private
-
-        def timeout_until message = 'condition not met after %d seconds'
-          timeout = ENV.key?('UHWMTEST_TIMEOUT') ?
-            ENV['UHWMTEST_TIMEOUT'].to_i :
-            TIMEOUT_DEFAULT
-          Timeout.timeout(timeout) do
-            loop do
-              break if yield
-              sleep 0.1
-            end
-          end
-        rescue Timeout::Error
-          raise TimeoutError.new(message % timeout, timeout)
-        end
-
-        class TimeoutError < ::StandardError
-          attr_reader :timeout
-
-          def initialize message, timeout
-            super message
-            @timeout = timeout
-          end
-        end
       end
     end
   end

data/lib/uh/wm/version.rb

@@ -1,5 +1,5 @@
 module Uh
   module WM
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uh-wm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thibault Jouan
@@ -10,10 +10,27 @@ bindir: bin
 cert_chain: []
 date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: baf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rb-kqueue
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
@@ -21,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
@@ -42,6 +62,9 @@ dependencies:
   name: uh-layout
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
@@ -49,65 +72,40 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-- !ruby/object:Gem::Dependency
-  name: cucumber
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !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'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: baf-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.0'
 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