whirled_peas 0.9.1 → 0.13.0

data/lib/whirled_peas/settings/graph_settings.rb

@@ -5,7 +5,7 @@ module WhirledPeas
   module Settings
     class GraphSettings < ElementSettings
       def axis_color
-        @_axis_color || color
+        @_axis_color || theme.axis_color
       end
 
       def axis_color=(color)

data/lib/whirled_peas/settings/position.rb

@@ -1,14 +1,26 @@
 module WhirledPeas
   module Settings
     class Position
-      attr_writer :left, :top
+      attr_reader :left, :top, :right, :bottom
 
-      def left
-        @left || 0
+      def left=(value)
+        @right = nil
+        @left = value
       end
 
-      def top
-        @top || 0
+      def top=(value)
+        @bottom = nil
+        @top = value
+      end
+
+      def right=(value)
+        @left = nil
+        @right = value
+      end
+
+      def bottom=(value)
+        @top = nil
+        @bottom = value
       end
     end
   end

data/lib/whirled_peas/settings/text_color.rb

@@ -1,5 +1,6 @@
 require 'whirled_peas/utils/ansi'
 
+require_relative 'bg_color'
 require_relative 'color'
 
 module WhirledPeas
@@ -16,6 +17,10 @@ module WhirledPeas
       GRAY = BLACK.bright
 
       DEFAULT = nil  # Use system defined default
+
+      def as_bg_color
+        BgColor.new(code + BgColor::BG_OFFSET, bright?)
+      end
     end
   end
 end

data/lib/whirled_peas/settings/text_settings.rb

@@ -8,6 +8,7 @@ module WhirledPeas
       attr_reader :title_font
 
       def title_font=(font)
+        font = theme.title_font if font == :theme
         @title_font = Utils::TitleFont.validate!(font)
       end
     end

data/lib/whirled_peas/settings/theme.rb

@@ -0,0 +1,61 @@
+require 'whirled_peas/utils/title_font'
+
+require_relative 'bg_color'
+require_relative 'border'
+require_relative 'text_color'
+
+module WhirledPeas
+  module Settings
+    class Theme
+      attr_reader :bg_color, :border_style, :color, :title_font
+
+      def axis_color=(value)
+        @axis_color = TextColor.validate!(value)
+      end
+
+      def axis_color
+        @axis_color || border_color
+      end
+
+      def bg_color=(value)
+        @bg_color = BgColor.validate!(value)
+      end
+
+      def border_color=(value)
+        @border_color = TextColor.validate!(value)
+      end
+
+      def border_color
+        @border_color || color
+      end
+
+      def border_style=(value)
+        @border_style = Border::Styles.validate!(value)
+      end
+
+      def color=(value)
+        @color = TextColor.validate!(value)
+      end
+
+      def highlight_bg_color=(value)
+        @highlight_bg_color = BgColor.validate!(value)
+      end
+
+      def highlight_bg_color
+        @highlight_bg_color || color.as_bg_color
+      end
+
+      def highlight_color=(value)
+        @highlight_color = TextColor.validate!(value)
+      end
+
+      def highlight_color
+        @highlight_color || bg_color.as_text_color
+      end
+
+      def title_font=(value)
+        @title_font = Utils::TitleFont.validate!(value)
+      end
+    end
+  end
+end

data/lib/whirled_peas/settings/theme_library.rb

@@ -0,0 +1,69 @@
+require 'yaml'
+
+require_relative 'theme'
+
+module WhirledPeas
+  module Settings
+    module ThemeLibrary
+      CONFIG_FILE = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'data', 'themes.yaml')
+
+      class << self
+        def theme_names
+          themes.keys
+        end
+
+        def add(name, theme)
+          themes[name] = theme
+        end
+
+        def get(name)
+          unless themes.key?(name)
+            expected = themes.keys.map(&:inspect).join(', ')
+            raise ArgumentError, "Unknown theme: #{name.inspect}, expecting one of #{expected}"
+          end
+          themes[name]
+        end
+
+        def default_name
+          themes.keys.first
+        end
+
+        private
+
+        def themes
+          return @themes if @themes
+          @themes = {}
+          config = YAML.load_file(CONFIG_FILE)
+          config.each do |name, settings|
+            name = name.to_sym
+            theme = Theme.new
+            settings.each do |key, value|
+              case key
+              when 'axis_color'
+                theme.axis_color = value
+              when 'bg_color'
+                theme.bg_color = value
+              when 'border_color'
+                theme.border_color = value
+              when 'border_style'
+                theme.border_style = value
+              when 'color'
+                theme.color = value
+              when 'highlight_bg_color'
+                theme.highlight_bg_color = value
+              when 'highlight_color'
+                theme.highlight_color = value
+              when 'title_font'
+                theme.title_font = value
+              else
+                raise ArgumentError, "Unexpected theme setting: #{key} in #{CONFIG_FILE}"
+              end
+            end
+            @themes[name] = theme
+          end
+          @themes
+        end
+      end
+    end
+  end
+end

data/lib/whirled_peas/utils/ansi.rb

@@ -33,15 +33,17 @@ module WhirledPeas
           unless width && height
             width, height = HighLine.new.terminal.terminal_size
           end
+          output.print cursor_visible(false)
+          output.flush
           yield width, height
         ensure
           output.print clear
-          output.print cursor_pos(top: height - 1)
+          output.print cursor_pos(left: 0, top: height - 1)
           output.print cursor_visible(true)
           output.flush
         end
 
-        def cursor_pos(top: 0, left: 0)
+        def cursor_pos(left:, top:)
           "#{ESC}[#{top + 1};#{left + 1}H"
         end
 

data/lib/whirled_peas/utils/file_handler.rb

@@ -1,16 +1,19 @@
 require 'base64'
 require 'zlib'
 
+require 'whirled_peas/device/rendered_frame'
+
 module WhirledPeas
   module Utils
     module FileHandler
       module FileWriter
         VERSION = '1'
 
-        def self.write(fp, renders)
-          fp.puts renders.count
-          renders.each do |strokes|
-            encoded = Base64.encode64(strokes)
+        def self.write(fp, rendered_frames)
+          fp.puts rendered_frames.count
+          rendered_frames.each do |rendered_frame|
+            fp.puts rendered_frame.duration
+            encoded = Base64.encode64(rendered_frame.strokes)
             fp.puts encoded.count("\n")
             fp.puts encoded
           end
@@ -20,10 +23,12 @@ module WhirledPeas
 
       class FileReaderV1
         def self.read(fp)
-          num_renders = Integer(fp.readline.chomp, 10)
-          num_renders.times.map do
+          num_frames = Integer(fp.readline.chomp, 10)
+          num_frames.times.map do
+            duration = Float(fp.readline.chomp)
             num_strokes = Integer(fp.readline.chomp, 10)
-            Base64.decode64(num_strokes.times.map { fp.readline }.join)
+            strokes = Base64.decode64(num_strokes.times.map { fp.readline }.join)
+            Device::RenderedFrame.new(strokes, duration)
           end
         end
 
@@ -38,10 +43,10 @@ module WhirledPeas
       }
       private_constant :READERS
 
-      def self.write(file, renders)
+      def self.write(file, rendered_frames)
         Zlib::GzipWriter.open(file, Zlib::BEST_COMPRESSION) do |gz|
           gz.puts FileWriter::VERSION
-          FileWriter.write(gz, renders)
+          FileWriter.write(gz, rendered_frames)
         end
       end
 

data/lib/whirled_peas/utils/formatted_string.rb

@@ -7,6 +7,8 @@ module WhirledPeas
         new('')
       end
 
+      attr_reader :formatting
+
       def initialize(raw, formatting=nil)
         @raw = raw
         @formatting = [*formatting]
@@ -16,8 +18,8 @@ module WhirledPeas
         raw.length
       end
 
-      def [](index_or_range)
-        self.class.new(raw[index_or_range], foramtting)
+      def each_char(&block)
+        raw.chars.each(&block)
       end
 
       def blank?
@@ -58,7 +60,7 @@ module WhirledPeas
 
       private
 
-      attr_reader :raw, :formatting
+      attr_reader :raw
     end
   end
 end

data/lib/whirled_peas/version.rb

@@ -1,3 +1,3 @@
 module WhirledPeas
-  VERSION = '0.9.1'
+  VERSION = '0.13.0'
 end

data/screen_test/components/list_with_active/l2r_position_end.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━┓                    ┃QRSTUVWXYZ┃                    ┃      ▄▄▄▄┃                    ┗━━━━━━━━━━┛                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    [?25h

data/screen_test/components/list_with_active/l2r_position_end.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.size - 1
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_position_middle.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━┓                    ┃HIJKLMNOPQ┃                    ┃  ▗▄▄▄▖   ┃                    ┗━━━━━━━━━━┛                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    [?25h

data/screen_test/components/list_with_active/l2r_position_middle.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.length / 2
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_position_start.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━┓                    ┃ABCDEFGHIJ┃                    ┃▄▄▄▄      ┃                    ┗━━━━━━━━━━┛                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    [?25h

data/screen_test/components/list_with_active/l2r_position_start.rb

@@ -0,0 +1,16 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = 0
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/l2r_separator.frame

@@ -0,0 +1 @@
+[?25l┏━━━━━━━━━━┓                    ┃L, M, N, O┃                    ┃    ▗▄    ┃                    ┗━━━━━━━━━━┛                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    [?25h

data/screen_test/components/list_with_active/l2r_separator.rb

@@ -0,0 +1,17 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.items = ITEMS
+        component.active_index = ITEMS.length / 2
+        component.viewport_size = 10
+        component.separator = ', '
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/t2b_position_end.frame

@@ -0,0 +1 @@
+[?25l┏━━┓                            ┃Q ┃                            ┃R ┃                            ┃S ┃                            ┃T ┃                            ┃U ┃                            ┃V ┃                            ┃W▐┃                            ┃X▐┃                            ┃Y▐┃                            ┃Z▐┃                            ┗━━┛                                                                                                                                                                                                                                                                                                                                                                                                                            [?25h

data/screen_test/components/list_with_active/t2b_position_end.rb

@@ -0,0 +1,17 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.flow = :t2b
+        component.items = ITEMS
+        component.active_index = ITEMS.size - 1
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/t2b_position_middle.frame

@@ -0,0 +1 @@
+[?25l┏━━┓                            ┃H ┃                            ┃I ┃                            ┃J▗┃                            ┃K▐┃                            ┃L▐┃                            ┃M▐┃                            ┃N▝┃                            ┃O ┃                            ┃P ┃                            ┃Q ┃                            ┗━━┛                                                                                                                                                                                                                                                                                                                                                                                                                            [?25h

data/screen_test/components/list_with_active/t2b_position_middle.rb

@@ -0,0 +1,17 @@
+require 'whirled_peas'
+require 'whirled_peas/component/list_with_active'
+
+class TemplateFactory
+  ITEMS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.chars
+
+  def build(*)
+    WhirledPeas.template(:test) do |composer, settings|
+      WhirledPeas.component(composer, settings, :list_with_active) do |component|
+        component.flow = :t2b
+        component.items = ITEMS
+        component.active_index = ITEMS.length / 2
+        component.viewport_size = 10
+      end
+    end
+  end
+end

data/screen_test/components/list_with_active/t2b_position_start.frame

@@ -0,0 +1 @@
+[?25l┏━━┓                            ┃A▐┃                            ┃B▐┃                            ┃C▐┃                            ┃D▐┃                            ┃E ┃                            ┃F ┃                            ┃G ┃                            ┃H ┃                            ┃I ┃                            ┃J ┃                            ┗━━┛                                                                                                                                                                                                                                                                                                                                                                                                                            [?25h