vedeu 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a6b5d80f3321da207ef185b7437f50b5e31aaaf
-  data.tar.gz: b6ca2fdd18c9912f54bfcf5629d293e9dd2e5468
+  metadata.gz: 7f1c1d57417fc05b09722865230c56b1ae0c255f
+  data.tar.gz: bc49bf53438c817107da4b3487f3f3c7d8d65e88
 SHA512:
-  metadata.gz: 6411a9e56a0eb82187442214a9fe95cbde95cdba99370e94888ce60f23dfa1383d9d966d9d3114fcf5e52f769044a6430e69ad7fd4f95d15f6dd13fb83700fe2
-  data.tar.gz: db041a47634fbe157be6f23c4ddb920a6b853aa1be20b4bb6528229e64bc3abdcd535deb9b0965ce3a8191c3673b089c8c94d9ecdf6a4b3d6526a8941676e2c9
+  metadata.gz: 64922d74b257a74850aa87cf2455ba58a368060b0d3316f2a14fd3d63b774aaf2017c3ffb11dcdd2934e5f0007661d2c7b252a933a5e1a32ddad7cf761a2a8eb
+  data.tar.gz: 5e3b0890b6121e88a5001e29b6cdf1541e2db0499bfe02f08fecc486bf9347956813394d5e5c7909e4453a0bb9e206a231272933d884afca2690e6a5bc9c1c88

data/README.md

@@ -38,17 +38,22 @@ Expect proper documentation soon!
     interface :main, {
                 y:          1,
                 x:          1,
+                z:          1,
                 width:      :auto, # will set to terminal width
                 height:     10,    # also accepts :auto
-                foreground: :white,
-                background: :black,
+                colour: {
+                  foreground: '#ffffff',
+                  background: '#000000'
+                },
                 cursor:     false,
-                layer:      0 }
+              }
 
 Referring to the above example, interfaces have a name, and various default attributes.
 
 `:y`          sets the starting row point. (See Geometry)
 `:x`          sets the starting column point.
+`:z`          an integer specifying the z-index of the interface.
+              (See Layers)
 `:width`      sets how many characters wide the interface will be.
 `:height`     sets how many characters tall the interface will be.
 
@@ -57,8 +62,6 @@ Referring to the above example, interfaces have a name, and various default attr
 
 `:cursor`     a boolean specifying whether the cursor should show.
 
-`:layer`      an integer specifying the z-index of the interface.
-              (See Layers)
 
 ### On Defining Commands
 
@@ -79,9 +82,7 @@ Geometry for Vedeu, as the same for ANSI terminals, is set top-left, which is po
 
 ### Colours
 
-Vedeu uses the standard ANSI terminal colours, though you can also set arbitrary colours using HTML/CSS style notation (i.e. '#aadd00').
-
-    :black, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :default
+Vedeu uses HTML/CSS style notation (i.e. '#aadd00').
 
 
 ### Layers
@@ -89,7 +90,7 @@ Vedeu uses the standard ANSI terminal colours, though you can also set arbitrary
 Vedeu allows the overlaying of interfaces. To render these correctly,
 Vedeu uses two rules.
 
-  1) The :layer value. 0 would be default, or bottom. 1 would be placed on top of 0. 2 on top of 1, and so on.
+  1) The :z value. 1 would be default, or bottom. 2 would be placed on top of 1. 3 on top of 2, and so on.
   2) If two interfaces occupy the same 'space', the interface which was defined last, wins.
 
 

data/Rakefile

@@ -1,11 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require 'cucumber'
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = "features --format progress"
-end
 
 Rake::TestTask.new(:minitest) do |t|
   t.libs << 'lib/vedeu'
@@ -15,7 +9,3 @@ Rake::TestTask.new(:minitest) do |t|
 end
 
 task default: :minitest
-
-Rake::Task['minitest'].execute
-
-Rake::Task['cucumber'].execute

data/bin/composition

@@ -11,4 +11,4 @@ require 'pry'
 
 json = File.read('../test/support/composition.json')
 hash = Yajl::Parser.parse(json)
-comp = Vedeu::Buffer::Composition.new(hash)
+comp = Vedeu::Composition.new(hash)

data/examples/single_interface_app.rb

@@ -8,12 +8,15 @@ class SingleInterfaceApp
   interface :main, {
               y:          1,
               x:          1,
+              z:          1,
               width:      :auto,
               height:     :auto,
-              foreground: :white,
-              background: :black,
-              cursor:     true,
-              layer:      0 }
+              colour: {
+                foreground: '#ffffff',
+                background: '#000000',
+              },
+              cursor:     true
+            }
 
   command   :refresh, {
               entity:    SingleInterfaceApp,

data/lib/vedeu.rb

@@ -1,59 +1,32 @@
 require 'date'
 require 'logger'
-require 'io/console'
-require 'oj'
-require 'optparse'
-require 'virtus'
 
-require_relative 'vedeu/input/input'
-
-require_relative 'vedeu/support/exit'
-require_relative 'vedeu/support/json_parser'
-require_relative 'vedeu/support/queue'
-require_relative 'vedeu/support/terminal'
-
-require_relative 'vedeu/output/buffer/style'
-require_relative 'vedeu/output/buffer/formatting'
-require_relative 'vedeu/output/buffer/stream'
-require_relative 'vedeu/output/buffer/line'
-require_relative 'vedeu/output/buffer/interface'
-require_relative 'vedeu/output/buffer/composition'
-
-require_relative 'vedeu/output/base'
-require_relative 'vedeu/output/background'
-require_relative 'vedeu/output/compositor'
-require_relative 'vedeu/output/cursor'
-require_relative 'vedeu/output/directive'
-require_relative 'vedeu/output/foreground'
-require_relative 'vedeu/output/geometry'
-require_relative 'vedeu/output/layer'
-require_relative 'vedeu/output/menu'
-require_relative 'vedeu/output/esc'
-require_relative 'vedeu/output/colour'
-require_relative 'vedeu/output/output'
-require_relative 'vedeu/output/position'
-require_relative 'vedeu/output/style'
-require_relative 'vedeu/output/translator'
-require_relative 'vedeu/output/wordwrap'
-
-require_relative 'vedeu/process/process'
-
-require_relative 'vedeu/repository/repository'
 require_relative 'vedeu/repository/command_repository'
-require_relative 'vedeu/repository/command'
 require_relative 'vedeu/repository/interface_repository'
-require_relative 'vedeu/repository/interface'
-require_relative 'vedeu/repository/storage'
-require_relative 'vedeu/repository/dummy_interface'
-require_relative 'vedeu/repository/dummy_command'
-
-require_relative 'vedeu/application'
-require_relative 'vedeu/configuration'
+require_relative 'vedeu/support/exit'
 require_relative 'vedeu/launcher'
 require_relative 'vedeu/version'
 
 module Vedeu
   # :nocov:
+  module ClassMethods
+    def command(name, options = {})
+      CommandRepository.create({ name: stringify_symbols(name) }
+                       .merge!(options))
+    end
+
+    def interface(name, options = {})
+      InterfaceRepository.create({ name: stringify_symbols(name) }
+                         .merge!(options))
+    end
+
+    private
+
+    def stringify_symbols(value)
+      value.is_a?(::Symbol) ? value.to_s : value
+    end
+  end
+
   def self.logger
     @logger ||= Logger.new(root_path + '/logs/vedeu.log').tap do |log|
       log.formatter = proc do |_, time, _, msg|
@@ -78,11 +51,9 @@ module Vedeu
   def self.included(receiver)
     receiver.extend(ClassMethods)
   end
-  # :nocov:
 
   private
 
-  # :nocov:
   def self.root_path
     File.expand_path('../..', __FILE__)
   end

data/lib/vedeu/application.rb

@@ -1,9 +1,12 @@
+require_relative 'input/input'
+require_relative 'output/output'
+require_relative 'process/process'
+require_relative 'support/terminal'
+
 module Vedeu
   class Application
-    class << self
-      def start(options = {})
-        new(options).start
-      end
+    def self.start(options = {})
+      new(options).start
     end
 
     def initialize(options = {})
@@ -11,13 +14,11 @@ module Vedeu
     end
 
     def start
-      Terminal.open(options) do
+      Terminal.open do
         Output.render
 
         runner { main_sequence }
       end
-    ensure
-      Terminal.close
     end
 
     private

data/lib/vedeu/configuration.rb

@@ -1,9 +1,9 @@
+require 'optparse'
+
 module Vedeu
   class Configuration
-    class << self
-      def configure(args = [])
-        new(args).configure
-      end
+    def self.configure(args = [])
+      new(args).configure
     end
 
     def initialize(args = [])

data/lib/vedeu/input/input.rb

@@ -1,3 +1,6 @@
+require_relative '../support/queue'
+require_relative '../support/terminal'
+
 module Vedeu
   module Input
     extend self

data/lib/vedeu/launcher.rb

@@ -1,3 +1,6 @@
+require_relative 'application'
+require_relative 'configuration'
+
 module Vedeu
   class Launcher
     def initialize(argv, stdin  = STDIN,

data/lib/vedeu/models/background.rb

@@ -0,0 +1,13 @@
+require 'virtus'
+
+require_relative '../support/esc'
+
+module Vedeu
+  class Background < Virtus::Attribute
+    def coerce(value)
+      return '' unless value
+
+      Esc.background_colour(value)
+    end
+  end
+end

data/lib/vedeu/models/coercions.rb

@@ -0,0 +1,21 @@
+module Vedeu
+  module Coercions
+    private
+
+    def multiple?(values)
+      values.is_a?(::Array)
+    end
+
+    def single?(values)
+      values.is_a?(::Hash)
+    end
+
+    def just_text?(values)
+      values.is_a?(::String)
+    end
+
+    def empty?(values)
+      values.nil? || values.empty?
+    end
+  end
+end

data/lib/vedeu/models/colour.rb

@@ -0,0 +1,22 @@
+require 'oj'
+require 'virtus'
+
+require_relative 'foreground'
+require_relative 'background'
+
+module Vedeu
+  class Colour
+    include Virtus.model
+
+    attribute :foreground, Foreground
+    attribute :background, Background
+
+    def to_json
+      Oj.dump(attributes, mode: :compat)
+    end
+
+    def to_s
+      foreground + background
+    end
+  end
+end

data/lib/vedeu/{repository → models}/command.rb

@@ -1,3 +1,5 @@
+require 'virtus'
+
 module Vedeu
   class Command
     include Virtus.model

data/lib/vedeu/models/composition.rb

@@ -0,0 +1,30 @@
+require 'oj'
+require 'virtus'
+
+require_relative 'interface_collection'
+
+module Vedeu
+  class Composition
+    include Virtus.model
+
+    attribute :interfaces, InterfaceCollection
+
+    def self.enqueue(composition)
+      new(composition).enqueue
+    end
+
+    def enqueue
+      interfaces.map do |interface|
+        interface.enqueue(interface.to_s)
+      end
+    end
+
+    def to_json
+      Oj.dump(attributes, mode: :compat)
+    end
+
+    def to_s
+      interfaces.map(&:to_s).join
+    end
+  end
+end

data/lib/vedeu/models/foreground.rb

@@ -0,0 +1,13 @@
+require 'virtus'
+
+require_relative '../support/esc'
+
+module Vedeu
+  class Foreground < Virtus::Attribute
+    def coerce(value)
+      return '' unless value
+
+      Esc.foreground_colour(value)
+    end
+  end
+end

data/lib/vedeu/models/interface.rb

@@ -0,0 +1,62 @@
+require 'virtus'
+
+require_relative 'presentation'
+require_relative 'line_collection'
+require_relative '../output/interface_renderer'
+require_relative '../support/esc'
+require_relative '../support/cursor'
+require_relative '../support/queue'
+require_relative '../support/terminal'
+
+module Vedeu
+  class Interface
+    include Virtus.model
+    include Presentation
+    include Vedeu::Queue
+
+    attribute :name,    String
+    attribute :lines,   LineCollection
+    attribute :y,       Integer, default: 1
+    attribute :x,       Integer, default: 1
+    attribute :z,       Integer, default: 1
+    attribute :width,   Integer, default: Terminal.width
+    attribute :height,  Integer, default: Terminal.height
+    attribute :current, String,  default: ''
+    attribute :cursor,  Boolean, default: true
+
+    def refresh
+      if enqueued?
+        current = dequeue
+
+      elsif no_content?
+        current = clear_interface
+
+      else
+        current
+
+      end
+    end
+
+    def to_json
+      Oj.dump(attributes, mode: :compat)
+    end
+
+    def to_s
+      clear_interface + render_content
+    end
+
+    private
+
+    def no_content?
+      current.nil? || current.empty?
+    end
+
+    def render_content
+      InterfaceRenderer.render(self)
+    end
+
+    def clear_interface
+      InterfaceRenderer.clear(self)
+    end
+  end
+end