uh-layout 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc665a4b5eaf5f27e1b2a502f86870fdf7cb1663
-  data.tar.gz: 0bbd6a29f34427d05e932a55961cb6b93f6a4392
+SHA256:
+  metadata.gz: ef2b61c35eeedd55a1603fac03070bedc0bac689b86eb82d92fbcacac621bfde
+  data.tar.gz: 02f86bd7bba57f9c92e9a76b6da891ba3afe5eaa2f89b309ef29797cd045fbfb
 SHA512:
-  metadata.gz: 60f86b427c2c914f345629ef341cbac5471613a52988c96ce22db5176c832620b1f85745ca21ca3d933540e5a8df8569f3674b080969a039c36a614c3ce68edf
-  data.tar.gz: 2073cd03b104efb678d2264b4fb5762527d5e47c0652b15321f912aa3eb34fb284b67bb240e0102ca0657bf54775964c89254448d2d3702a651e314cb983618c
+  metadata.gz: c360f3459be21bcc90c725546fc0da75dd51307a52088dc206a8254de71cb6275d339853605e9cc7b15aaed0325fb5a5934f5d96f50606dbdc0fa8ec6ad9e4f6
+  data.tar.gz: 5283d46abdffe520c3dff3c0295c26dcbb1a2234c2c0e7707a10e848a64adc5127bb73450c3ad28c3b845c4f1ebf91566fd910886eb2c8419772347ca0888dc8

data/README

@@ -0,0 +1,4 @@
+uh-layout
+=========
+
+  Tiling and stacking layout for `uh-wm' ruby gem.

data/lib/uh/layout.rb

@@ -15,9 +15,9 @@ require 'uh/layout/view'
 
 module Uh
   class Layout
-    Error         = Class.new(StandardError)
-    RuntimeError  = Class.new(RuntimeError)
-    ArgumentError = Class.new(Error)
+    Error         = Class.new StandardError
+    RuntimeError  = Class.new RuntimeError
+    ArgumentError = Class.new Error
 
     COLORS = {
       fg:   'rgb:d0/d0/d0'.freeze,
@@ -44,7 +44,7 @@ module Uh
       @colors = @colors.merge options[:colors] if options.key? :colors
     end
 
-    def register(display)
+    def register display
       Registrant.register self, display
     end
 
@@ -56,7 +56,7 @@ module Uh
       current_column and current_column.current_client
     end
 
-    def include?(client)
+    def include? client
       screens.any? { |screen| screen.include? client }
     end
 
@@ -69,7 +69,7 @@ module Uh
       (current_column or current_view).geo.dup
     end
 
-    def <<(client)
+    def << client
       current_view.current_column_or_create << client
       current_column.current_client = client
       current_column.arrange_clients
@@ -80,7 +80,7 @@ module Uh
     end
     alias push <<
 
-    def remove(client)
+    def remove client
       screen, view, column = find_client client
       column.remove client
       view.arrange_columns
@@ -89,29 +89,29 @@ module Uh
       update_widgets
     end
 
-    def update(client = nil)
+    def update client = nil
       return if client && client.hidden?
       update_widgets
     end
 
-    def expose(window)
+    def expose window
       update_widgets
     end
 
-    def handle_screen_sel(direction)
+    def handle_screen_sel direction
       screens.sel direction
       current_client.focus if current_client
       update_widgets
     end
 
-    def handle_screen_set(direction)
+    def handle_screen_set direction
       return unless current_client
       remove client = current_client
       screens.sel direction
       push client
     end
 
-    def handle_view_sel(view_id)
+    def handle_view_sel view_id
       view_id = view_id.to_s
       return unless current_view.id != view_id
       @history.record_view current_view
@@ -122,7 +122,7 @@ module Uh
       update_widgets
     end
 
-    def handle_view_set(view_id)
+    def handle_view_set view_id
       return unless current_client && current_view.id != view_id
       previous_view_id = current_view.id
       remove client = current_client
@@ -131,7 +131,7 @@ module Uh
       handle_view_sel previous_view_id
     end
 
-    def handle_column_sel(direction)
+    def handle_column_sel direction
       return unless current_view.columns.any?
       current_view.columns.sel direction
       current_client.focus
@@ -145,7 +145,7 @@ module Uh
       current_column.show_hide_clients
     end
 
-    def handle_client_sel(direction)
+    def handle_client_sel direction
       return unless current_client
       current_column.clients.sel direction
       current_column.show_hide_clients
@@ -153,13 +153,13 @@ module Uh
       update_widgets
     end
 
-    def handle_client_swap(direction)
+    def handle_client_swap direction
       return unless current_client && current_column.clients.size >= 2
       current_column.client_swap direction
       update_widgets
     end
 
-    def handle_client_column_set(direction, mover: client_mover_for_current_view)
+    def handle_client_column_set direction, mover: client_mover_for_current_view
       return unless current_client
       mover.move_current direction
       current_view.arrange_columns
@@ -171,10 +171,9 @@ module Uh
       handle_view_sel @history.last_view.id
     end
 
+  private
 
-    private
-
-    def find_client(client)
+    def find_client client
       screens.each do |screen|
         screen.views.each do |view|
           view.each_column do |column|
@@ -186,7 +185,7 @@ module Uh
       end
     end
 
-    def find_view_or_create(view_id)
+    def find_view_or_create view_id
       current_screen.views.find do
         |e| e.id == view_id
       end or View.new(view_id, current_screen.geo).tap do |view|

data/lib/uh/layout/arrangers/fixed_width.rb

@@ -4,7 +4,7 @@ module Uh
       class FixedWidth
         DEFAULT_WIDTH = 484
 
-        def initialize(entries, geo, width: DEFAULT_WIDTH)
+        def initialize entries, geo, width: DEFAULT_WIDTH
           @entries  = entries
           @geo      = geo
           @width    = width

data/lib/uh/layout/arrangers/stack.rb

@@ -2,7 +2,7 @@ module Uh
   class Layout
     module Arrangers
       class Stack
-        def initialize(entries, geo)
+        def initialize entries, geo
           @entries  = entries
           @geo      = geo
         end

data/lib/uh/layout/arrangers/vert_tile.rb

@@ -2,7 +2,7 @@ module Uh
   class Layout
     module Arrangers
       class VertTile
-        def initialize(entries, geo)
+        def initialize entries, geo
           @entries  = entries
           @geo      = geo
         end

data/lib/uh/layout/bar.rb

@@ -13,7 +13,7 @@ module Uh
       attr_reader :screen
       attr_writer :active, :status
 
-      def initialize(display, screen, colors)
+      def initialize display, screen, colors
         @display    = display
         @screen     = screen
         @geo        = build_geo @screen.geo
@@ -27,7 +27,7 @@ module Uh
         !!@active
       end
 
-      def on_update(&block)
+      def on_update &block
         @on_update = block
       end
 
@@ -58,15 +58,14 @@ module Uh
         self
       end
 
-
-      private
+    private
 
       def blit
         @pixmap.copy @window
         self
       end
 
-      def build_geo(layout_geo)
+      def build_geo layout_geo
         bar_height = text_line_height * 2 + BORDER_HEIGHT + BORDER_PADDING_Y
 
         Uh::Geo.new(
@@ -85,15 +84,15 @@ module Uh
         @display.font.height + TEXT_PADDING_Y * 2
       end
 
-      def text_width(text, padding_x: TEXT_PADDING_X)
+      def text_width text, padding_x: TEXT_PADDING_X
         text.length * @display.font.width + padding_x * 2
       end
 
-      def column_offset_x(column)
+      def column_offset_x column
         column.x - x
       end
 
-      def column_text(column)
+      def column_text column
         text = '%d/%d %s (%s)' % [
           column.clients.index(column.current_client),
           column.clients.size,
@@ -109,14 +108,14 @@ module Uh
         @pixmap.draw_rect 0, 0, width, BORDER_HEIGHT
       end
 
-      def draw_columns(y_offset, columns, current_column)
+      def draw_columns y_offset, columns, current_column
         columns.each do |column|
           draw_column y_offset, column, column == current_column
         end
       end
 
-      def draw_column(y_offset, column, current)
-        x_offset = column_offset_x(column)
+      def draw_column y_offset, column, current
+        x_offset = column_offset_x column
         if current && active?
           @pixmap.gc_color @colors[:sel]
           @pixmap.draw_rect x_offset, y_offset, column.width, text_line_height
@@ -126,8 +125,8 @@ module Uh
           bg: current ? @colors[:hi] : @colors[:bg]
       end
 
-      def draw_views(y_offset, views, current_view)
-        views.sort_by(&:id).inject(0) do |x_offset, view|
+      def draw_views y_offset, views, current_view
+        views.sort_by(&:id).inject 0 do |x_offset, view|
           color = if view == current_view
             active_color
           elsif view.clients.any?
@@ -143,11 +142,11 @@ module Uh
         end
       end
 
-      def draw_status(y_offset, status)
+      def draw_status y_offset, status
         draw_text status, width - text_width(status), y_offset
       end
 
-      def draw_text(text, x, y, bg: nil, padding_x: TEXT_PADDING_X)
+      def draw_text text, x, y, bg: nil, padding_x: TEXT_PADDING_X
         text        = text.to_s
         text_width  = text_width text, padding_x: padding_x
         text_y      = y + @display.font.ascent + TEXT_PADDING_Y

data/lib/uh/layout/client_column_mover.rb

@@ -1,12 +1,12 @@
 module Uh
   class Layout
     class ClientColumnMover
-      def initialize(columns, columns_max_count)
+      def initialize columns, columns_max_count
         @columns            = columns
         @columns_max_count  = columns_max_count
       end
 
-      def move_current(direction)
+      def move_current direction
         @columns.current.remove client = @columns.current.current_client
         dest_column = get_or_create_column direction
         dest_column << client
@@ -14,7 +14,7 @@ module Uh
         @columns.current = dest_column
       end
 
-      def get_or_create_column(direction)
+      def get_or_create_column direction
         if candidate = @columns.get(direction)
           candidate
         elsif @columns_max_count
@@ -22,8 +22,8 @@ module Uh
         else
           Column.new(Geo.new).tap do |o|
             case direction
-            when :pred then @columns.unshift o
-            when :succ then @columns << o
+              when :pred then @columns.unshift o
+              when :succ then @columns << o
             end
           end
         end

data/lib/uh/layout/column.rb

@@ -16,7 +16,7 @@ module Uh
 
       attr_reader :geo, :clients, :mode
 
-      def initialize(geo, mode: :stack)
+      def initialize geo, mode: :stack
         @geo      = geo.dup
         @clients  = Container.new
         @mode     = mode
@@ -26,7 +26,7 @@ module Uh
         "COL geo: #{@geo}"
       end
 
-      def <<(client)
+      def << client
         client.geo = @geo.dup
         if @clients.current
           @clients.insert_after_current client
@@ -44,7 +44,7 @@ module Uh
         MODES[@mode].new @clients, @geo
       end
 
-      def client_swap(direction)
+      def client_swap direction
         @clients.set direction
         if @mode == :tile
           arrange_clients
@@ -57,7 +57,7 @@ module Uh
         clients.each &:moveresize
       end
 
-      def show_hide_clients(arranger: self.arranger)
+      def show_hide_clients arranger: self.arranger
         arranger.each_visible { |client| client.show if client.hidden? }
         arranger.each_hidden  { |client| client.hide unless client.hidden? }
       end

data/lib/uh/layout/container.rb

@@ -7,7 +7,7 @@ module Uh
       def_delegators :@entries, :<<, :[], :each, :empty?, :fetch, :first,
         :index, :last, :size, :unshift
 
-      def initialize(entries = [])
+      def initialize entries = []
         @entries        = entries
         @current_index  = 0
       end
@@ -18,28 +18,23 @@ module Uh
         @entries[@current_index]
       end
 
-      def current=(entry)
+      def current= entry
         fail ArgumentError, 'unknown entry' unless include? entry
         @current_index = @entries.index entry
       end
 
-      def insert_after_current(entry)
+      def insert_after_current entry
         fail RuntimeError, 'no current entry' unless current
         @entries.insert @current_index + 1, entry
       end
 
-      def remove(entry)
-        fail ArgumentError, 'unknown entry' unless include? entry
-        @entries.delete_at @entries.index entry
-        @current_index -= 1 unless @current_index == 0
+      def remove *entries
+        entries.each { |e| remove_entry e }
+        @entries.each { |e| remove_entry e if yield e } if block_given?
         self
       end
 
-      def remove_if
-        @entries.each { |e| remove e if yield e }
-      end
-
-      def get(direction, cycle: false)
+      def get direction, cycle: false
         index = @current_index.send direction
         if cycle
           @entries[index % @entries.size]
@@ -48,12 +43,12 @@ module Uh
         end
       end
 
-      def sel(direction)
+      def sel direction
         @current_index = @current_index.send(direction) % @entries.size
       end
 
-      def set(direction)
-        raise RuntimeError unless @entries.size >= 2
+      def set direction
+        fail RuntimeError unless @entries.size >= 2
         new_index = @current_index.send direction
         if new_index.between? 0, @entries.size - 1
           swap @current_index, new_index
@@ -64,17 +59,24 @@ module Uh
         end
       end
 
-      def swap(a, b)
+      def swap a, b
         @entries[a], @entries[b] = @entries[b], @entries[a]
       end
 
+    private
 
-      private
+      def remove_entry entry
+        fail ArgumentError, 'unknown entry' unless include? entry
+        @entries.delete_at (index = @entries.index(entry))
+        if @current_index != 0 && @current_index > index
+          @current_index -= 1
+        end
+      end
 
-      def rotate(direction)
-        case direction
-        when :pred then @entries = @entries.push    @entries.shift
-        when :succ then @entries = @entries.unshift @entries.pop
+      def rotate direction
+        @entries = @entries.rotate case direction
+          when :pred then 1
+          when :succ then -1
         end
       end
     end

data/lib/uh/layout/dumper.rb

@@ -1,22 +1,22 @@
 module Uh
   class Layout
     class Dumper
-      def initialize(layout)
+      def initialize layout
         @layout = layout
       end
 
       def to_s
-        @layout.screens.inject('') do |m, screen|
-          m << "%s%s\n" % [@layout.current_screen?(screen) ? '*' : ' ', screen]
+        @layout.screens.inject '' do |m, screen|
+          m << "%s%s\n" % [@layout.current_screen?(screen) ? ?* : ' ', screen]
           screen.views.each do |view|
-            m << "  %s%s\n" % [screen.current_view?(view) ? '*' : ' ', view]
+            m << "  %s%s\n" % [screen.current_view?(view) ? ?* : ' ', view]
             view.columns.each do |column|
               m << "    %s%s\n" % [
-                view.current_column?(column) ? '*' : ' ', column
+                view.current_column?(column) ? ?* : ' ', column
               ]
               column.clients.each do |client|
                 m << "      %s%s\n" % [
-                  column.current_client?(client) ? '*' : ' ',
+                  column.current_client?(client) ? ?* : ' ',
                   client
                 ]
               end

data/lib/uh/layout/history.rb

@@ -5,12 +5,12 @@ module Uh
 
       attr_reader :views, :views_size_max
 
-      def initialize(views = [], views_size_max: VIEWS_SIZE_MAX)
+      def initialize views = [], views_size_max: VIEWS_SIZE_MAX
         @views           = views
         @views_size_max  = views_size_max
       end
 
-      def record_view(view)
+      def record_view view
         @views << view
         if @views.size > @views_size_max
           @views = @views.drop @views.size - @views_size_max

data/lib/uh/layout/registrant.rb

@@ -2,7 +2,7 @@ module Uh
   class Layout
     module Registrant
       class << self
-        def register(layout, display)
+        def register layout, display
           display.screens.each do |screen|
             layout.screens << scr = Screen.new(screen.id, screen.geo)
             bar = Bar.new(display, scr, layout.colors).tap do |b|

data/lib/uh/layout/screen.rb

@@ -9,22 +9,22 @@ module Uh
 
       attr_reader :id, :views, :geo
 
-      def initialize(id, geo)
+      def initialize id, geo
         @id     = id
         @geo    = geo.dup
-        @views  = Container.new([View.new('1', @geo)])
+        @views  = Container.new [View.new(?1, @geo)]
       end
 
       def to_s
         "SCREEN ##{@id}, geo: #{@geo}"
       end
 
-      def height=(value)
+      def height= value
         @geo.height = value
         @views.each { |view| view.height = value }
       end
 
-      def include?(client)
+      def include? client
         @views.any? { |view| view.include? client }
       end
     end

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.4.3'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/lib/uh/layout/view.rb

@@ -13,7 +13,7 @@ module Uh
 
       attr_reader :id, :geo, :columns
 
-      def initialize(id, geo)
+      def initialize id, geo
         unless id.kind_of? String
           fail ArgumentError, "expect `id' to be a String, #{id.class} given"
         end
@@ -30,7 +30,7 @@ module Uh
         @columns.inject([]) { |m, column| m + column.clients }
       end
 
-      def include?(client)
+      def include? client
         @columns.any? { |column| column.include? client }
       end
 
@@ -41,11 +41,11 @@ module Uh
       end
 
       def arranger
-        Arrangers::FixedWidth.new(@columns, @geo)
+        Arrangers::FixedWidth.new @columns, @geo
       end
 
       def arrange_columns
-        @columns.remove_if &:empty?
+        @columns.remove &:empty?
         arranger.arrange
         @columns.each &:arrange_clients
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uh
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: uh-wm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,9 +57,9 @@ email: tj@a13.fr
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
+- README
 files:
-- README.md
+- README
 - lib/uh/layout.rb
 - lib/uh/layout/arrangers/fixed_width.rb
 - lib/uh/layout/arrangers/stack.rb
@@ -108,9 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: simple tiling and stacking layout for uh-wm
 test_files: []
-has_rdoc: 

data/README.md

@@ -1,18 +0,0 @@
-uh-layout
-=========
-
-[![Version      ][badge-version-img]][badge-version-uri]
-[![Build status ][badge-build-img]][badge-build-uri]
-[![Code Climate ][badge-cclimate-img]][badge-cclimate-uri]
-
-
-  Tiling and stacking layout for `uh-wm` ruby gem.
-
-
-
-[badge-version-img]:  https://img.shields.io/gem/v/uh-layout.svg?style=flat-square
-[badge-version-uri]:  https://rubygems.org/gems/uh-layout
-[badge-build-img]:    https://img.shields.io/travis/tjouan/uh-layout/master.svg?style=flat-square
-[badge-build-uri]:    https://travis-ci.org/tjouan/uh-layout
-[badge-cclimate-img]: https://img.shields.io/codeclimate/github/tjouan/uh-layout.svg?style=flat-square
-[badge-cclimate-uri]: https://codeclimate.com/github/tjouan/uh-layout