bash-visual 1.0.6 → 1.0.7

data/README.md

@@ -3,7 +3,7 @@
 Bash visualisation library
 
 ## Description
-**BashVisual** simplifies Unix-console operation (bash, csh etc). It uses _tput_ and standard Unix-terminal facilities. It is also thread-safe.
+**BashVisual** simplifies Unix-console operation (sh, bash, csh etc). It uses _tput_ and standard Unix-terminal facilities. It is also thread-safe.
 
 BashVisual allows:
 - control position, colors and text's form

data/example/hello_world.rb

@@ -3,12 +3,9 @@ $:.push File.expand_path('../../lib', __FILE__)
 require 'bash-visual'
 include Bash_Visual
 
-border_font = Font.new(:std, :blue)
-main_color = Font.new(:bold, :green)
-
-console = Console.new(main_color)
+console = Console.new
 console.clear
 
-console.draw_window(2, 2, 20, 5, 'Example', border_font, Console::BORDER_UTF_DOUBLE)
-console.write_to_position(5, 3, 'Hello World!')
+console.draw_window [3, 3], [18, 5], 'Example', {font: Font.new(:std, :red)}
+console.write_to_position 5, 4, 'Hello World!', Font.new(:bold)
 console.position = [0, 8]

data/example/painter.rb

@@ -0,0 +1,36 @@
+$:.push File.expand_path('../../lib', __FILE__)
+
+require 'bash-visual'
+include Bash_Visual
+
+console = Console.new
+console.clear
+Thread.new {
+  100.times {
+    x, y          = 0, 0
+    width, height = 20, 12
+    5.times {
+      x, y          = x+1, y+1
+      width, height = width-2, height-2
+      console.draw_border([x, y], [width, height], {font: Font::rand_font})
+      sleep 0.08
+    }
+  }
+}
+
+Thread.new {
+  100.times {
+    x, y          = 22, 0
+    width, height = 20, 12
+    5.times {
+      x, y          = x+1, y+1
+      width, height = width-2, height-2
+      console.draw_filled_rectangle([x, y], [width, height], Font::rand_color(:black))
+      sleep 0.09
+    }
+  }
+
+}
+
+sleep 10
+console.position = [0, 12]

data/example/scroll.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+$:.push File.expand_path('../../lib', __FILE__)
+require 'bash-visual'
+include Bash_Visual
+
+console = Console.new
+console.clear
+
+console.draw_window([32, 0] ,[42, 11], 'Vertical scroll')
+console.draw_window([0, 12] ,[73, 6], 'Horizontal scroll')
+
+v_scroll = VerticalScroll.new(
+  position: [33, 1],
+  size: [39, 9],
+  prefix: ->{Time.now.strftime('%H-%M-%S:%3N') + ' '}
+)
+
+h_scroll = HorizontalScroll.new(
+    position: [2, 12],
+    size: [70, 4],
+    fixed_message_block_size: 20,
+    separator: true
+)
+
+phrases =[
+    "Bash is a Unix shell",
+    "GNU’s Not UNIX",
+    "Answer to the Ultimate Question of Life, the Universe, and Everything"]
+
+
+Thread.new {
+  10.times do
+    h_scroll.add phrases.sample
+    sleep 0.3
+  end
+}
+Thread.new {
+  10.times do
+    v_scroll.add phrases.sample
+    sleep 0.15
+  end
+}
+
+sleep 4
+console.position = [1,18]

data/lib/bash-visual.rb

@@ -1,6 +1,8 @@
 require 'bash-visual/version'
+require 'bash-visual/painter'
 require 'bash-visual/console'
 require 'bash-visual/font'
+require 'bash-visual/fixed_object'
 require 'bash-visual/scroll'
 require 'bash-visual/builder'
 require 'bash-visual/horizontal_scroll'

data/lib/bash-visual/builder.rb

@@ -42,7 +42,7 @@ module Bash_Visual
       bash
     end
 
-    def write_to_position(x, y, text, font = @default_font)
+    def write_to_position(x, y, text, font = nil)
       bash = ''
       bash << save_position()
       bash << move_position(x, y)
@@ -51,12 +51,14 @@ module Bash_Visual
       bash
     end
 
-    def write(text, font = @default_font)
+    def write(text, font = nil)
+      return text if font.nil?
       font.to_bash + text + Font::RESET
     end
 
-    def write_ln(text, font = @default_font)
-      font.to_bash + text.to_s + $/ + Font::RESET
+    def write_ln(text, font = nil)
+      return text + "\n" if font.nil?
+      font.to_bash + text.to_s + "\n" + Font::RESET
     end
   end
 end

data/lib/bash-visual/console.rb

@@ -1,30 +1,22 @@
 module Bash_Visual
   class Console
+    include Painter
+
     @@mutex = Mutex.new
 
     OUTPUT_STRING = 0
     OUTPUT_WITHOUT_BLOCK = 1
     OUTPUT_WITH_BLOCK = 2
-    # see: http://en.wikipedia.org/wiki/Box-drawing_characters
-    BORDER_UTF         = ["\u250C","\u2500","\u2510",
-                          "\u2502",         "\u2502",
-                          "\u2514","\u2500","\u2518"]
-
-    BORDER_UTF_ROUND   = ["\u256D","\u2500","\u256E",
-                          "\u2502",         "\u2502",
-                          "\u2570","\u2500","\u256F"]
-
-    BORDER_UTF_DOUBLE  = ["\u2554","\u2550","\u2557",
-                          "\u2551",         "\u2551",
-                          "\u255A","\u2550","\u255D"]
-
     attr_reader :current_x, :current_y, :font;
 
-    def initialize (font = Font.new, way_outnput = OUTPUT_WITHOUT_BLOCK, builder = Builder.new)
+    # @param [Bash_Visual::Font] font
+    # @param [Object] way_output
+    # @param [Bash_Visual::Builder] builder
+    def initialize (font = Font.new, way_output = OUTPUT_WITHOUT_BLOCK, builder = Builder.new)
       @current_x = 0
       @current_y = 0
-      @type = font
-      @way_output = way_outnput
+      @font = font
+      @way_output = way_output
       @builder = builder
     end
 
@@ -42,20 +34,15 @@ module Bash_Visual
     # Записать что-то в определенной позиции, а потом вернуться на текущую
     # Если необходимо сохранить позицию после записи - используйте связку
     # move_position/position= и write
-    def write_to_position (x, y, text, font = @type)
+    def write_to_position (x, y, text, font = @font)
       print @builder.write_to_position(x, y, text, font)
     end
 
-    def write (text, font = @type)
+    def write (text, font = @font)
       print @builder.write(text, font)
     end
 
-    def write_ln (text = nil, font = @type)
-      if text.nil?
-        print $/
-        return
-      end
-
+    def write_ln (text = '', font = @font)
       print @builder.write_ln(text, font)
     end
 
@@ -63,61 +50,6 @@ module Bash_Visual
       print @builder.erase_to_end_line
     end
 
-    def draw_rectangle(x, y, width, height, font = nil)
-      bash = ''
-      bash << @builder.save_position()
-      bash << @builder.set_position(x,y)
-      height.times do
-        bash << @builder.write(' ' * width, font)
-        bash << @builder.move_position(-width, 1)
-      end
-      bash << @builder.restore_position()
-      print @builder.write(bash, font)
-    end
-
-    def draw_border(x, y, width, height, font = nil, border = BORDER_UTF)
-      raise 'width,height must be great than 1' if (width < 2 or height < 2)
-
-      bash = ''
-      bash << @builder.save_position()
-      bash << @builder.set_position(x,y)
-
-      bash <<  @builder.write(border[0] + border[1] * (width - 2) +  border[2], font)
-      (height - 2).times do
-        bash << @builder.move_position(-width, 1)
-        bash << @builder.write(border[3] + ' ' * (width - 2) + border[4], font)
-      end
-      bash << @builder.move_position(-width, 1)
-      bash << @builder.write(border[5] + border[6] * (width - 2) + border[7], font)
-
-      bash << @builder.restore_position()
-      print @builder.write(bash, font)
-    end
-
-    def draw_window(x, y, width, height, text = '', font = nil, border = BORDER_UTF_DOUBLE, text_wrap = ["\u2561","\u255E"])
-      raise 'width,height must be great than 2' if (width < 3 or height < 3)
-
-      text = text.slice(0, width - 2)
-      if text.size < (width - 3) && (text_wrap.instance_of? Array)
-        text = text_wrap[0] + text + text_wrap[1]
-      end
-      text = text.center(width - 2, border[1])
-      bash = ''
-      bash << @builder.save_position()
-      bash << @builder.set_position(x,y)
-
-      bash << @builder.write(border[0] + text +  border[2], font)
-      (height - 2).times do
-        bash << @builder.move_position(-width, 1)
-        bash << @builder.write(border[3] + ' ' * (width - 2) + border[4], font)
-      end
-      bash << @builder.move_position(-width, 1)
-      bash << @builder.write(border[5] + border[6] * (width - 2) + border[7], font)
-
-      bash << @builder.restore_position()
-      print @builder.write(bash, font)
-    end
-
     # Clear the screen and move to (0,0)
     def clear
       @current_x = 0
@@ -126,7 +58,7 @@ module Bash_Visual
     end
 
     def font= font
-      @type = font
+      @font = font
     end
 
     def lines

data/lib/bash-visual/fixed_object.rb

@@ -0,0 +1,16 @@
+# @author 
+module Bash_Visual
+  module FixedObject
+
+    attr_accessor :width, :height, :x, :y;
+
+    def position
+      [@x, @y]
+    end
+
+    def size
+      [@width, @height]
+    end
+
+  end
+end

data/lib/bash-visual/font.rb

@@ -2,7 +2,7 @@ module Bash_Visual
   class Font
 
     COLORS = [:black, :dark_red, :dark_green, :dark_yellow, :dark_blue, :dark_magenta, :dark_cyan, :grey,
-              :dark_grey, :red, :green, :yellow, :blue, :magenta, :cyan, :white]
+        :dark_grey, :red, :green, :yellow, :blue, :magenta, :cyan, :white]
 
     TYPES = [:std, :bold, :underline, :blink]
 
@@ -32,60 +32,33 @@ module Bash_Visual
         blink:     5
     }
 
-    RESET     = "\e[0m"
+    RESET = "\e[0m"
 
     attr_reader :types, :foreground, :background
 
     def initialize(types = :std, foreground = :white, background = nil)
 
-      unless COLORS.include?(foreground)
-        raise "not found color #{foreground}"
-      end
+      build(types, foreground, background)
+    end
 
-      @foreground, @background = foreground, background
+    def add_type(type)
+      return false if @types.include? type
 
-      @types = prepare_types types
+      @types << type
+      build(@types, @foreground, @background)
 
-      sequence = []
-      @types.each do |type|
-        sequence << @@types_map[type]
-      end
+      true
+    end
 
-      color_index = @@colors_map[@foreground]
+    def remove_type(type)
 
-      sequence << if color_index < 10
-                    "3#{color_index}"
-                  else
-                    "9#{color_index - 10}"
-                  end
+      return false unless @types.include? type
+      return false if @types == [:std]
 
-      if @background
-        color_index = @@colors_map[@background]
-        sequence << if color_index < 10
-                      "4#{color_index}"
-                    else
-                      "10#{color_index - 10}"
-                    end
-      end
+      @types.delete type
+      build(@types, @foreground, @background)
 
-      @bash_command = "\e[#{sequence.join(';')}m"
-    end
-
-
-    # @return [Array]
-    def prepare_types(types)
-      case types
-        when Symbol then
-          [types]
-        when Array then
-          if types.size > 2
-            types.delete_if { |type| type == :std }
-          else
-            types
-          end
-        else
-          raise "types must be Array or Symbol"
-      end
+      true
     end
 
     def inspect
@@ -116,6 +89,71 @@ module Bash_Visual
         end
 
       end
+
+      def rand_font
+         color = self.rand_color
+         Font.new :std, color
+      end
+    end
+
+    private
+
+    def build(types, foreground, background)
+
+      unless COLORS.include?(foreground)
+        raise "Illegal color #{foreground}"
+      end
+
+      @foreground, @background = foreground, background
+
+      @types = prepare_types types
+
+      sequence = []
+      @types.each do |type|
+        sequence << @@types_map[type]
+      end
+
+      color_index = @@colors_map[@foreground]
+
+      sequence << if color_index < 10
+                    "3#{color_index}"
+                  else
+                    "9#{color_index - 10}"
+                  end
+
+      if @background
+        color_index = @@colors_map[@background]
+        sequence << if color_index < 10
+                      "4#{color_index}"
+                    else
+                      "10#{color_index - 10}"
+                    end
+      end
+
+      @bash_command = "\e[#{sequence.join(';')}m"
+    end
+
+
+    # @return [Array]
+    def prepare_types(types)
+      types = case types
+                when Symbol then
+                  [types]
+                when Array then
+                  if types.size > 2
+                    types.delete_if { |type| type == :std }
+                  else
+                    types
+                  end
+                else
+                  raise "types must be Array or Symbol"
+              end
+
+      if types.size > 1 && types.include?(:std)
+        types.delete :std
+      end
+
+      types
     end
 
   end

data/lib/bash-visual/horizontal_scroll.rb

@@ -5,18 +5,17 @@ module Bash_Visual
 
     def initialize options
       super
-      @message_block_width = @message_block_size
 
       @separator =
         if @separator == true;                  DEFAULT_SEPARATOR
-        elsif @separator.instance_of? String;   @separator[0]
+        elsif @s.instance_of? String;   @separator[0]
         else                                    nil
       end
     end
 
     def get_x_position available_area_width, message_width = 0
       if (@start == BEGINNING)
-        @x + (@area_width - available_area_width)
+        @x + (@width - available_area_width)
       else
         @x + available_area_width - message_width
       end
@@ -25,45 +24,33 @@ module Bash_Visual
     def print_message message, font, available_area
 
       available_area_width, available_area_height = available_area
-      avail_width = @message_block_width > available_area_width ? available_area_width : @message_block_width
 
+      msg_block_width =
+          case
+            when @fixed_message_block_size
+              @fixed_message_block_size
+            when @max_message_block_size
+              @max_message_block_size
+            else
+              available_area_width
+          end
 
-      (available_area_height - message.size).times {
-        message << ''
-      }
+      msg_block_width -= 1 if @separator
+      msg_block_width = available_area_width if msg_block_width > available_area_width
 
-      if @adapt_size_message
-        message_width = rows_wrap! message, available_area_width
-      else
-        rows_wrap! message, avail_width
-        message_width = avail_width
-      end
+      #msg_block_height = @adapt ? available_area_height : 1
 
-      message = message.slice(0, available_area_height) if message.size > available_area_height
-
-      message.map! do |row|
-          row.strip.ljust(message_width)
-      end
-
-      if @separator and @separator.size.nonzero?
-        if @adapt_size_message
-          if message_width < available_area_width
-            message.map! do |row|
-                row << @separator
-            end
-            message_width += 1
-          end
-        else
-          message.each do |row|
-              row[message_width-1] = @separator
-          end
+      message = Scroll.form_block message, [msg_block_width, available_area_height], @fixed_message_block_size
+      if @separator
+        message.map! do |row|
+          row = row + DEFAULT_SEPARATOR
         end
       end
 
-      write(get_x_position(available_area_width, message_width), @y, message, font)
+      msg_block_width += 1
+      write(get_x_position(available_area_width, msg_block_width), @y, message, font)
 
-      [available_area_width - message_width, available_area_height]
+      [available_area_width - msg_block_width, available_area_height]
     end
-
   end
 end

data/lib/bash-visual/painter.rb

@@ -0,0 +1,110 @@
+# coding: utf-8
+
+module Bash_Visual
+  module Painter
+
+    @@default_window_wrap = ["\u257C ", " \u257E"]
+    #@@default_window_wrap = ["", ""]
+
+    # see: http://en.wikipedia.org/wiki/Box-drawing_characters
+    BORDER_UTF            = ["\u250C", "\u2500", "\u2510",
+        "\u2502", "\u2502",
+        "\u2514", "\u2500", "\u2518"]
+
+    BORDER_UTF_ROUND = ["\u256D", "\u2500", "\u256E",
+        "\u2502", "\u2502",
+        "\u2570", "\u2500", "\u256F"]
+
+    BORDER_UTF_DOUBLE = ["\u2554", "\u2550", "\u2557",
+        "\u2551", "\u2551",
+        "\u255A", "\u2550", "\u255D"]
+
+    # @param [Array] position
+    # @param [Array] size
+    def draw_filled_rectangle(position, size, color = :white)
+      x, y          = *position
+      width, height = *size
+      raise 'width,height must be great than 1' if (width < 1 or height < 1)
+
+      color = color.background if color.is_a? Font
+      font = Font.new :std, :white, color
+
+      bash = @builder.save_position
+      bash << @builder.set_position(x+1, y+1)
+
+      row = @builder.write(' ' * width)
+      row << @builder.move_position(-width, 1)
+      bash << row*height
+
+      bash << @builder.restore_position
+      print @builder.write(bash, font)
+    end
+
+    # @param [Array] position
+    # @param [Array] size
+    def draw_border(position, size, params = {})
+      x, y          = *position
+      width, height = *size
+      raise 'width,height must be great than 1' if (width < 2 or height < 2)
+
+      border = params[:border] ? params[:border] : BORDER_UTF
+      font   = params[:font] ? params[:font] : @font
+
+      bash = @builder.save_position
+      bash << @builder.set_position(x, y)
+      body_width = width - 2
+
+      bash << @builder.write(border[0] + border[1] * body_width + border[2])
+
+      row = @builder.move_position(-width, 1)
+      row << @builder.write(border[3] + ' ' * body_width + border[4])
+      bash << row*(height - 2)
+
+      bash << @builder.move_position(-width, 1)
+      bash << @builder.write(border[5] + border[6] * body_width + border[7])
+
+      bash << @builder.restore_position
+      print @builder.write(bash, font)
+    end
+
+    # @param [Array] position
+    # @param [Array] size
+    # @param [String] text
+    # @param [Hash] params
+    def draw_window(position, size, text = '', params = {})
+      x, y          = *position
+      width, height = *size
+      raise 'width,height must be great than 2' if (width < 3 or height < 3)
+
+      wrap   = params[:wrap].nil? ? @@default_window_wrap : params[:wrap]
+      border = params[:border] ? params[:border] : BORDER_UTF
+      font   = params[:font] ? params[:font] : @font
+
+      body_width = width - 2
+      text = if wrap
+               wrap_size  = wrap[0].size + wrap[1].size
+               text_width = body_width - wrap_size
+               wrap[0] + text.to_s[0, text_width] + wrap[1]
+             else
+               text.to_s.slice(0, body_width)
+             end
+
+      text = text.center(body_width, border[1])
+
+      bash = @builder.save_position
+      bash << @builder.set_position(x, y)
+
+      bash << @builder.write(border[0] + text + border[2])
+
+      row = @builder.move_position(-width, 1)
+      row << @builder.write(border[3] + ' ' * body_width + border[4])
+      bash << row*(height - 2)
+
+      bash << @builder.move_position(-width, 1)
+      bash << @builder.write(border[5] + border[6] * body_width + border[7])
+
+      bash << @builder.restore_position
+      print @builder.write(bash, font)
+    end
+  end
+end

data/lib/bash-visual/scroll.rb

@@ -1,5 +1,7 @@
 module Bash_Visual
- class Scroll
+  class Scroll
+
+    include FixedObject
 
     FORWARD  = 1
     BACKWARD = -1
@@ -7,15 +9,15 @@ module Bash_Visual
     BEGINNING = false
     ENDING    = true
 
-    attr_accessor :console
+    attr_reader :console
 
 
     # @param [Hash] options
     #
     # options = {
-    #   coordinates: [x, y],
-    #   window_size: [width, height],
-    #   font: Font.new
+    #   position: [x, y],
+    #   size: [width, height],
+    #   font: Font.new (:bold)
     #   start: Scroll::ENDING,
     #   adapt_size_message: true,
     #   prefix: -> { '>' }
@@ -25,33 +27,28 @@ module Bash_Visual
     #
     def initialize(options)
 
-      @x, @y = options[:coordinates]
-      @x = @x.to_i
-      @y = @y.to_i
+      unless  options[:position] && options[:size]
+        raise "Minimum needs: :size and :position"
+      end
 
-      raise ':window_size isn\'t array' unless options[:window_size].instance_of? Array
-      raise 'size :window_size must be great than 1' if options[:window_size].size < 2
+      @width, @height = options[:size]
+      @x, @y          = options[:position]
+      @prefix         = options[:prefix]
+      @adapt          = options[:adapt].nil? ? true : options[:adapt]
+      @separator      = options[:separator]
 
-      @area_width, @area_height = options[:window_size]
-      @area_width = @area_width.to_i
-      @area_height = @area_height.to_i
+      @max_message_block_size   = options[:max_message_block_size]
+      @fixed_message_block_size = options[:fixed_message_block_size]
 
-      @message_block_size = options[:message_block_size] ? options[:message_block_size].to_i : 1
-      @message_block_size = 1 if @message_block_size < 1
+      @start = options[:start] ? ENDING : BEGINNING
+      @font  = options[:font] ? options[:font] : Font.new
 
-      @prefix = options[:prefix] ? options[:prefix] : nil
+      @stack     = []
+      @stateless = false
 
-      @adapt_size_message = options[:adapt_size_message] ? options[:adapt_size_message] : false
+      @console = Console.new @font, Console::OUTPUT_STRING
+      @mutex   = Mutex.new
 
-      @is_wrap = true
-      @start = options[:start] ? ENDING : BEGINNING
-      @separator = options[:separator] ? options[:separator] : false
-      @type = options[:type] ? options[:type] : nil
-
-      @stack = []
-      @console = Console.new @type, Console::OUTPUT_STRING
-      @mutex = Mutex.new
-      nil
     end
 
     def scroll(positions = 1, direction = @direction * positions)
@@ -60,67 +57,64 @@ module Bash_Visual
 
     # @param [String] message
     # @param [Bash_Visual::Font] font
-    def add(message, font = @type)
+    def add(message, font = @font)
 
-      if @stack.size.zero?
-        print @console.draw_rectangle(@x + 1, @y + 1, @area_width, @area_height, font)
+      unless font.background
+        font = Font.new font.types, font.foreground, @font.background
       end
 
-      @stack << {
-        message: prefix() << message.to_s,
-           type: font
-      }
+      @stack << {message: prefix() + message.to_s, font: font}
+
+      clear
+      redraw
 
-      redraw()
-      #@stack.slice!(-index, index)
       nil
     end
 
 
-    # @param [Object] prefix
+    # @param [Proc] prefix
     def prefix= (prefix)
       @prefix = prefix
     end
 
     def prefix
-      if (defined? @prefix.call)
-        @prefix[].to_s
-      else
-        ''
+      return @prefix[].to_s if (defined? @prefix.call)
+      ''
+    end
+
+    class << self
+      def form_block(text, size, fixate = false)
+        width, height = size
+        result        = []
+
+        height.times do |i|
+          line = text[i * width, width]
+
+          unless line
+            break unless fixate
+            result.fill(' ' * width, i, height - i)
+            break
+          end
+
+          result << line.ljust(width)
+        end
+
+        result
       end
     end
 
     private
 
     def redraw
-      avail_area = [@area_width, @area_height]
+      avail_area = [@width, @height]
       @stack.reverse.each do |item|
 
-        message = item[:message].dup.lines.to_a
-        font = item[:type]
-        unless font.background
-          font = Font.new font.type, font.foreground, @type.background
-        end
-
+        message    = item[:message]
+        font       = item[:font]
         avail_area = print_message(message, font, avail_area)
-        # выходим если закончилось место в области
-        return nil if avail_area[0] <= 0 or avail_area[1] <= 0
-      end
-    end
 
-    # сделать переносы в массиве строк
-    # @param [String] arr
-    # @param [Integer] max_len
-    def rows_wrap!(arr, max_len)
-      max_used_len = 1
-      arr.each_with_index do |row, i|
-        len = row.size
-        max_used_len = len if len > max_used_len
-        next if len <= max_len
-        tail = row.slice!(max_len,  len-max_len)
-        arr.insert(i+1, tail)
+        return nil if avail_area[0] <= 0 or avail_area[1] <= 0
       end
-      max_used_len
     end
 
     # @param [Integer] x
@@ -130,12 +124,19 @@ module Bash_Visual
     def write(x, y, message, font)
       string = ''
       message.each_with_index { |text, i|
-       string << @console.write_to_position(x, y + i, text, font)
+        string << @console.write_to_position(x, y + i, text, font)
       }
 
       @mutex.synchronize {
         print string
       }
     end
+
+    private
+
+    # Clear scroll's area
+    def clear(font = @font)
+      print @console.draw_filled_rectangle([@x, @y], [@width, @height], font.background)
+    end
   end
 end

data/lib/bash-visual/version.rb

@@ -1,3 +1,3 @@
 module Bash_Visual
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/bash-visual/vertical_scroll.rb

@@ -1,14 +1,9 @@
 module Bash_Visual
   class VerticalScroll < Scroll
 
-    def initialize options
-      super
-      @message_block_height = @message_block_size
-    end
-
     def get_y_position available_area_height, message_size = 0
       if (@start == BEGINNING)
-        @y + (@area_height - available_area_height)
+        @y + (@height - available_area_height)
       else
         @y + available_area_height - message_size
       end
@@ -17,36 +12,29 @@ module Bash_Visual
     def print_message message, font, available_area
 
       available_area_width, available_area_height = available_area
-      avail_height = @message_block_height > available_area_height ? available_area_height : @message_block_height
-
-      rows_wrap!(message, available_area_width) if @is_wrap
-
-      if @adapt_size_message
-        message = message.slice(0, available_area_height) if message.size > available_area_height
-      else
-        message = message.slice(0, avail_height) if message.size > avail_height
-      end
 
-      message.map! do |row|
-          row.strip.ljust(available_area_width)
-      end
-
-      if @separator == true
-        message[message.size-1] = Font.new(:underline, font.foreground, font.background).to_bash +
-          message.last.ljust(available_area_width, ' ')
-      end
-
-      if (@separator.instance_of? String)
-        if (message.size > available_area_height)
-          message[message.size-1] = @separator[0] * available_area_width
-        else
-          message << @separator[0] * available_area_width
-        end
+      msg_block_height =
+          case
+            when !@adapt
+              1
+            when @fixed_message_block_size
+              @fixed_message_block_size
+            when @max_message_block_size
+              @max_message_block_size
+            else
+              available_area_height
+          end
+
+      msg_block_height -= 1 if @separator
+      msg_block_height = available_area_height if msg_block_height > available_area_height
+
+      message = Scroll.form_block message, [available_area_width, msg_block_height]
+      if @separator
+        message << @separator * available_area_width
       end
 
       write(@x, get_y_position(available_area_height, message.size), message, font)
 
-
       [available_area_width, available_area_height - message.size]
     end
 

data/test/console_test.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+$:.unshift(File.dirname(__FILE__))
+
+require 'helper'
+
+class ConsoleTest < Test::Unit::TestCase
+
+  include Bash_Visual
+
+  def test_draw_rectangle
+
+
+  end
+
+end

data/test/font_test.rb

@@ -71,6 +71,44 @@ class FontTest < Test::Unit::TestCase
 
   end
 
+  def test_rand
+    assert_instance_of Font, Font::rand_font
+  end
+
+  def test_illegal_color
+    assert_raise_message "Illegal color wrong_color" do
+      font = Font.new :std, :wrong_color
+    end
+  end
+
+  def test_add_type
+    font = Font.new
+
+    assert_false(font.add_type :std)
+
+    assert_true(font.add_type :bold)
+    assert_equal [:bold], font.types
+
+    assert_true(font.add_type :underline)
+    assert_equal [:bold, :underline], font.types
+  end
+
+
+  def test_remove_type
+    font = Font.new
+
+    assert_false(font.remove_type :std)
+    assert_equal [:std], font.types
+
+    font.add_type :underline
+    assert_false(font.remove_type :std)
+
+    assert_true(font.add_type :bold)
+    font.remove_type :underline
+    assert_equal [:bold], font.types
+
+  end
+
   protected
 
   def mock_class_method(class_name, eval_string)

data/test/helper.rb

@@ -1,5 +1,6 @@
 require "simplecov"
 require "test/unit"
+require "mocha"
 require "bash-visual"
 
 SimpleCov.coverage_dir('../.coverage')

data/test/painter_test.rb

@@ -0,0 +1,32 @@
+# coding: utf-8
+$:.unshift(File.dirname(__FILE__))
+
+require 'helper'
+
+
+class PainterTest < Test::Unit::TestCase
+
+  include Bash_Visual
+
+  def setup
+    @painter = Object.new
+    @painter.extend(Painter)
+    builder = Bash_Visual::Builder.new #mock('Bash_Visual::Builder')
+    @painter.instance_variable_set(:@builder, builder)
+  end
+
+  def test_draw_window
+    @painter.draw_window([1, 1], [10, 10], 'logs')
+    @painter.draw_window([1, 1], [10, 10], 'logs', {font: Font.new(:bold)})
+  end
+
+  def test_draw_border
+    @painter.draw_border([1, 1], [10, 10])
+    @painter.draw_border([1, 1], [10, 10], {font: Font.new(:bold)})
+  end
+
+  def test_draw_filled_rectangle
+    @painter.draw_filled_rectangle([1, 1], [10, 10])
+    @painter.draw_filled_rectangle([1, 1], [10, 10], :red)
+  end
+end

data/test/scroll_test.rb

@@ -0,0 +1,61 @@
+# coding: utf-8
+$:.unshift(File.dirname(__FILE__))
+
+require 'helper'
+
+class ScrollTest < Test::Unit::TestCase
+
+  include Bash_Visual
+
+  def test_empty_params
+
+    assert_raise_message "Minimum needs: :size and :position" do
+      scroll = Scroll.new :prefix => nil
+    end
+
+    assert_raise_message "Minimum needs: :size and :position" do
+      scroll = Scroll.new :size => [1,1]
+    end
+
+    assert_raise_message "Minimum needs: :size and :position" do
+      scroll = Scroll.new :position => [1,1]
+    end
+  end
+
+  def test_rows_wrap__example
+
+    text = 'Hello world. Lot of words...'
+    expected = ['Hell', 'o wo', 'rld.', ' Lot']
+    result = Scroll::form_block(text, [4,4])
+
+    assert_equal expected, result
+  end
+
+  def test_rows_wrap__min
+
+    text = 'Hello world. Lot of words...'
+    expected = ['H']
+    result = Scroll::form_block(text, [1,1])
+
+    assert_equal expected, result
+  end
+
+
+  def test_rows_wrap__fill
+
+    text = 'Hell'
+    expected = ['Hell ']
+    result = Scroll::form_block(text, [5, 3])
+
+    assert_equal expected, result
+  end
+
+  def test_rows_wrap__fixate_fill
+
+    text = 'Hell'
+    expected = ['Hell ', ' ' * 5, ' ' * 5]
+    result = Scroll::form_block(text, [5, 3], true)
+
+    assert_equal expected, result
+  end
+end

data/test/vertical_scroll_test.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+$:.unshift(File.dirname(__FILE__))
+
+require 'helper'
+
+class ScrollTest < Test::Unit::TestCase
+
+  include Bash_Visual
+
+  def test_empty
+
+
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-visual
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies: []
 description: Bash visualisation tools
 email:
@@ -23,21 +23,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bash-visual-1.0.6.gem
 - bash-visual.gemspec
 - example/hello_world.rb
+- example/painter.rb
 - example/random.rb
+- example/scroll.rb
 - example/spectrum.rb
 - lib/bash-visual.rb
 - lib/bash-visual/builder.rb
 - lib/bash-visual/console.rb
+- lib/bash-visual/fixed_object.rb
 - lib/bash-visual/font.rb
 - lib/bash-visual/horizontal_scroll.rb
+- lib/bash-visual/painter.rb
 - lib/bash-visual/scroll.rb
 - lib/bash-visual/version.rb
 - lib/bash-visual/vertical_scroll.rb
 - test/builder_test.rb
+- test/console_test.rb
 - test/font_test.rb
 - test/helper.rb
+- test/painter_test.rb
+- test/scroll_test.rb
+- test/vertical_scroll_test.rb
 homepage: https://github.com/AlmazKo/BashVisual
 licenses:
 - MIT