sapristi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fd92d587999ee50bc8eda291f716e33e72e7c56301fb7e56a62a6a0c65bc4f0
-  data.tar.gz: ff62aedea624f0e2738ba68ca81bc6303fd0fb048681df16e78209303a1f9fad
+  metadata.gz: a6f73d47dbbde92a37f2d64ccf7cebbadbe9fb3f078e097d4c08e0eb70dd306d
+  data.tar.gz: 28d8025def810ec571339fc7dada6ce05d7639120ecc3101870500400084b831
 SHA512:
-  metadata.gz: c9804608416798a040e3ecb1316d238e44f52ac9e6a00c547ace71511982c26c089bbbdea65d6ae1ad337b819634f849239b7597ab5de0efb3c8d461415916e8
-  data.tar.gz: 15e24fddd27bcc428470f42ef663dac3a1b9b2b711e122412a26ccd13c3b09445840445fe26123dba4dcbfa2ffd25b260851dedf338d3e069942e84071a4ab24
+  metadata.gz: 9dca2f730eb0bacdac26279773efe1226f5b658a4f3b6dc03cf6bc6fccdd6528b9fec69e8a5cad7c00692c241b3f721a9533a16b759cf679d6fafa63213fb098
+  data.tar.gz: 8eb2cf7358975e50a751867fd0ea98f84c25c7cebe90e3b45a8b62c93bd96a83ba763954af3a5087bfbf07d1088b387baa083edefd0be82b1d07b81d77db7ecd

data/README.md

@@ -1,5 +1,7 @@
 # Sapristi
 
+[![Maintainability](https://api.codeclimate.com/v1/badges/e168b7940a847148f617/maintainability)](https://codeclimate.com/github/sapristi-tool/sapristi/maintainability)
+
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/sapristi`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem

data/lib/sapristi.rb

@@ -15,6 +15,7 @@ require 'sapristi/adapters/linux/window_manager'
 require 'sapristi/adapters/linux/process_manager'
 require 'sapristi/new_process_window_detector'
 require 'sapristi/monitor'
+require 'sapristi/adapters/os_factory'
 require 'logger'
 
 module Sapristi

data/lib/sapristi/adapters/linux/process_manager.rb

@@ -3,7 +3,7 @@
 module Sapristi
   module Linux
     class ProcessManager
-      def execute_and_detach(cmd)
+      def self.execute_and_detach(cmd)
         process_pid = begin
           Process.spawn(cmd)
         rescue StandardError
@@ -13,7 +13,7 @@ module Sapristi
         Process.detach process_pid
       end
 
-      def kill(waiter)
+      def self.kill(waiter)
         Process.kill 'KILL', waiter.pid
         # sleep 1 # XLIB error for op code
         raise Error, 'Error executing process, it didn\'t open a window'
@@ -24,7 +24,7 @@ module Sapristi
         `ps -u #{user_id}`.split("\n")[1..nil].map(&:to_i)
       end
 
-      def cmd_for_pid(pid)
+      def self.cmd_for_pid(pid)
         cmd = "ps -o cmd -p #{pid}"
         line = `#{cmd}`.split("\n")[1]
         raise Error, "No process found pid=#{pid}" unless line

data/lib/sapristi/adapters/linux/window_manager.rb

@@ -36,16 +36,76 @@ module Sapristi
       GRAVITY = 0
       TIME_TO_APPLY_DIMENSIONS = 0.25
 
-      def move_resize(window, geometry)
+      def move(window, x_position, y_position)
+        geometry = complete_geometry(window.id, x_position: x_position, y_position: y_position)
+        move_resize(window, geometry)
+      end
+
+      def resize(window, width, height)
+        geometry = complete_geometry(window.id, width: width, height: height)
+        move_resize(window, geometry)
+      end
+
+      def move_resize(window, requested)
         remove_extended_hints(window) if window.maximized_horizontally? || window.maximized_vertically?
+
+        geometry = requested.clone
+        left, right, top, bottom = window.frame_extents || [0, 0, 0, 0]
+        geometry[2] -= left + right
+        geometry[3] -= top + bottom
+
         @display.action_window(window.id, :move_resize, GRAVITY, *geometry)
         sleep TIME_TO_APPLY_DIMENSIONS
+        check_expected_geometry window, requested
       end
 
+      private
+
       EXTENDED_HINTS = %w[maximized_vert maximized_horz].freeze
 
       def remove_extended_hints(window)
         display.action_window(window.id, :change_state, 'remove', *EXTENDED_HINTS)
+        sleep TIME_TO_APPLY_DIMENSIONS
+      end
+
+      def complete_geometry(window_id, requested)
+        window = @display.windows(id: window_id).first
+        Geometry.new(window).merge(requested)
+      end
+
+      LABELS = %w[x y width heigth].freeze
+
+      def check_expected_geometry(window, expected)
+        actual_window = @display.windows(id: window.id).first
+        actual = actual_window.exterior_frame || actual_window.geometry
+
+        return if actual.eql? expected
+
+        # rubocop:disable Layout/LineLength
+        ::Sapristi.logger.warn "Geometry mismatch #{WindowManager.text_diff(actual, expected)}, requested=#{expected}, window=#{window.title}"
+        # rubocop:enable Layout/LineLength
+      end
+
+      def self.text_diff(actual, expected)
+        diffs = 4.times.filter { |index| !expected[index].eql? actual[index] }
+        diffs.map do |diff_index|
+          "#{LABELS[diff_index]}: expected=#{expected[diff_index]}, actual=#{actual[diff_index]}"
+        end.join(', ')
+      end
+    end
+
+    class Geometry
+      def initialize(window)
+        @geometry = window.exterior_frame || window.geometry
+      end
+
+      attr_reader :geometry
+
+      def merge(requested)
+        [requested.fetch(:x_position, geometry[0]),
+         requested.fetch(:y_position, geometry[1]),
+         requested.fetch(:width, geometry[2]),
+         requested.fetch(:height, geometry[3])]
       end
     end
   end

data/lib/sapristi/adapters/os_factory.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'os'
+
+module Sapristi
+  class OSFactory
+    def initialize
+      @os = OS
+    end
+
+    def factory_module
+      return Linux if linux?
+
+      raise Error, "OS not implemented: #{os_name}"
+    end
+
+    def window_manager
+      factory_module.const_get('WindowManager').new
+    end
+
+    def monitor_manager
+      factory_module.const_get('MonitorManager').new
+    end
+
+    def process_manager
+      factory_module.const_get('ProcessManager')
+    end
+
+    def linux?
+      @os.linux?
+    end
+
+    def os_name
+      @os.parse_os_release[:pretty_name]
+    end
+  end
+end

data/lib/sapristi/definition_parser.rb

@@ -36,9 +36,9 @@ module Sapristi
       unless (0...monitor_width).include? x_pos
         raise Error, "x=#{x_pos} is outside of monitor width dimension=0..#{monitor_width - 1}"
       end
-      unless (0...monitor_height).include? y_pos
-        raise Error, "y=#{y_pos} is outside of monitor height dimension=0..#{monitor_height - 1}"
-      end
+      return if (0...monitor_height).include? y_pos
+
+      raise Error, "y=#{y_pos} is outside of monitor height dimension=0..#{monitor_height - 1}"
     end
 
     def validate_work_area(normalized, monitor_width, monitor_height)
@@ -49,9 +49,9 @@ module Sapristi
       if x_end >= monitor_width
         raise Error, "window x dimensions: [#{x_pos}, #{x_end}] exceeds monitor width [0..#{monitor_width - 1}]"
       end
-      if y_end >= monitor_height
-        raise Error, "window y dimensions: [#{y_pos}, #{y_end}] exceeds monitor height [0..#{monitor_height - 1}]"
-      end
+      return if y_end < monitor_height
+
+      raise Error, "window y dimensions: [#{y_pos}, #{y_end}] exceeds monitor height [0..#{monitor_height - 1}]"
     end
 
     MIN_X_SIZE = 50

data/lib/sapristi/definition_processor.rb

@@ -11,8 +11,8 @@ module Sapristi
       window = get_window definition.title, definition.command
 
       @window_manager.move_resize(window,
-                                  definition.x_position, definition.y_position,
-                                  definition.h_size, definition.v_size)
+                                  [definition.x_position, definition.y_position,
+                                   definition.h_size, definition.v_size])
     end
 
     private

data/lib/sapristi/monitor_manager.rb

@@ -8,7 +8,7 @@ require 'gtk3'
 module Sapristi
   class MonitorManager
     def initialize
-      @os_manager = Linux::MonitorManager.new
+      @os_manager = OSFactory.new.monitor_manager
     end
 
     def get_monitor_or_main(name)

data/lib/sapristi/new_process_window_detector.rb

@@ -3,8 +3,8 @@
 module Sapristi
   class NewProcessWindowDetector
     def initialize
-      @display = WMCtrl.display
-      @process_manager = Linux::ProcessManager.new
+      @display = OSFactory.new.window_manager
+      @process_manager = OSFactory.new.process_manager
     end
 
     def detect_window_for_process(command, timeout_in_seconds = 30)
@@ -25,7 +25,7 @@ module Sapristi
 
     def save_pids_and_windows
       @previous_windows_ids = @display.windows.map { |window| window[:id] }
-      @previous_pids = process_manager.class.user_pids
+      @previous_pids = process_manager.user_pids
     end
 
     def wait_for_window(command, timeout_in_seconds)

data/lib/sapristi/sapristi.rb

@@ -49,9 +49,9 @@ module Sapristi
     end
 
     def check_user_configuration(conf_file)
-      if conf_file.eql?(Sapristi.user_default_configuration_file) && !File.exist?(conf_file)
-        @configuration_loader.create_empty_configuration conf_file
-      end
+      return unless conf_file.eql?(Sapristi.user_default_configuration_file) && !File.exist?(conf_file)
+      
+      @configuration_loader.create_empty_configuration conf_file
     end
 
     def self.user_default_configuration_file

data/lib/sapristi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sapristi
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/sapristi/window_manager.rb

@@ -1,43 +1,21 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Sapristi
   class WindowManager
-    def initialize
-      @display = Linux::WindowManager.new
-    end
+    extend Forwardable
 
-    def windows
-      @display.windows
+    def initialize
+      @display = OSFactory.new.window_manager
     end
 
-    def close(window)
-      @display.close(window)
-    end
+    def_delegators :@display, :windows, :close, :workspaces, :move_resize, :resize, :move
 
     def find_window(title_regex)
       @display.windows title: title_regex
     end
 
-    def move_resize(window, x_position, y_position, width, height)
-      call_move_resize(window, [x_position, y_position, width, height])
-    end
-
-    def resize(window, width, height)
-      actual_window = @display.windows(id: window.id).first
-      x_position, y_position = (actual_window.exterior_frame || actual_window.geometry)[0..1]
-      call_move_resize(window, [x_position, y_position, width, height])
-    end
-
-    def move(window, x_position, y_position)
-      actual_window = @display.windows(id: window.id).first
-      width, height = (actual_window.exterior_frame || actual_window.geometry)[2..3]
-      call_move_resize(window, [x_position, y_position, width, height])
-    end
-
-    def workspaces
-      @display.workspaces
-    end
-
     def find_workspace_or_current(id)
       return workspaces.find(&:current).id unless id
 
@@ -52,32 +30,5 @@ module Sapristi
     def workspace?(id)
       workspaces.find { |workspace| workspace.id.eql? id }
     end
-
-    def call_move_resize(window, requested)
-      geometry = requested.clone
-      left, right, top, bottom = window.frame_extents || [0, 0, 0, 0]
-      geometry[2] -= left + right
-      geometry[3] -= top + bottom
-
-      @display.move_resize(window, geometry)
-
-      check_expected_geometry window, requested
-    end
-
-    LABELS = %w[x y width heigth].freeze
-
-    def check_expected_geometry(window, expected)
-      actual_window = @display.windows(id: window.id).first
-      actual = actual_window.exterior_frame || actual_window.geometry
-
-      unless actual.eql? expected
-        ::Sapristi.logger.warn "Geometry mismatch #{WindowManager.text_diff(actual, expected)}, requested=#{expected}, window=#{window.title}"
-      end
-    end
-
-    def self.text_diff(actual, expected)
-      diffs = 4.times.filter { |index| !expected[index].eql? actual[index] }
-      diffs.map { |diff_index| "#{LABELS[diff_index]}: expected=#{expected[diff_index]}, actual=#{actual[diff_index]}" }.join(', ')
-    end
   end
 end

data/sapristi.gemspec

@@ -56,5 +56,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.19.0'
 
   spec.add_runtime_dependency 'gtk3', '~> 3.4.3'
+  spec.add_runtime_dependency 'os', '~> 1.1.0'
   spec.add_runtime_dependency 'ruby-wmctrl', '~> 0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapristi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sapristi dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.3
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-wmctrl
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +288,7 @@ files:
 - lib/sapristi/adapters/linux/monitor_manager.rb
 - lib/sapristi/adapters/linux/process_manager.rb
 - lib/sapristi/adapters/linux/window_manager.rb
+- lib/sapristi/adapters/os_factory.rb
 - lib/sapristi/arguments_parser.rb
 - lib/sapristi/attribute_normalizer.rb
 - lib/sapristi/configuration_loader.rb