whirled_peas 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caed061285ef515e70f20c18153a16eedb3876a98842f2029db069c4a14dcd7f
-  data.tar.gz: c07b7daeaa8c048d0068c1150ad248099c335a2a9e8fd70bd47ad8f9bfc99174
+  metadata.gz: d3cb7aa7af0bf74f8818eb5796f310e3b65a73851b7cbab35834e14fe0262ac1
+  data.tar.gz: 6ae73d252d69d3730c1e1814d441800fca08177a4401abc3e4dcbe6edcd34548
 SHA512:
-  metadata.gz: f4c3c1003793b47a99413aed446f0935da5a866819336c6b58e02f5b90ae1d69eeefae6b8ea92a8460fda3fcd89843faeeadf9824a4ba5502dd7ca5539a390d5
-  data.tar.gz: dccb23acdc4a580e3b319e17f8d0deeac981be86482c9426b5306c40dbed0691b0308bb5300a764830bb3832700b34db0f99beb98796992521294f295623bcda
+  metadata.gz: 2b0965214a99209e4830ed68da162cc83d249188e197d8b9fe11b61356f797e2172a648aef2b23f83f9ac45db40d9f4e7daee9471f67069e61998e5f24a8d0ba
+  data.tar.gz: e0d546f8a60606a918aadf1743848b9839703328bf14a05dcb67f680886ee2eef2c4ae542d89055daf822f74200f64a719e77f1223520266aa7d6703b18ccb03

data/.travis.yml

@@ -3,4 +3,6 @@ language: ruby
 cache: bundler
 rvm:
   - 2.6.6
+  - 2.7.2
+  - 3.0.0
 before_install: gem install bundler -v 2.1.4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.2.0 - 2021-01-20
+
+- [73eb326](https://github.com/tcollier/whirled_peas/tree/73eb326426f9814e91e3bc7a60dfd87be3d69f7e): Convert "primitive" data types to strings
+- [f28b69d](https://github.com/tcollier/whirled_peas/tree/f28b69df8b6cfc973da2ebc0b8da29b278f23433): Give elements names
+- [1ae1c929](https://github.com/tcollier/whirled_peas/tree/1ae1c929429c2f8520054d33a064c2b6d71955fe): Consistently format exceptions in logs
+- [4c2114f](https://github.com/tcollier/whirled_peas/tree/4c2114fd360fd98c65e6e32f905a377f09b919ee): Fix bug with negative sleep times
+- [627bf12](https://github.com/tcollier/whirled_peas/tree/627bf126dd7f9c845f65105e0826d14a35a0a953): Don't reraise pipe error
+
 ## v0.1.1 - 2021-01-20
 
 - [3852c8c](https://github.com/tcollier/whirled_peas/tree/3852c8c700c2e8fb92e65bbca1c99be74304c6d0): Improve error handling

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
 gem 'pry-byebug'
+gem 'tty-cursor', '~> 0.7'

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.com/tcollier/whirled_peas.svg?branch=main)](https://travis-ci.com/tcollier/whirled_peas)
+
 # WhirledPeas
 
 Visualize your code's execution with Whirled Peas!
@@ -37,7 +39,7 @@ end
 
 class Driver
   def start(producer)
-    producer.send('starting', args: { 'name' => 'World' })
+    producer.send_frame('starting', args: { 'name' => 'World' })
     # ...
   end
 end
@@ -70,9 +72,8 @@ The producer provides a single method
 #
 # @param name [String] application defined name for the frame. The template factory will be provided this name
 # @param duration [Number] time in seconds this frame should be displayed for (defaults to 1 frame)
-# @param args [Hash] key value pairs to send as arguments to the template factory, these values will be
-#   serialized/deserialized
-def send(name, duration:, args:)
+# @param args [Hash] key value pairs to send as arguments to the template factory
+def send_frame(name, duration:, args:)
   # implementation
 end
 ```
@@ -85,25 +86,25 @@ Simple application that loads a set of numbers and looks for a pair that adds up
 class Driver
   def start(producer)
     numbers = File.readlines('/path/to/numbers.txt').map(&:to_i)
-    producer.send('load-numbers', duration: 3, args: { numbers: numbers })
+    producer.send_frame('load-numbers', duration: 3, args: { numbers: numbers })
     numbers.sort!
-    producer.send('sort-numbers', duration: 3, args: { numbers: numbers })
+    producer.send_frame('sort-numbers', duration: 3, args: { numbers: numbers })
     low = 0
     high = numbers.length - 1
     while low < high
       sum = numbers[low] + numbers[high]
       if sum == 1000
-        producer.send('found-pair', duration: 5, args: { low: low, high: high, sum: sum })
+        producer.send_frame('found-pair', duration: 5, args: { low: low, high: high, sum: sum })
         return
       elsif sum < 1000
-        producer.send('too-low', args: { low: low, high: high, sum: sum })
+        producer.send_frame('too-low', args: { low: low, high: high, sum: sum })
         low += 1
       else
-        producer.send('too-high', args: { low: low, high: high, sum: sum })
+        producer.send_frame('too-high', args: { low: low, high: high, sum: sum })
         high -= 1
       end
     end
-    producer.send('no-solution', duration: 5)
+    producer.send_frame('no-solution', duration: 5)
   end
 end
 ```
@@ -116,7 +117,7 @@ To render the frame events sent by the driver, the application requires a templa
 
 A template is created with `WhirledPeas.template`, which yields a `Template` object and `TemplateSettings`. This template object is a `ComposableElement`, which allows for attaching child elements and setting layout options. `GridElement` and `BoxElement` are two other composable elements and `TextElement` is a simple element that can hold a text/number value and has layout options, but cannot have any child elements.
 
-A `ComposableElement` provides the following methods to add child elements
+A `ComposableElement` provides the following methods to add child elements, each of these takes an optional string argument that is set as the name of the element (which can be useful when debugging).
 
 - `add_box` - yields a `ComposableElement` and a `BoxSettings`, which will be added to the parent's children
 - `add_grid` - yields a `ComposableElement` and a `GridSettings`, which will be added to the parent's children
@@ -202,15 +203,16 @@ The available settigs are
 
 Margin and padding settings allow for setting the spacing on each of the 4 sides of the element independently. The set these values, use
 
+- `clear_margin` - sets all margin values to 0
 - `set_margin(left:, top:, right:, bottom:)`
+- `clear_padding` - sets all margin values to 0
 - `set_padding(left:, top:, right:, bottom:)`
 
-Any argument value not provided will result in that value being 0.
-
 ##### Border
 
 The border settings consist of 6 boolean values (border are either width 1 or not shown), the 4 obvious values (`left`, `top`, `right`, and `bottom`) along with 2 other values for inner borders (`inner_horiz` and `inner_vert`) in a grid. A border also has a foreground color (defaults to `:white`) and a style. The background color is determined by the `bg_color` of the element. Border values can be set with
 
+- `clear_border` - sets all border positions to `false`
 - `set_border(left:, top:, right:, bottom:, inner_horiz:, inner_vert:, color:, style:)`
 
 Available border styles are
@@ -309,7 +311,7 @@ class TemplateFactory
   def build(frame, args)
     set_state(frame, args)
     WhirledPeas.template do |t|
-      t.add_box(&method(:body))
+      t.add_box('Body', &method(:body))
     end
   end
 
@@ -317,10 +319,10 @@ class TemplateFactory
 
   def set_state(frame, args)
     @frame = frame
-    @numbers = args.key?('numbers') ? args['numbers'] || []
-    @sum = args['sum'] if args.key?('sum')
-    @low = args['low'] if args.key?('low')
-    @high = args['high'] if args.key?('high')
+    @numbers = args.key?(:numbers) ? args[:numbers] || []
+    @sum = args[:sum] if args.key?(:sum)
+    @low = args[:low] if args.key?(:low)
+    @high = args[:high] if args.key?(:high)
   end
 
   def title(_elem, settings)
@@ -347,9 +349,9 @@ class TemplateFactory
     settings.flow = :l2r
     settings.auto_margin = true
 
-    elem.add_box(&method(:title))
-    elem.add_box(&method(:sum))
-    elem.add_grid(&method(:number_grid))
+    elem.add_box('Title', &method(:title))
+    elem.add_box('Sum', &method(:sum))
+    elem.add_grid('NumberGrid', &method(:number_grid))
   end
 end
 ```

data/lib/whirled_peas.rb

@@ -7,13 +7,11 @@ require 'whirled_peas/version'
 module WhirledPeas
   class Error < StandardError; end
 
-  DEFAULT_HOST = 'localhost'
-  DEFAULT_PORT = 8765
   DEFAULT_REFRESH_RATE = 30
 
   LOGGER_ID = 'MAIN'
 
-  def self.start(driver, template_factory, log_level: Logger::INFO, refresh_rate: DEFAULT_REFRESH_RATE, host: DEFAULT_HOST, port: DEFAULT_PORT)
+  def self.start(driver, template_factory, log_level: Logger::INFO, refresh_rate: DEFAULT_REFRESH_RATE)
     logger = Logger.new(File.open('whirled_peas.log', 'a'))
     logger.level = log_level
     logger.formatter = proc do |severity, datetime, progname, msg|
@@ -23,27 +21,23 @@ module WhirledPeas
       "[#{severity}] #{datetime.strftime('%Y-%m-%dT%H:%M:%S.%L')} (#{progname}) - #{msg}\n"
     end
 
-    consumer = Frame::Consumer.new(template_factory, refresh_rate, logger)
-    consumer_thread = Thread.new do
+    event_loop = Frame::EventLoop.new(template_factory, refresh_rate, logger)
+    event_loop_thread = Thread.new do
       Thread.current.report_on_exception = false
-      consumer.start(host: host, port: port)
+      event_loop.start
     end
 
-    Frame::Producer.start(logger: logger, host: host, port: port) do |producer|
+    Frame::Producer.produce(event_loop: event_loop, logger: logger) do |producer|
       begin
         driver.start(producer)
-        producer.stop
-      rescue Errno::EPIPE
-        logger.error(LOGGER_ID) { 'Producer cannot connect to consumer, exiting...' }
       rescue => e
         logger.warn(LOGGER_ID) { 'Driver exited with error, terminating producer...' }
         logger.error(LOGGER_ID) { e }
-        producer.terminate
         raise
       end
     end
 
-    consumer_thread.join
+    event_loop_thread.join
   end
 
   def self.template(&block)

data/lib/whirled_peas/frame.rb

@@ -1,13 +1,10 @@
-require_relative 'frame/consumer'
+require_relative 'frame/event_loop'
 require_relative 'frame/producer'
 
 module WhirledPeas
   module Frame
     TERMINATE = '__term__'
     EOF = '__EOF__'
-
-    DEFAULT_ADDRESS = 'localhost'
-    DEFAULT_PORT = 8765
   end
 
   private_constant :Frame

data/lib/whirled_peas/frame/event_loop.rb

@@ -8,7 +8,7 @@ module WhirledPeas
         @logger = logger
       end
 
-      def enqueue(name, duration, args)
+      def enqueue(name:, duration:, args:)
         queue.push([name, duration, args])
       end
 
@@ -55,6 +55,5 @@ module WhirledPeas
 
       attr_reader :template_factory, :queue, :refresh_rate, :logger
     end
-    private_constant :EventLoop
   end
 end

data/lib/whirled_peas/frame/producer.rb

@@ -6,58 +6,45 @@ module WhirledPeas
     class Producer
       LOGGER_ID = 'PRODUCER'
 
-      def self.start(logger: NullLogger.new, host:, port:, &block)
-        server = TCPServer.new(host, port)
-        client = server.accept
-        logger.info(LOGGER_ID) { "Connected to #{host}:#{port}" }
-        producer = new(client, logger)
+      def self.produce(event_loop:, logger: NullLogger.new)
+        producer = new(event_loop, logger)
+        logger.info(LOGGER_ID) { 'Starting' }
         yield producer
+        logger.info(LOGGER_ID) { 'Done with yield' }
+        producer.send_frame(Frame::EOF)
         logger.info(LOGGER_ID) { 'Exited normally' }
       rescue => e
-        producer.terminate
+        producer.send_frame(Frame::TERMINATE)
         logger.warn(LOGGER_ID) { 'Exited with error' }
         logger.error(LOGGER_ID) { e }
         raise
-      ensure
-        if client
-          logger.info(LOGGER_ID) { 'Closing connection'}
-          client.close
-        end
       end
 
-      def initialize(client, logger=NullLogger.new)
-        @client = client
+      def initialize(event_loop, logger=NullLogger.new)
+        @event_loop = event_loop
         @logger = logger
         @queue = Queue.new
       end
 
-      def send(name, duration: nil, args: {})
-        client.puts(JSON.generate('name' => name, 'duration' => duration, **args))
+      def send_frame(name, duration: nil, args: {})
+        event_loop.enqueue(name: name, duration: duration, args: args)
         logger.debug(LOGGER_ID) { "Sending frame: #{name}" }
       end
 
-      def enqueue(name, duration: nil, args: {})
+      def enqueue_frame(name, duration: nil, args: {})
         queue.push([name, duration, args])
       end
 
       def flush
         while !queue.empty?
           name, duration, args = queue.pop
-          send(name, duration: duration, args: args)
+          send_frame(name: name, duration: duration, args: args)
         end
       end
 
-      def stop
-        send(Frame::EOF)
-      end
-
-      def terminate
-        send(Frame::TERMINATE)
-      end
-
       private
 
-      attr_reader :client, :logger, :queue
+      attr_reader :event_loop, :logger
     end
   end
 end

data/lib/whirled_peas/ui/ansi.rb

@@ -1,11 +1,17 @@
 module WhirledPeas
   module UI
-    DEBUG_COLOR = ARGV.include?('--debug-color')
-
+    # Helper module for working with ANSI escape codes. The most useful ANSI escape codes
+    # relate to text formatting.
+    #
+    # @see https://en.wikipedia.org/wiki/ANSI_escape_code
     module Ansi
+      ESC = "\033"
+
+      # Text formatting constants
       BOLD = 1
       UNDERLINE = 4
 
+      # Text and background color constants
       BLACK = 30
       RED = 31
       GREEN = 32
@@ -16,8 +22,26 @@ module WhirledPeas
       WHITE = 37
 
       END_FORMATTING = 0
+      private_constant :END_FORMATTING
 
       class << self
+        def cursor_pos(top: 0, left: 0)
+          "#{ESC}[#{top + 1};#{left + 1}H"
+        end
+
+        def cursor_visible(visible)
+          visible ? "#{ESC}[?25h" : "#{ESC}[?25l"
+        end
+
+        def clear_down
+          "#{ESC}[J"
+        end
+
+        # Format the string with the ANSI escapes codes for the given integer codes
+        #
+        # @param str [String] the string to format
+        # @param codes [Array<Integer>] the integer part of the ANSI escape code (see
+        #   constants in this module for codes and meanings)
         def format(str, codes)
           if str.empty? || codes.length == 0
             str
@@ -31,124 +55,49 @@ module WhirledPeas
           esc_seq(END_FORMATTING)
         end
 
-        def hidden_width(line)
-          return 0 if DEBUG_COLOR
-          width = 0
-          line.scan(/\033\[\d+m/).each { |f| width += f.length }
-          width
-        end
-
-        def close_formatting(line)
-          codes = line.scan(DEBUG_COLOR ? /<(\d+)>/ : /\033\[(\d+)m/)
+        # If the string has unclosed formatting, add the end formatting characters to
+        # the end of the string
+        def close_formatting(str)
+          codes = str.scan(/#{ESC}\[(\d+)m/)
           if codes.length > 0 && codes.last[0] != END_FORMATTING.to_s
-            "#{line}#{esc_seq(END_FORMATTING)}"
+            "#{str}#{esc_seq(END_FORMATTING)}"
           else
-            line
+            str
           end
         end
 
-        def first(str, num_visible_chars)
-          return str if str.length <= num_visible_chars + hidden_width(str)
-          result = ''
-          in_format = false
-          visible_len = 0
+        # Return a substring of the input string that preservse the formatting
+        #
+        # @param str [String] the (possibly formatted) string
+        # @param first_visible_character [Integer] the index of the first character to
+        #   include in the substring (ignoring all hidden formatting characters)
+        # @param num_visible_chars [Integer] the maximum number of visible characters to
+        #   include in the substring (ignoring all hidden formatting characters)
+        def substring(str, first_visible_character, num_visible_chars)
+          substr = ''
+          is_visible = true
+          visible_index = 0
+          substr_visible_len = 0
           str.chars.each do |char|
-            in_format = true if !in_format && char == "\033"
-            result += char
-            visible_len += 1 if !in_format
-            in_format = false if in_format && char == 'm'
-            break if visible_len == num_visible_chars
+            in_substring = (visible_index >= first_visible_character)
+            is_visible = false if is_visible && char == ESC
+            visible_index += 1 if is_visible
+            if !is_visible || in_substring
+              substr += char
+              substr_visible_len += 1 if is_visible
+            end
+            is_visible = true if !is_visible && char == 'm'
+            break if substr_visible_len == num_visible_chars
           end
-          close_formatting(result)
+          close_formatting(substr)
         end
 
         private
 
         def esc_seq(code)
-          DEBUG_COLOR ? "<#{code}>" : "\033[#{code}m"
-        end
-      end
-    end
-
-    class Color
-      BRIGHT_OFFSET = 60
-      private_constant :BRIGHT_OFFSET
-
-      def self.validate!(color)
-        return unless color
-        if color.is_a?(Symbol)
-          error_message = "Unsupported #{self.name.split('::').last}: #{color}"
-          match = color.to_s.match(/^(bright_)?(\w+)$/)
-          begin
-            color = self.const_get(match[2].upcase)
-            raise ArgumentError, error_message unless color.is_a?(Color)
-            if match[1]
-              raise ArgumentError, error_message if color.bright?
-              color.bright
-            else
-              color
-            end
-          rescue NameError
-            raise ArgumentError, error_message
-          end
-        else
-          color
+          "#{ESC}[#{code}m"
         end
       end
-
-      def initialize(code, bright=false)
-        @code = code
-        @bright = bright
-      end
-
-      def bright?
-        @bright
-      end
-
-      def bright
-        bright? ? self : self.class.new(@code + BRIGHT_OFFSET, true)
-      end
-
-      def to_s
-        @code.to_s
-      end
-
-      def inspect
-        "#{self.class.name.split('::').last}(code=#{@code}, bright=#{@bright})"
-      end
-    end
-    private_constant :Color
-
-    class BgColor < Color
-      BG_OFFSET = 10
-      private_constant :BG_OFFSET
-
-      BLACK = new(Ansi::BLACK + BG_OFFSET)
-      RED = new(Ansi::RED + BG_OFFSET)
-      GREEN = new(Ansi::GREEN + BG_OFFSET)
-      YELLOW = new(Ansi::YELLOW + BG_OFFSET)
-      BLUE = new(Ansi::BLUE + BG_OFFSET)
-      MAGENTA = new(Ansi::MAGENTA + BG_OFFSET)
-      CYAN = new(Ansi::CYAN + BG_OFFSET)
-      WHITE = new(Ansi::WHITE + BG_OFFSET)
-      GRAY = BLACK.bright
-    end
-
-    class TextColor < Color
-      BLACK = new(Ansi::BLACK)
-      RED = new(Ansi::RED)
-      GREEN = new(Ansi::GREEN)
-      YELLOW = new(Ansi::YELLOW)
-      BLUE = new(Ansi::BLUE)
-      MAGENTA = new(Ansi::MAGENTA)
-      CYAN = new(Ansi::CYAN)
-      WHITE = new(Ansi::WHITE)
-      GRAY = BLACK.bright
-    end
-
-    module TextFormat
-      BOLD = Ansi::BOLD
-      UNDERLINE = Ansi::UNDERLINE
     end
   end
 end

data/lib/whirled_peas/ui/canvas.rb

@@ -1,8 +1,39 @@
-require_relative 'stroke'
+require_relative 'ansi'
 
 module WhirledPeas
   module UI
+    # Canvas represent the area of the screen a painter can paint on.
     class Canvas
+      # A Stroke is a single line, formatted string of characters that is painted at
+      # a given position on a Canvas. This class is not meant to be instantiated
+      # directly. Instead, use Canvas#stroke to create a new Stroke.
+      class Stroke
+        attr_reader :left, :top, :chars
+
+        def initialize(left, top, chars)
+          @left = left
+          @top = top
+          @chars = chars
+        end
+
+        def hash
+          [left, top, chars].hash
+        end
+
+        def ==(other)
+          other.is_a?(self.class) && self.hash == other.hash
+        end
+
+        def inspect
+          "Stroke(left=#{left}, top=#{top}, chars=#{chars})"
+        end
+
+        alias_method :eq?, :==
+      end
+      private_constant :Stroke
+
+      EMPTY_STROKE = Stroke.new(nil, nil, nil)
+
       attr_reader :left, :top, :width, :height
 
       def initialize(left, top, width, height)
@@ -12,18 +43,20 @@ module WhirledPeas
         @height = height
       end
 
+      # Return a new Stroke instance, verifying only characters within the canvas
+      # are included in the stroke.
       def stroke(left, top, chars)
         if left >= self.left + self.width || left + chars.length <= self.left
-          Stroke::EMPTY
+          EMPTY_STROKE
         elsif top < self.top || top >= self.top + self.height
-          Stroke::EMPTY
+          EMPTY_STROKE
         else
           if left < self.left
             chars = chars[self.left - left..-1]
             left = self.left
           end
           num_chars = [self.left + self.width, left + chars.length].min - left
-          Stroke.new(left, top, Ansi.first(chars, num_chars))
+          Stroke.new(left, top, Ansi.substring(chars, 0, num_chars))
         end
       end
 

data/lib/whirled_peas/ui/color.rb

@@ -0,0 +1,101 @@
+require_relative 'ansi'
+
+module WhirledPeas
+  module UI
+    # An abstract class that encapsulates colors for a specific use case
+    class Color
+      # The ANSI codes for bright colors are offset by this much from their
+      # standard versions
+      BRIGHT_OFFSET = 60
+      private_constant :BRIGHT_OFFSET
+
+      # Validate the `color` argument is either (1) nil, (2) a valid Color constant in
+      # this class or (3) a symbol that maps to valid Color constant. E.g. if there
+      # is a RED constant in an implementing class, then :red or :bright_red are
+      # valid values for `color`
+      #
+      # @param color [Color|Symbol]
+      # @return [Color|Symbol] the value passed in if valid, otherwise an ArgumentError
+      #   is raised.
+      def self.validate!(color)
+        return unless color
+        if color.is_a?(Symbol)
+          error_message = "Unsupported #{self.name.split('::').last}: #{color.inspect}"
+          match = color.to_s.match(/^(bright_)?(\w+)$/)
+          begin
+            color = self.const_get(match[2].upcase)
+            raise ArgumentError, error_message unless color.is_a?(Color)
+            if match[1]
+              raise ArgumentError, error_message if color.bright?
+              color.bright
+            else
+              color
+            end
+          rescue NameError
+            raise ArgumentError, error_message
+          end
+        else
+          color
+        end
+      end
+
+      def initialize(code, bright=false)
+        @code = code
+        @bright = bright
+      end
+
+      def bright?
+        @bright
+      end
+
+      def bright
+        bright? ? self : self.class.new(@code + BRIGHT_OFFSET, true)
+      end
+
+      def hash
+        [@code, @bright].hash
+      end
+
+      def ==(other)
+        other.is_a?(self.class) && self.hash == other.hash
+      end
+      alias_method :eq?, :==
+
+      def to_s
+        @code.to_s
+      end
+
+      def inspect
+        "#{self.class.name.split('::').last}(code=#{@code}, bright=#{@bright})"
+      end
+    end
+    private_constant :Color
+
+    class BgColor < Color
+      BG_OFFSET = 10
+      private_constant :BG_OFFSET
+
+      BLACK = new(Ansi::BLACK + BG_OFFSET)
+      RED = new(Ansi::RED + BG_OFFSET)
+      GREEN = new(Ansi::GREEN + BG_OFFSET)
+      YELLOW = new(Ansi::YELLOW + BG_OFFSET)
+      BLUE = new(Ansi::BLUE + BG_OFFSET)
+      MAGENTA = new(Ansi::MAGENTA + BG_OFFSET)
+      CYAN = new(Ansi::CYAN + BG_OFFSET)
+      WHITE = new(Ansi::WHITE + BG_OFFSET)
+      GRAY = BLACK.bright
+    end
+
+    class TextColor < Color
+      BLACK = new(Ansi::BLACK)
+      RED = new(Ansi::RED)
+      GREEN = new(Ansi::GREEN)
+      YELLOW = new(Ansi::YELLOW)
+      BLUE = new(Ansi::BLUE)
+      MAGENTA = new(Ansi::MAGENTA)
+      CYAN = new(Ansi::CYAN)
+      WHITE = new(Ansi::WHITE)
+      GRAY = BLACK.bright
+    end
+  end
+end

data/lib/whirled_peas/ui/element.rb

@@ -205,7 +205,6 @@ module WhirledPeas
         @row_height
       end
 
-
       def preferred_width
         margin_width +
           outer_border_width +

data/lib/whirled_peas/ui/painter.rb

@@ -38,8 +38,8 @@ module WhirledPeas
 
       def justified
         format_settings = [*text.settings.color, *text.settings.bg_color]
-        format_settings << TextFormat::BOLD if text.settings.bold?
-        format_settings << TextFormat::UNDERLINE if text.settings.underline?
+        format_settings << Ansi::BOLD if text.settings.bold?
+        format_settings << Ansi::UNDERLINE if text.settings.underline?
 
         ljust = case text.settings.align
         when TextAlign::LEFT

data/lib/whirled_peas/ui/screen.rb

@@ -1,5 +1,4 @@
 require 'highline'
-require 'tty-cursor'
 
 require_relative 'ansi'
 require_relative 'painter'
@@ -10,7 +9,6 @@ module WhirledPeas
       def initialize(print_output=true)
         @print_output = print_output
         @terminal = HighLine.new.terminal
-        @cursor = TTY::Cursor
         @strokes = []
         refresh_size!
         Signal.trap('SIGWINCH', proc { self.refresh_size! })
@@ -26,10 +24,10 @@ module WhirledPeas
       end
 
       def refresh
-        strokes = [cursor.hide, cursor.move_to(0, 0), cursor.clear_screen_down]
+        strokes = [Ansi.cursor_visible(false), Ansi.cursor_pos, Ansi.clear_down]
         Painter.paint(@template, Canvas.new(0, 0, width, height)) do |stroke|
           unless stroke.chars.nil?
-            strokes << cursor.move_to(stroke.left, stroke.top)
+            strokes << Ansi.cursor_pos(left: stroke.left, top: stroke.top)
             strokes << stroke.chars
           end
         end
@@ -42,9 +40,9 @@ module WhirledPeas
 
       def finalize
         return unless @print_output
-        print UI::Ansi.clear
-        print cursor.move_to(0, height - 1)
-        print cursor.show
+        print Ansi.clear
+        print Ansi.cursor_pos(top: height - 1)
+        print Ansi.cursor_visible(true)
         STDOUT.flush
       end
 

data/lib/whirled_peas/ui/settings.rb

@@ -1,5 +1,7 @@
 require 'json'
 
+require_relative 'color'
+
 module WhirledPeas
   module UI
     module TextAlign
@@ -305,11 +307,11 @@ module WhirledPeas
     end
     private_constant :ElementSettings
 
-    module WidthSetting
+    module WidthSettings
       attr_accessor :width
     end
 
-    module AlignSetting
+    module AlignSettings
       def align
         @_align || TextAlign::LEFT
       end
@@ -322,7 +324,7 @@ module WhirledPeas
         merged = super
         merged._align = if @_align
           @_align
-        elsif parent.is_a?(AlignSetting)
+        elsif parent.is_a?(AlignSettings)
           parent._align
         end
         merged
@@ -453,8 +455,8 @@ module WhirledPeas
     end
 
     class TextSettings < ElementSettings
-      include WidthSetting
-      include AlignSetting
+      include WidthSettings
+      include AlignSettings
     end
 
     class ContainerSettings < ElementSettings
@@ -464,8 +466,8 @@ module WhirledPeas
     end
 
     class BoxSettings < ContainerSettings
-      include WidthSetting
-      include AlignSetting
+      include WidthSettings
+      include AlignSettings
 
       def flow=(flow)
         @_flow = DisplayFlow.validate!(flow)
@@ -507,8 +509,8 @@ module WhirledPeas
     end
 
     class GridSettings < ContainerSettings
-      include WidthSetting
-      include AlignSetting
+      include WidthSettings
+      include AlignSettings
 
       attr_accessor :num_cols
       attr_writer :transpose

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/whirled_peas.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'highline', '~> 2.0'
   spec.add_runtime_dependency 'json', '~> 2.5'
-  spec.add_runtime_dependency 'tty-cursor', '~> 0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whirled_peas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Collier
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: tty-cursor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 description: 
 email:
 - tcollier@gmail.com
@@ -72,18 +58,17 @@ files:
 - bin/setup
 - lib/whirled_peas.rb
 - lib/whirled_peas/frame.rb
-- lib/whirled_peas/frame/consumer.rb
 - lib/whirled_peas/frame/event_loop.rb
 - lib/whirled_peas/frame/producer.rb
 - lib/whirled_peas/null_logger.rb
 - lib/whirled_peas/ui.rb
 - lib/whirled_peas/ui/ansi.rb
 - lib/whirled_peas/ui/canvas.rb
+- lib/whirled_peas/ui/color.rb
 - lib/whirled_peas/ui/element.rb
 - lib/whirled_peas/ui/painter.rb
 - lib/whirled_peas/ui/screen.rb
 - lib/whirled_peas/ui/settings.rb
-- lib/whirled_peas/ui/stroke.rb
 - lib/whirled_peas/version.rb
 - sandbox/auto.rb
 - sandbox/box.rb

data/lib/whirled_peas/frame/consumer.rb

@@ -1,66 +0,0 @@
-require 'socket'
-require 'json'
-
-require_relative 'event_loop'
-
-module WhirledPeas
-  module Frame
-    class Consumer
-      LOGGER_ID = 'CONSUMER'
-
-      def initialize(template_factory, refresh_rate, logger=NullLogger.new)
-        @event_loop = EventLoop.new(template_factory, refresh_rate, logger)
-        @logger = logger
-        @running = false
-        @mutex = Mutex.new
-      end
-
-      def start(host:, port:)
-        mutex.synchronize { @running = true }
-        loop_thread = Thread.new do
-          Thread.current.report_on_exception = false
-          event_loop.start
-        end
-        socket = TCPSocket.new(host, port)
-        logger.info(LOGGER_ID) { "Connected to #{host}:#{port}" }
-        while @running && event_loop.running?
-          line = socket.gets
-          if line.nil?
-            sleep(0.001)
-            next
-          end
-          args = JSON.parse(line)
-          name = args.delete('name')
-          if [Frame::EOF, Frame::TERMINATE].include?(name)
-            logger.info(LOGGER_ID) { "Received #{name} event, stopping..." }
-            event_loop.stop if name == Frame::TERMINATE
-            @running = false
-          else
-            duration = args.delete('duration')
-            event_loop.enqueue(name, duration, args)
-          end
-        end
-        logger.info(LOGGER_ID) { 'Exited normally' }
-        logger.info(LOGGER_ID) { 'Waiting for loop thread to exit' }
-        loop_thread.join
-      rescue => e
-        event_loop.stop if event_loop.running?
-        logger.warn(LOGGER_ID) { 'Exited with error' }
-        logger.error(LOGGER_ID) { e }
-        raise
-      ensure
-        logger.info(LOGGER_ID) { 'Closing socket' }
-        socket.close if socket
-      end
-
-      def stop
-        logger.info(LOGGER_ID) { 'Stopping...' }
-        mutex.synchronize { @running = false }
-      end
-
-      private
-
-      attr_reader :event_loop, :logger, :mutex
-    end
-  end
-end

data/lib/whirled_peas/ui/stroke.rb

@@ -1,29 +0,0 @@
-module WhirledPeas
-  module UI
-    class Stroke
-      EMPTY = Stroke.new
-
-      attr_reader :left, :top, :chars
-
-      def initialize(left, top, chars)
-        @left = left
-        @top = top
-        @chars = chars
-      end
-
-      def hash
-        [left, top, chars].hash
-      end
-
-      def ==(other)
-        other.is_a?(self.class) && self.hash == other.hash
-      end
-
-      def inspect
-        "Stroke(left=#{left}, top=#{top}, chars=#{chars})"
-      end
-
-      alias_method :eql?, :==
-    end
-  end
-end