vedeu 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55b3f6827a2162d61c3ba3893197cee7990149d
-  data.tar.gz: 98cc092488b3d8b9982168d967339209736de888
+  metadata.gz: 5f3422a6093ab6c6c7cf502bc9cec28cb3834d84
+  data.tar.gz: c42685a3bdb1aa694e46665daccc70355e949ef3
 SHA512:
-  metadata.gz: 8bb473799314f117db0eb91f879954e319497e998dd561e173d53b5831706222eef7f6074543fe7516876bb813bc89e40d6dcc2b5a0624d86f8df497b1e84b91
-  data.tar.gz: 26f9a8f0072eee4c6639243de7eb2c57a8fa1a3807295cda06dc42f7d0338e53cd81bfe444e73dc13706565780990f695a1f842061650a340a310dbaf2c5bd36
+  metadata.gz: 548489372e87fd7001f8dd805d21d9328f345306c65e055a58f1a078aa0736267d5f467871f719d39c2de089b8c5e6004ec742010fc26fc2c803fbe71d4ebb08
+  data.tar.gz: 479d851256aa4961463fa0c7158e1b142c781fc529f29ea0075213aef661a9f6207a0abb4fce0fa50621af0aafff6deb90e7e686881313233e89489fd3b33f59

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .gemtags
 .tags
 .tags_sorted_by_file
+logs/vedeu.log

data/README.md

@@ -26,7 +26,7 @@ TODO: Write detailed documentation
 
     Application
       |-- Interfaces
-      |     |-- Dummy < Interface
+      |     |-- DummyInterface < Interface
       |
       |-- Terminal
 

data/lib/vedeu/application.rb

@@ -2,7 +2,7 @@ module Vedeu
   class Application
     class << self
       def start(options = {})
-        new(options).main_sequence
+        new(options).start
       end
     end
 
@@ -10,11 +10,11 @@ module Vedeu
       @options = options
     end
 
-    def main_sequence
+    def start
       Terminal.open(options) do
         Interfaces.initial_state
 
-        EventLoop.start
+        EventLoop.main_sequence
       end
     ensure
       Terminal.close

data/lib/vedeu/interface/{dummy.rb → dummy_interface.rb}

@@ -1,5 +1,5 @@
 module Vedeu
-  class Dummy < Interface
+  class DummyInterface < Interface
     def initial_state
     end
 

data/lib/vedeu/interface/interface.rb

@@ -4,6 +4,7 @@ module Vedeu
   class Interface
     def initialize(options = {})
       @options = options
+      @output  = []
     end
 
     def initial_state
@@ -11,11 +12,11 @@ module Vedeu
     end
 
     def input
-      evaluate
+      raise Collapse if evaluate == :stop
     end
 
-    def output(command)
-      Compositor.arrange(command, self)
+    def output
+      write
     end
 
     def geometry
@@ -27,13 +28,17 @@ module Vedeu
     attr_reader :options
 
     def evaluate
-      Commands.execute(read)
+      @output = Commands.execute(read)
     end
 
     def read
       Terminal.input
     end
 
+    def write
+      Compositor.arrange(@output, self)
+    end
+
     def options
       defaults.merge!(@options)
     end

data/lib/vedeu/interface/interfaces.rb

@@ -21,11 +21,19 @@ module Vedeu
       interfaces.inspect
     end
 
-    def add(name, options = {}, klass = Dummy)
+    def add(name, options = {}, klass = DummyInterface)
       interfaces[name] = klass.new(options) if valid?(klass)
       self
     end
 
+    def reset
+      @interfaces = {}
+    end
+
+    def find(name)
+      interfaces[name] || nil
+    end
+
     def initial_state
       interfaces.values.map { |io| io.initial_state }
     end
@@ -34,8 +42,8 @@ module Vedeu
       interfaces.values.map { |io| io.input }
     end
 
-    def output(stream)
-      interfaces.values.map { |io| io.output(stream) }
+    def output
+      interfaces.values.map { |io| io.output }
     end
 
     private

data/lib/vedeu/output/compositor.rb

@@ -1,14 +1,20 @@
 module Vedeu
   class Compositor
     class << self
-      def arrange(output = [], interface = Dummy)
+      def arrange(output = [], interface = :dummy)
         return if output.nil? || output.empty?
 
-        new(output, interface).arrange
+        if output.is_a?(Array)
+          new(output, interface).arrange
+        elsif output.is_a?(Hash)
+          output.map do |i, o|
+            new(o, i).arrange
+          end
+        end
       end
     end
 
-    def initialize(output = [], interface = Dummy)
+    def initialize(output = [], interface = :dummy)
       @output, @interface = output, interface
     end
 
@@ -18,14 +24,12 @@ module Vedeu
 
     private
 
-    attr_reader :interface
-
     def composition
       container = []
       streams = []
       output.map do |line|
         line.each_with_index do |stream, index|
-          streams << clear_line(index)
+          streams << clear(index)
           streams << Directive.enact(stream)
         end
         container << streams.join
@@ -34,16 +38,12 @@ module Vedeu
       container
     end
 
-    def clear_line(index)
-      [position(vy(index), vx), (' ' * width), position(vy(index), vx)].join
+    def clear(index)
+      [origin(index), (' ' * width), origin(index)].join
     end
 
-    def vx(index = 0)
-      geometry.vx(index)
-    end
-
-    def vy(index = 0)
-      geometry.vy(index)
+    def origin(index)
+      Position.set(geometry.vy(index), geometry.vx)
     end
 
     def width
@@ -51,16 +51,21 @@ module Vedeu
     end
 
     def geometry
-      interface.geometry
-    end
-
-    def position(y, x)
-      Position.set(y, x)
+      target_interface.geometry
     end
 
     def output
       return @output.split if @output.is_a?(String)
       @output
     end
+
+    def target_interface
+      raise UndefinedInterface if interface.nil?
+      interface
+    end
+
+    def interface
+      @_interface ||= Interfaces.defined.find(@interface)
+    end
   end
 end

data/lib/vedeu/process/commands.rb

@@ -29,7 +29,7 @@ module Vedeu
     end
 
     def commands
-      @commands ||= { :exit => Proc.new { Exit.dispatch } }
+      @commands ||= { "exit" => Proc.new { Exit.dispatch } }
     end
   end
 end

data/lib/vedeu/process/dummy_command.rb

@@ -0,0 +1,7 @@
+module Vedeu
+  class DummyCommand
+    def self.dispatch
+      'Dummy'
+    end
+  end
+end

data/lib/vedeu/process/event_loop.rb

@@ -1,8 +1,10 @@
 module Vedeu
+  class Collapse < StandardError; end
+
   class EventLoop
     class << self
-      def start
-        new.start
+      def main_sequence
+        new.main_sequence
       end
     end
 
@@ -10,22 +12,18 @@ module Vedeu
       @running = true
     end
 
-    def start
-      tick
+    def main_sequence
+      while @running do
+        Interfaces.defined.input
+
+        Interfaces.defined.output
+      end
+    rescue Collapse
+      stop
     end
 
     def stop
       @running = false
     end
-
-    def tick
-      while @running do
-        command = Interfaces.defined.input
-
-        stop if command == "stop"
-
-        Interfaces.defined.output(command)
-      end
-    end
   end
 end

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/vedeu.rb

@@ -1,3 +1,5 @@
+require 'date'
+require 'logger'
 require 'io/console'
 
 require_relative 'vedeu/support/terminal'
@@ -18,8 +20,9 @@ require_relative 'vedeu/output/wordwrap'
 
 require_relative 'vedeu/interface/interfaces'
 require_relative 'vedeu/interface/interface'
-require_relative 'vedeu/interface/dummy'
+require_relative 'vedeu/interface/dummy_interface'
 
+require_relative 'vedeu/process/dummy_command'
 require_relative 'vedeu/process/commands'
 require_relative 'vedeu/process/command'
 require_relative 'vedeu/process/event_loop'
@@ -27,3 +30,18 @@ require_relative 'vedeu/process/exit'
 
 require_relative 'vedeu/application'
 require_relative 'vedeu/version'
+
+module Vedeu
+  def self.logger
+    @logger ||= Logger
+      .new(root_path + '/logs/vedeu.log').tap do |log|
+      log.formatter = proc do |mode, time, prog, msg|
+        "\n#{time.iso8601}: #{msg}\n"
+      end
+    end
+  end
+
+  def self.root_path
+    File.expand_path('../..', __FILE__)
+  end
+end

data/test/lib/vedeu/application_test.rb

@@ -14,7 +14,7 @@ module Vedeu
       before do
         Terminal.stubs(:open).yields(self)
         Interfaces.stubs(:initial_state)
-        EventLoop.stubs(:start)
+        EventLoop.stubs(:main_sequence)
         Terminal.stubs(:close)
       end
 

data/test/lib/vedeu/interface/dummy_test.rb

@@ -1,8 +1,8 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  describe Dummy do
-    let(:described_class)    { Dummy }
+  describe DummyInterface do
+    let(:described_class)    { DummyInterface }
     let(:described_instance) { described_class.new }
 
     describe '#initial_state' do

data/test/lib/vedeu/interface/interface_test.rb

@@ -18,15 +18,15 @@ module Vedeu
       let(:subject) { described_instance.input }
 
       before do
-        Terminal.stubs(:input).returns('some input')
-        Commands.stubs(:execute).returns('some output')
+        Terminal.stubs(:input).returns('stop')
+        Commands.stubs(:execute)
       end
 
-      it { subject.must_be_instance_of(String) }
+      it { subject.must_be_instance_of(NilClass) }
     end
 
     describe '#output' do
-      let(:subject) { described_instance.output(command) }
+      let(:subject) { described_instance.output }
       let(:command) { mock }
 
       before { Compositor.stubs(:arrange).returns([]) }

data/test/lib/vedeu/interface/interfaces_test.rb

@@ -1,12 +1,6 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  class DummyInterface < Interface
-    def initial_state; end
-
-    def event_loop; end
-  end
-
   describe Interfaces do
     let(:described_class) { Interfaces }
 
@@ -42,6 +36,12 @@ module Vedeu
       end
     end
 
+    describe '.list' do
+      let(:subject) { described_class.list }
+
+      it { subject.must_be_instance_of(String) }
+    end
+
     describe '.add' do
       let(:subject)   { described_class.add(interface, options, klass) }
       let(:interface) {}
@@ -57,10 +57,32 @@ module Vedeu
       end
     end
 
-    describe '.list' do
-      let(:subject) { described_class.list }
+    describe '.reset' do
+      let(:subject) { described_class.reset }
+      let(:interface) { :dummy }
 
-      it { subject.must_be_instance_of(String) }
+      before { described_class.add(:dummy) }
+
+      it { subject.must_be_instance_of(Hash) }
+
+      it { subject.must_be_empty }
+    end
+
+    describe '.find' do
+      let(:subject)   { described_class.find(interface) }
+      let(:interface) { :dummy }
+
+      context 'when the interface exists' do
+        before { described_class.add(:dummy) }
+
+        it { subject.must_be_instance_of(DummyInterface) }
+      end
+
+      context 'when the interface does not exist' do
+        before { described_class.reset }
+
+        it { subject.must_be_instance_of(NilClass) }
+      end
     end
 
     describe '.initial_state' do
@@ -68,5 +90,19 @@ module Vedeu
 
       it { subject.must_be_instance_of(Array) }
     end
+
+    describe '.input' do
+      let(:subject) { described_class.input }
+
+      before { Terminal.stubs(:input).returns("some input") }
+
+      it { subject.must_be_instance_of(Array) }
+    end
+
+    describe '.output' do
+      let(:subject) { described_class.output }
+
+      it { subject.must_be_instance_of(Array) }
+    end
   end
 end

data/test/lib/vedeu/output/compositor_test.rb

@@ -3,7 +3,7 @@ require_relative '../../../test_helper'
 module Vedeu
   describe Compositor do
     let(:described_class)    { Compositor }
-    let(:described_instance) { described_class.new(output, interface) }
+    let(:described_instance) { described_class.new(output) }
     let(:output)             { [[]] }
     let(:stream)             {}
     let(:interface)          {
@@ -18,6 +18,7 @@ module Vedeu
     }
 
     before do
+      Interfaces.defined
       Terminal.stubs(:output)
       Renderer.stubs(:write).returns(stream)
     end
@@ -25,7 +26,7 @@ module Vedeu
     it { described_instance.must_be_instance_of(Compositor) }
 
     describe '.arrange' do
-      let(:subject) { described_class.arrange(output, interface) }
+      let(:subject) { described_class.arrange(output) }
 
       context 'when empty' do
         let(:output) { [] }

data/test/lib/vedeu/process/command_test.rb

@@ -1,12 +1,6 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  class DummyCommand
-    class << self
-      def dispatch; end
-    end
-  end
-
   describe Command do
     let(:described_class)    { Command }
     let(:described_instance) { described_class.new(cmd_name, cmd_klass, cmd_args, cmd_options) }

data/test/lib/vedeu/process/commands_test.rb

@@ -1,12 +1,6 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  class DummyCommand
-    def self.dispatch
-      :noop
-    end
-  end
-
   describe Commands do
     let(:described_class) { Commands }
 
@@ -35,7 +29,7 @@ module Vedeu
       end
 
       context 'when the command exists' do
-        let(:command) { :exit }
+        let(:command) { "exit" }
 
         before { Exit.stubs(:dispatch).returns(true) }
 
@@ -51,7 +45,7 @@ module Vedeu
 
     describe '.add' do
       let(:subject) { described_class.add(command_name, command_klass, args, options) }
-      let(:command_name)  { :some_name }
+      let(:command_name)  { "some_name" }
       let(:command_klass) { DummyCommand }
       let(:args)          { [] }
       let(:options)       { {} }

data/test/lib/vedeu/process/dummy_command_test.rb

@@ -0,0 +1,16 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe DummyCommand do
+    let(:described_class) { DummyCommand }
+    let(:subject) { described_class.new }
+
+    it { subject.must_be_instance_of(DummyCommand) }
+
+    describe '.dispatch' do
+      let(:subject) { described_class.dispatch }
+
+      it { subject.must_be_instance_of(String) }
+    end
+  end
+end

data/test/lib/vedeu/process/event_loop_test.rb

@@ -3,7 +3,8 @@ require_relative '../../../test_helper'
 module Vedeu
   describe EventLoop do
     let(:described_class) { EventLoop }
-    let(:defined) { mock }
+    let(:defined)         { mock }
+    let(:subject)         { described_class.new }
 
     before do
       Interfaces.stubs(:defined).returns(defined)
@@ -11,10 +12,12 @@ module Vedeu
       defined.stubs(:output).returns(NilClass)
     end
 
-    describe '.start' do
-      let(:subject) { described_class.start }
+    it { subject.must_be_instance_of(EventLoop) }
 
-      it { subject.must_be_instance_of(NilClass) }
+    describe '.main_sequence' do
+      let(:subject) { described_class.main_sequence }
+
+      # it { subject.must_be_instance_of(NilClass) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,12 +152,9 @@ files:
 - README.md
 - Rakefile
 - bin/vedeu
-- examples/3_interfaces
-- examples/3_lines
-- examples/composition
 - lib/vedeu.rb
 - lib/vedeu/application.rb
-- lib/vedeu/interface/dummy.rb
+- lib/vedeu/interface/dummy_interface.rb
 - lib/vedeu/interface/interface.rb
 - lib/vedeu/interface/interfaces.rb
 - lib/vedeu/output/background.rb
@@ -175,6 +172,7 @@ files:
 - lib/vedeu/output/wordwrap.rb
 - lib/vedeu/process/command.rb
 - lib/vedeu/process/commands.rb
+- lib/vedeu/process/dummy_command.rb
 - lib/vedeu/process/event_loop.rb
 - lib/vedeu/process/exit.rb
 - lib/vedeu/support/terminal.rb
@@ -198,6 +196,7 @@ files:
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
+- test/lib/vedeu/process/dummy_command_test.rb
 - test/lib/vedeu/process/event_loop_test.rb
 - test/lib/vedeu/process/exit_test.rb
 - test/lib/vedeu/support/terminal_test.rb
@@ -248,6 +247,7 @@ test_files:
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
+- test/lib/vedeu/process/dummy_command_test.rb
 - test/lib/vedeu/process/event_loop_test.rb
 - test/lib/vedeu/process/exit_test.rb
 - test/lib/vedeu/support/terminal_test.rb

data/examples/3_interfaces

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
--> { its -> { a } }
-trap('INT') { exit! }
-
-require 'vedeu'
-print Vedeu::Esc.clear
-
-geometry = {
-  geometry: {
-    y: 2,
-    x: 2,
-    width: 20,
-    height: 10
-  }
-}
-interface = Vedeu::Interface.new(geometry)
-Vedeu::Renderer.new(interface).clear_interface_rows
-
-geometry = {
-  geometry: {
-    y: 2,
-    x: 23,
-    width: 20,
-    height: 10
-  }
-}
-interface = Vedeu::Interface.new(geometry)
-Vedeu::Renderer.new(interface).clear_interface_rows
-
-geometry = {
-  geometry: {
-    y: 2,
-    x: 44,
-    width: 20,
-    height: 10
-  }
-}
-interface = Vedeu::Interface.new(geometry)
-Vedeu::Renderer.new(interface).clear_interface_rows
-
-print Vedeu::Esc.reset
-print Vedeu::Position.reset

data/examples/3_lines

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
--> { its -> { a } }
-trap('INT') { exit! }
-
-require 'vedeu'
-print Vedeu::Esc.clear
-
-geometry = {
-  geometry: {
-    y: 2,
-    x: 2,
-    width: 20,
-    height: 10
-  }
-}
-interface = Vedeu::Interface.new(geometry)
-
-Vedeu::Renderer.new(interface).write
-
-print Vedeu::Esc.reset
-print Vedeu::Position.reset

data/examples/composition

@@ -1,52 +0,0 @@
-#!/usr/bin/env ruby
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
--> { its -> { a } }
-trap('INT') { exit! }
-
-require 'vedeu'
-
-# stream = [
-#   [
-#     [
-#       [],
-#       'Lorem ipsum dolor sit amet, consectetur adipiscing'
-#     ],[
-#       [],
-#       'elit. Cras sed ipsum ut purus imperdiet molestie'
-#     ],[
-#       [],
-#       'in id neque. Sed auctor venenatis ultrices. Morbi'
-#     ],[
-#       [],
-#       'ullamcorper libero et euismod malesuada. Aliquam'
-#     ],[
-#       [],
-#       'dignissim metus eget tellus condimentum, ac dictum'
-#     ],[
-#       [],
-#       'enim posuere. Curabitur posuere arcu elementum'
-#     ],[
-#       [],
-#       'rutrum pulvinar. Nullam et dui eu lectus'
-#     ],[
-#       [],
-#       'sollicitudin hendrerit eu at nibh. Cum sociis.'
-#     ]
-#   ]
-# ]
-
-stream = [
-  [
-    [[:underline, "test1"],
-    [[[:red, :black]], "test2"],
-    [[], "test3"]
-  ]
-]
-
-geometry  = { geometry: { y: 0, x: 0, width: 50, height: 15 } }
-interface = Vedeu::Interface.new(geometry)
-
-Vedeu::Compositor.write(stream, interface)
-
-print "\n"