vedeu 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466d28a16f573a911f2e5c83cfd109dcb261399e
-  data.tar.gz: 701bcb2687c4b2d80562c8be9e44e3c3e1c16088
+  metadata.gz: a2bb1e7b3e6b2af51afa6ca62e74793542fc45ed
+  data.tar.gz: ea682085e35d4ff848ac4d91a7984e52c03306ba
 SHA512:
-  metadata.gz: a38d99aa14a7b147c493571f01b0c699f122d50cc94b2e1cacb365a0159109f4688ca2b200ed349d89b74edac751e043b7e5a3b195cbd0961fd457c0ba541acc
-  data.tar.gz: 6592f6616ddaa92c8e004bfab81a77e673838a69e1614244f868d93c26e890685adf265c27cf7b5e2f4d14fb1cc512b697181a10d45977d513363fb5627871d0
+  metadata.gz: b1578296de167f5b21d80e206c35e7cef51fa3ec9a0962ce1d1c0a363c683a6513cd9f3d060d0744709ea4ed182c8c12f8b7e5bb3a924f21df9137b253f1fb19
+  data.tar.gz: 215e9dd91bd325aae7d951d59a7a5687eedb569789bed8a05b8cad748f32c373da8f6b2d23865026191099f3eebaa3a1d4525391f81013da8232de91b374fc77

data/README.md

@@ -50,11 +50,7 @@ TODO: Write detailed documentation
             |           |
             |           |-- InterfaceRepository
             |           |-- Position
-            |           |     |-- Esc
-            |           |
-            |           |-- Renderer
-            |                 |-- Terminal
-            |                 |-- Queue
+            |                 |-- Esc
             |
             |-- InterfaceRepository
             |-- Terminal

data/lib/vedeu.rb

@@ -2,6 +2,11 @@ require 'date'
 require 'logger'
 require 'io/console'
 
+require_relative 'vedeu/input/input'
+
+require_relative 'vedeu/support/event_loop'
+require_relative 'vedeu/support/exit'
+require_relative 'vedeu/support/queue'
 require_relative 'vedeu/support/terminal'
 
 require_relative 'vedeu/output/base'
@@ -14,18 +19,13 @@ require_relative 'vedeu/output/foreground'
 require_relative 'vedeu/output/geometry'
 require_relative 'vedeu/output/esc'
 require_relative 'vedeu/output/colour'
+require_relative 'vedeu/output/output'
 require_relative 'vedeu/output/position'
-require_relative 'vedeu/output/renderer'
 require_relative 'vedeu/output/style'
 require_relative 'vedeu/output/translator'
 require_relative 'vedeu/output/wordwrap'
 
-require_relative 'vedeu/process/event_loop'
-require_relative 'vedeu/process/exit'
-require_relative 'vedeu/process/input'
-require_relative 'vedeu/process/output'
 require_relative 'vedeu/process/process'
-require_relative 'vedeu/process/queue'
 
 require_relative 'vedeu/repository/repository'
 require_relative 'vedeu/repository/command_repository'

data/lib/vedeu/application.rb

@@ -12,7 +12,7 @@ module Vedeu
 
     def start
       Terminal.open(options) do
-        InterfaceRepository.initial_state
+        Output.render
 
         EventLoop.main_sequence
       end

data/lib/vedeu/output/background.rb

@@ -2,8 +2,12 @@ module Vedeu
   class Background < Base
     private
 
-    def prefix
-      named? ? '48;2;' : '48;5;'
+    def custom
+      '48;5;'
+    end
+
+    def normal
+      '48;2;'
     end
 
     def codes

data/lib/vedeu/output/base.rb

@@ -18,6 +18,10 @@ module Vedeu
 
     attr_reader :colour
 
+    def prefix
+      named? || default? ? normal : custom
+    end
+
     def code
       no_colour || named || html || default
     end
@@ -26,6 +30,10 @@ module Vedeu
       default unless colour
     end
 
+    def default?
+      colour.nil? || colour == :default
+    end
+
     def named
       codes[colour] || codes[:default] if named?
     end

data/lib/vedeu/output/compositor.rb

@@ -20,7 +20,7 @@ module Vedeu
     end
 
     def arrange
-      Renderer.write(composition)
+      interface.enqueue(composition)
     end
 
     private

data/lib/vedeu/output/cursor.rb

@@ -1,57 +1,53 @@
 module Vedeu
-  class Cursor
-    class << self
-      def show
-        [esc, '?25h'].join
-      end
-
-      def hide
-        [esc, '?25l'].join
-      end
-
-      def home
-        [esc, 'H'].join
-      end
-
-      def up(count = 1)
-        [esc, "#{count || 1}", 'A'].join
-      end
-
-      def down(count = 1)
-        [esc, "#{count || 1}", 'B'].join
-      end
-
-      def right(count = 1)
-        [esc, "#{count || 1}", 'C'].join
-      end
-      alias_method :forward, :right
-
-      def left(count = 1)
-        [esc, "#{count || 1}", 'D'].join
-      end
-      alias_method :backward, :left
-
-      def save
-        [esc, 's'].join
-      end
-
-      def unsave
-        [esc, 'u'].join
-      end
-      alias_method :restore, :unsave
-
-      def save_all
-        [esc, '7'].join
-      end
-
-      def unsave_all
-        [esc, '8'].join
-      end
-      alias_method :restore_all, :unsave_all
-
-      def esc
-        [27.chr, '['].join
-      end
+  module Cursor
+    extend self
+
+    def show
+      [Esc.esc, '?25h'].join
+    end
+
+    def hide
+      [Esc.esc, '?25l'].join
+    end
+
+    def home
+      [Esc.esc, 'H'].join
+    end
+
+    def up(count = 1)
+      [Esc.esc, "#{count || 1}", 'A'].join
+    end
+
+    def down(count = 1)
+      [Esc.esc, "#{count || 1}", 'B'].join
+    end
+
+    def right(count = 1)
+      [Esc.esc, "#{count || 1}", 'C'].join
+    end
+    alias_method :forward, :right
+
+    def left(count = 1)
+      [Esc.esc, "#{count || 1}", 'D'].join
+    end
+    alias_method :backward, :left
+
+    def save
+      [Esc.esc, 's'].join
+    end
+
+    def unsave
+      [Esc.esc, 'u'].join
+    end
+    alias_method :restore, :unsave
+
+    def save_all
+      [Esc.esc, '7'].join
+    end
+
+    def unsave_all
+      [Esc.esc, '8'].join
     end
+    alias_method :restore_all, :unsave_all
   end
 end

data/lib/vedeu/output/esc.rb

@@ -1,44 +1,44 @@
 module Vedeu
-  class Esc
-    class << self
-      def blink
-        [esc, '5m'].join
-      end
-
-      def bold
-        [esc, '1m'].join
-      end
-      alias_method :bright, :bold
-
-      def clear
-        [esc, '2J'].join
-      end
-
-      def clear_line
-        [esc, '2K'].join
-      end
-
-      def esc
-        [27.chr, '['].join
-      end
-
-      def inverse
-        [esc, '7m'].join
-      end
-      alias_method :reverse, :inverse
-
-      def normal
-        [esc, '2m'].join
-      end
-      alias_method :dim, :normal
-
-      def reset
-        [esc, '0m'].join
-      end
-
-      def underline
-        [esc, '4m'].join
-      end
+  module Esc
+    extend self
+
+    def blink
+      [esc, '5m'].join
+    end
+
+    def bold
+      [esc, '1m'].join
+    end
+    alias_method :bright, :bold
+
+    def clear
+      [esc, '2J'].join
+    end
+
+    def clear_line
+      [esc, '2K'].join
+    end
+
+    def esc
+      [27.chr, '['].join
+    end
+
+    def inverse
+      [esc, '7m'].join
+    end
+    alias_method :reverse, :inverse
+
+    def normal
+      [esc, '2m'].join
+    end
+    alias_method :dim, :normal
+
+    def reset
+      [esc, '0m'].join
+    end
+
+    def underline
+      [esc, '4m'].join
     end
   end
 end

data/lib/vedeu/output/foreground.rb

@@ -2,8 +2,12 @@ module Vedeu
   class Foreground < Base
     private
 
-    def prefix
-      named? ? '38;2;' : '38;5;'
+    def custom
+      '38;5;'
+    end
+
+    def normal
+      '38;2;'
     end
 
     def codes

data/lib/vedeu/output/output.rb

@@ -0,0 +1,19 @@
+module Vedeu
+  class Output
+    class << self
+      def render
+        new.render
+      end
+    end
+
+    def initialize; end
+
+    def render
+      InterfaceRepository.update.map do |interface|
+        interface.map do |stream|
+          Terminal.output(stream) unless stream.nil?
+        end
+      end
+    end
+  end
+end

data/lib/vedeu/process/process.rb

@@ -11,7 +11,7 @@ module Vedeu
     def evaluate
       raise Collapse if result == :stop
 
-      Queue.enqueue(result) unless no_result?
+      Compositor.arrange(result) unless no_result?
     end
 
     private

data/lib/vedeu/repository/interface.rb

@@ -1,5 +1,7 @@
 module Vedeu
   class Interface
+    include Queue
+
     attr_accessor :id, :attributes, :active, :name
 
     class << self
@@ -19,16 +21,17 @@ module Vedeu
     def create
       InterfaceRepository.create(self)
 
-      InterfaceRepository.activate(self.name)
+      Compositor.arrange(initial_state)
 
       self
     end
 
-    def initial_state
-      Compositor.arrange([Array.new(geometry.height) { '' }], name)
-    end
-
     def update
+      if enqueued?
+        dequeue
+      else
+        [cursor, colour.reset, geometry.origin]
+      end
     end
 
     def geometry
@@ -45,6 +48,10 @@ module Vedeu
 
     private
 
+    def initial_state
+      { name => [Array.new(geometry.height) { '' }] }
+    end
+
     def foreground
       attributes[:fg] || attributes[:foreground]
     end

data/lib/vedeu/repository/interface_repository.rb

@@ -3,11 +3,15 @@ module Vedeu
     extend Repository
 
     class << self
-      def activate(name)
+      def create(*args)
+        activate(super)
+      end
+
+      def activate(interface)
         deactivate
 
-        all.map do |interface|
-          interface.active = true if interface.name == name
+        all.map do |stored|
+          stored.active = true if stored == interface
         end
       end
 
@@ -27,12 +31,8 @@ module Vedeu
         interface
       end
 
-      def initial_state
-        all.map { |interface| interface.initial_state }
-      end
-
       def update
-        all.map { |interface| interface.update }
+        all.map { |interface| interface.update }.compact
       end
 
       def klass

data/lib/vedeu/{process → support}/queue.rb

@@ -11,6 +11,10 @@ module Vedeu
       store
     end
 
+    def enqueued?
+      store.size > 0
+    end
+
     def size
       store.size
     end