terminal-layout 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80aa4a0e91137ff86176dcbadddd0b409704d3e1
-  data.tar.gz: 5b959060b022e65741abdca373a33713055c34c8
+  metadata.gz: 3ed9ef7985d3a6245c22719a1d3ff99bfe281ed3
+  data.tar.gz: c18265ddc6660e6112dfed6248ea845d6419d02d
 SHA512:
-  metadata.gz: f0cf393e5f454b12b9d3a4e205d00ceafcdc8c1dea90717a12747b67900e213668ff19d614d7d29b8a190d096693cd560ace32261b83b4921d045d81d9e9bfd0
-  data.tar.gz: f3ffaf2df0f703a28055eeff39c92d82653ffb01bfeafca2b292331ad2bc97f41ff04fee59ba2f7817780e6657c96a8f5e6b3721cb87f931ce9f0462cb4719fb
+  metadata.gz: 63784d51ef8e26f6eb877564c975a6fd6ce9ca6deba51f8cc78275a9c35c3d6ff7a5e37bae75035c8c14421951a9f7d0c00fc969d0721620c12da6db6b027f6e
+  data.tar.gz: 8d85eecd9132e6596faa48d48c82e6e92992fb835c2411e96ca784f6daab09d66f5de9efd6aa597aa0335db786c0802e339c9fe55eb03c4eb16076fd6e5fce13

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terminal-layout (0.4.2)
+    terminal-layout (0.4.3)
       ansi_string (~> 0.1)
       highline (~> 1.7, >= 1.7.8)
       ruby-terminfo (~> 0.1.1)
@@ -12,43 +12,42 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi_string (0.1.0)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    coderay (1.1.0)
-    columnize (0.9.0)
+    byebug (9.0.5)
+    coderay (1.1.1)
     diff-lcs (1.2.5)
     highline (1.7.8)
     method_source (0.8.2)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     ruby-terminfo (0.1.1)
     ruby-termios (0.9.6)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
-    tins (1.3.5)
-    treefell (0.3.0)
+    tins (1.10.2)
+    treefell (0.3.1)
       ansi_string (~> 0.1)
-      term-ansicolor (~> 1.3)
+      term-ansicolor (~> 1.3.2)
+      tins (= 1.10.2)
 
 PLATFORMS
   ruby
@@ -62,4 +61,4 @@ DEPENDENCIES
   terminal-layout!
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/terminal_layout.rb

@@ -1,32 +1,13 @@
 require 'ostruct'
 require 'ansi_string'
 require 'treefell'
+require 'terminal_layout/event_emitter'
+require 'terminal_layout/renderer'
 
 module TerminalLayout
   Dimension = Struct.new(:width, :height)
   Position = Struct.new(:x, :y)
 
-  module EventEmitter
-    def _callbacks
-      @_callbacks ||= Hash.new { |h, k| h[k] = [] }
-    end
-
-    def on(type, *args, &blk)
-      _callbacks[type] << blk
-      self
-    end
-
-    def unsubscribe
-      _callbacks.clear
-    end
-
-    def emit(type, *args)
-      _callbacks[type].each do |blk|
-        blk.call(*args)
-      end
-    end
-  end
-
   class RenderObject
     include EventEmitter
 
@@ -137,7 +118,6 @@ module TerminalLayout
     end
 
     def layout
-      Treefell['render'].puts "layout #{self.inspect}"
       self.children = []
       @current_x = 0
       @current_y = 0
@@ -153,7 +133,6 @@ module TerminalLayout
       end
 
       children2crawl.each do |cbox|
-        Treefell['render'].puts "layout crawling children #{cbox.inspect}"
         if cbox.display == :float
           next if cbox.width.to_i == 0
 
@@ -205,7 +184,6 @@ module TerminalLayout
           loop do
             partial_content = cbox.content[content_i...(content_i + available_width)]
             chars_needed = partial_content.length
-            Treefell['render'].puts "laying out inline #{cbox.name} @current_x=#{@current_x} @current_y=#{@current_y} x=#{x} y=#{y}"
             self.children << render_object_for(
               cbox,
               content:partial_content,
@@ -250,7 +228,6 @@ module TerminalLayout
         child.box.computed[:x] += x
         child.box.computed[:y] += y
       end
-      Treefell['render'].puts "laid out box=#{box.name} render-object=#{self.children}"
 
       self.children
     end
@@ -507,170 +484,10 @@ module TerminalLayout
       # spans multiple lines. We do not want to update the x/y position(s)
       # in this instance. We want to keep the original starting x/y.
       if style[:y] && style[:y] > 0
-        Treefell['render'].puts "update_computed received a y > 0. Removing Y from update."
         style = style.dup.delete_if { |k,_| [:x, :y].include?(k) }
       end
       @computed.merge!(style)
     end
   end
 
-  require 'terminfo'
-  require 'termios'
-  require 'highline/system_extensions'
-  class TerminalRenderer
-    include HighLine::SystemExtensions
-    include EventEmitter
-
-    attr_reader :term_info
-
-    def initialize(output: $stdout)
-      @output = output
-      @term_info = TermInfo.new ENV["TERM"], @output
-      @previously_printed_lines = []
-      @x, @y = 0, 0
-    end
-
-    def render_cursor(input_box)
-      Treefell['render'].puts "render cursor at box=#{input_box.inspect} computed=#{input_box.computed.inspect}"
-
-      move_up_n_rows @y
-      move_to_beginning_of_row
-
-      position = input_box.position
-
-      cursor_position = input_box.cursor_position
-      cursor_x = cursor_position.x
-      cursor_y = cursor_position.y
-
-      relative_position_on_row = position
-      initial_offset_x = input_box.computed[:x] + (input_box.computed[:y] * terminal_width)
-      cursor_x = 0
-      cursor_y = 0
-
-      absolute_position_on_row = relative_position_on_row + initial_offset_x
-      loop do
-        if absolute_position_on_row >= terminal_width
-          # reset offset
-          initial_offset_x = 0
-
-          absolute_position_on_row -= terminal_width
-
-          # move down a line
-          cursor_y += 1
-        else
-          # we fit on the current line
-          cursor_x = absolute_position_on_row
-          break
-        end
-      end
-
-      if @y < cursor_y
-        # moving backwards
-        move_up_n_rows(@y - cursor_y)
-      elsif @y > cursor_y
-        # moving forwards
-        move_down_n_rows(cursor_y - @y)
-      end
-
-      move_down_n_rows cursor_y
-      move_to_beginning_of_row
-      move_right_n_characters cursor_x
-
-      @x = cursor_x
-      @y = cursor_y
-
-      Treefell['render'].puts "rendering cursor at x=#{@x} y=#{@y}"
-
-      if input_box.style[:cursor] == 'none'
-        @output.print @term_info.control_string "civis"
-      else
-        @output.print @term_info.control_string "cnorm"
-      end
-    end
-
-    def render(object, reset: false)
-      dumb_render(object, reset: reset)
-    end
-
-    def find_top_of_tree(object)
-      loop do
-        break unless object.parent
-        object = object.parent
-      end
-      object
-    end
-
-    def dumb_render(object, reset: false)
-      if reset
-        @y = 0
-        @previously_printed_lines.clear
-      end
-      @output.print @term_info.control_string "civis"
-      move_up_n_rows @y
-      move_to_beginning_of_row
-
-      object = find_top_of_tree(object)
-
-      object_width = object.width
-
-      rendered_content = object.render
-      printable_content = rendered_content.sub(/\s*\Z/m, '')
-
-      printable_lines = printable_content.split(/\n/).each_with_object([]) do |line, results|
-        if line.empty?
-          results << line
-        else
-          results.concat line.scan(/.{1,#{terminal_width}}/)
-        end
-      end
-
-      printable_lines.zip(@previously_printed_lines) do |new_line, previous_line|
-        if new_line != previous_line
-          # be sure to reset the terminal at the outset of every line
-          # because we don't know what state the previous line ended in
-          line2print = "#{new_line}\e[0m"
-          term_info.control "el"
-          move_to_beginning_of_row
-          term_info.control "el"
-          Treefell['render'].puts "printing line=#{line2print.inspect}"
-          @output.puts line2print
-        else
-          move_down_n_rows 1
-        end
-      end
-      move_to_beginning_of_row
-      clear_screen_down
-
-      # calculate lines drawn so we know where we are
-      lines_drawn = (printable_content.length / object_width.to_f).ceil
-      @y = lines_drawn
-
-      input_box = object.box.find_child_of_type(InputBox) do |box|
-        box.focused?
-      end
-      render_cursor(input_box)
-
-      @previously_printed_lines = printable_lines
-    end
-
-    def clear_to_beginning_of_line ; term_info.control "el1" ; end
-    def clear_screen ; term_info.control "clear" ; end
-    def clear_screen_down ; term_info.control "ed" ; end
-    def move_to_beginning_of_row ; move_to_column 0 ; end
-    def move_left ; move_left_n_characters 1 ; end
-    def move_left_n_characters(n) ; n.times { term_info.control "cub1" } ; end
-    def move_right_n_characters(n) ; n.times { term_info.control "cuf1" } ; end
-    def move_to_column_and_row(column, row) ; term_info.control "cup", column, row ; end
-    def move_to_column(n) ; term_info.control "hpa", n ; end
-    def move_up_n_rows(n) ; n.times { term_info.control "cuu1" } ; end
-    def move_down_n_rows(n) ; n.times { term_info.control "cud1" } ; end
-
-    def terminal_width
-      terminal_size[0]
-    end
-
-    def terminal_height
-      terminal_size[1]
-    end
-  end
 end

data/lib/terminal_layout/event_emitter.rb

@@ -0,0 +1,22 @@
+module TerminalLayout
+  module EventEmitter
+    def _callbacks
+      @_callbacks ||= Hash.new { |h, k| h[k] = [] }
+    end
+
+    def on(type, *args, &blk)
+      _callbacks[type] << blk
+      self
+    end
+
+    def unsubscribe
+      _callbacks.clear
+    end
+
+    def emit(type, *args)
+      _callbacks[type].each do |blk|
+        blk.call(*args)
+      end
+    end
+  end
+end

data/lib/terminal_layout/renderer.rb

@@ -0,0 +1,178 @@
+require 'terminfo'
+require 'termios'
+require 'highline/system_extensions'
+
+module TerminalLayout
+  class Renderer
+    include HighLine::SystemExtensions
+    include EventEmitter
+
+    attr_reader :term_info
+
+    def initialize(output: $stdout)
+      @output = output
+      @term_info = TermInfo.new ENV["TERM"], @output
+      @previously_printed_lines = []
+      @x, @y = 0, 0
+    end
+
+    def render_cursor(input_box)
+      Treefell['render'].puts %|\nCURSOR RENDER: #{self.class}##{__callee__} caller=#{caller[0..5].join("\n")}}|
+      move_up_n_rows @y
+      move_to_beginning_of_row
+
+      position = input_box.position
+
+      cursor_position = input_box.cursor_position
+      cursor_x = cursor_position.x
+      cursor_y = cursor_position.y
+
+      relative_position_on_row = position
+      initial_offset_x = input_box.computed[:x] + (input_box.computed[:y] * terminal_width)
+      cursor_x = 0
+      cursor_y = 0
+
+      absolute_position_on_row = relative_position_on_row + initial_offset_x
+      loop do
+        if absolute_position_on_row >= terminal_width
+          # reset offset
+          initial_offset_x = 0
+
+          absolute_position_on_row -= terminal_width
+
+          # move down a line
+          cursor_y += 1
+        else
+          # we fit on the current line
+          cursor_x = absolute_position_on_row
+          break
+        end
+      end
+
+      if @y < cursor_y
+        # moving backwards
+        move_up_n_rows(@y - cursor_y)
+      elsif @y > cursor_y
+        # moving forwards
+        move_down_n_rows(cursor_y - @y)
+      end
+
+      move_down_n_rows cursor_y
+      move_to_beginning_of_row
+      move_right_n_characters cursor_x
+
+      @x = cursor_x
+      @y = cursor_y
+
+      if input_box.style[:cursor] == 'none'
+        @output.print @term_info.control_string "civis"
+      else
+        @output.print @term_info.control_string "cnorm"
+      end
+    end
+
+    def render(object, reset: false)
+      dumb_render(object, reset: reset)
+    end
+
+    def find_top_of_tree(object)
+      loop do
+        break unless object.parent
+        object = object.parent
+      end
+      object
+    end
+
+    def fullzip(a, b, &blk)
+      results = if a.length >= b.length
+        a.zip(b)
+      else
+        b.zip(a).map(&:reverse)
+      end
+      if block_given?
+        results.each { |*args| blk.call(*args) }
+      else
+        results
+      end
+    end
+
+    def dumb_render(object, reset: false)
+      Treefell['render'].puts %|\nDUMB RENDER: #{self.class}##{__callee__} reset=#{reset} caller=#{caller[0..5].join("\n")}}|
+      if reset
+        @y = 0
+        @previously_printed_lines.clear
+      else
+        move_up_n_rows @y
+        move_to_beginning_of_row
+        @y = 0
+      end
+      @output.print @term_info.control_string "civis"
+
+      object = find_top_of_tree(object)
+
+      object_width = object.width
+
+      rendered_content = object.render
+      printable_content = rendered_content.sub(/\s*\Z/m, '')
+      printable_lines = printable_content.split(/\n/).each_with_object([]) do |line, results|
+        if line.empty?
+          results << line
+        else
+          results.concat line.scan(/.{1,#{terminal_width}}/)
+        end
+      end
+
+      i = 0
+      fullzip(printable_lines, @previously_printed_lines) do |new_line, previous_line|
+        i += 1
+        if new_line && new_line != previous_line
+          # be sure to reset the terminal at the outset of every line
+          # because we don't know what state the previous line ended in
+          line2print = "#{new_line}\e[0m"
+          term_info.control "el"
+          move_to_beginning_of_row
+          term_info.control "el"
+          @output.puts line2print
+          move_to_beginning_of_row
+        elsif i <= printable_lines.length
+          move_down_n_rows 1
+        end
+      end
+
+      move_to_beginning_of_row
+      clear_screen_down
+
+      # calculate lines drawn so we know where we are
+      lines_drawn = (printable_content.length / object_width.to_f).ceil
+      @y = lines_drawn
+
+      input_box = object.box.find_child_of_type(InputBox) do |box|
+        box.focused?
+      end
+      render_cursor(input_box)
+
+      @previously_printed_lines = printable_lines
+    end
+
+    def clear_to_beginning_of_line ; term_info.control "el1" ; end
+    def clear_screen ; term_info.control "clear" ; end
+    def clear_screen_down ; term_info.control "ed" ; end
+    def move_to_beginning_of_row ; move_to_column 0 ; end
+    def move_left ; move_left_n_characters 1 ; end
+    def move_left_n_characters(n) ; n.times { term_info.control "cub1" } ; end
+    def move_right_n_characters(n) ; n.times { term_info.control "cuf1" } ; end
+    def move_to_column_and_row(column, row) ; term_info.control "cup", column, row ; end
+    def move_to_column(n) ; term_info.control "hpa", n ; end
+    def move_up_n_rows(n) ; n.times { term_info.control "cuu1" } ; end
+    def move_down_n_rows(n) ; n.times { term_info.control "cud1" } ; end
+
+    def terminal_width
+      terminal_size[0]
+    end
+
+    def terminal_height
+      terminal_size[1]
+    end
+  end
+
+end

data/lib/terminal_layout/version.rb

@@ -1,3 +1,3 @@
 module TerminalLayout
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-layout
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi_string
@@ -145,6 +145,8 @@ files:
 - block-flow.rb
 - lib/tasks/gem.rake
 - lib/terminal_layout.rb
+- lib/terminal_layout/event_emitter.rb
+- lib/terminal_layout/renderer.rb
 - lib/terminal_layout/version.rb
 - spec/spec_helper.rb
 - spec/terminal_layout_spec.rb
@@ -170,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A terminal layout manager