vedeu 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5988a18730b25eaf5cf4d1d81eb2adc7dd5823ce
-  data.tar.gz: 607c8b139e80f23ae5f5c0af7cbd883d07c46358
+  metadata.gz: 9004c0f8249a525a00f5eb27c74e1d7c72be119f
+  data.tar.gz: de9a255d0e475877fadfe2c755a5f726d4bb1d80
 SHA512:
-  metadata.gz: 822d36a8a6d63c97b6525a5718dfa7216052d56fca170e5a07d3d8b90378afa3cf937792991aa78cd8126c5b39203ab14d323dacbe2de90729d708714a696a23
-  data.tar.gz: 51d17fa0372246e206f870fad75ac3c3075b14a7d996dd46c477190e8cacefd478ab5f40faf1c2699e8bd714d1a11e8a951844f0bf5ba3be1ddc81f4de5bc8b1
+  metadata.gz: 23dccec8e0aea41ba6a14ef913d38ed03107b114410ab72515c09df036f9aa380262a713a194738bc7a0eec9d6221f7761b44d1edc9f27838f83419dd54d490f
+  data.tar.gz: e10078ccce18521f6780ead1606ce58893ac724cbf029bdfe10a8a76cfd91c2dcd066603219950a5385a74f5dd5367507561ba4eb8fb54b37ee55ac777fd3ee2

data/lib/vedeu.rb

@@ -39,24 +39,6 @@ require_relative 'vedeu/launcher'
 require_relative 'vedeu/version'
 
 module Vedeu
-  module ClassMethods
-    def interface(name, geometry = {})
-      interface_name = name.is_a?(Symbol) ? name.to_s : name
-
-      Interface.create({ name: interface_name, geometry: geometry })
-    end
-
-    def command(name, klass, options = {})
-      command_name = name.is_a?(Symbol) ? name.to_s : name
-
-      Command.create({ name: command_name, klass: klass, options: options })
-    end
-  end
-
-  def self.included(receiver)
-    receiver.extend(ClassMethods)
-  end
-
   def self.logger
     @logger ||= Logger.new(root_path + '/logs/vedeu.log').tap do |log|
       log.formatter = proc do |mode, time, prog, msg|

data/lib/vedeu/output/colour.rb

@@ -7,6 +7,10 @@ module Vedeu
         new(pair).define
       end
       alias_method :set, :define
+
+      def reset
+        new.reset
+      end
     end
 
     def initialize(pair = [])
@@ -16,17 +20,24 @@ module Vedeu
     def define
       [foreground, background].join
     end
+    alias_method :set, :define
 
-    private
-
-    attr_reader :pair
+    def reset
+      [foreground(:default), background(:default)].join
+    end
 
-    def foreground
-      Foreground.escape_sequence(pair[0])
+    def foreground(value = pair[0])
+      @foreground ||= Foreground.escape_sequence(value)
     end
+    alias_method :fg, :foreground
 
-    def background
-      Background.escape_sequence(pair[1])
+    def background(value = pair[1])
+      @background ||= Background.escape_sequence(value)
     end
+    alias_method :bg, :background
+
+    private
+
+    attr_reader :pair
   end
 end

data/lib/vedeu/output/compositor.rb

@@ -29,8 +29,15 @@ module Vedeu
       container = []
       streams   = []
 
-      output.map do |line|
-        line.each_with_index do |stream, index|
+      container << colour.set
+
+      output.map do |lines|
+        if lines.size < geometry.height
+          remaining = geometry.height - lines.size
+          remaining.times { |i| lines << "" }
+        end
+
+        lines.each_with_index do |stream, index|
           streams << clear(index)
           streams << Directive.enact(stream)
         end
@@ -39,6 +46,8 @@ module Vedeu
         streams = []
       end
 
+      container << colour.reset
+
       container
     end
 
@@ -50,12 +59,20 @@ module Vedeu
       geometry.origin(index)
     end
 
+    def height
+      geometry.height
+    end
+
     def width
       geometry.width
     end
 
     def geometry
-      target_interface.geometry
+      interface.geometry
+    end
+
+    def colour
+      interface.colour
     end
 
     def output
@@ -63,11 +80,6 @@ module Vedeu
       @output
     end
 
-    def target_interface
-      raise UndefinedInterface if interface.nil?
-      interface
-    end
-
     def interface
       @_interface ||= InterfaceRepository.find_by_name(@interface)
     end

data/lib/vedeu/process/process.rb

@@ -17,17 +17,13 @@ module Vedeu
     private
 
     def result
-      @result ||= command.execute(*args) unless not_found?
+      @result ||= command.execute(*args) if command
     end
 
     def no_result?
       result.nil? || result.empty?
     end
 
-    def not_found?
-      command.nil?
-    end
-
     def command
       @command ||= find_by_keypress || find_by_keyword
     end

data/lib/vedeu/repository/command.rb

@@ -29,4 +29,16 @@ module Vedeu
       Proc.new { |*args| attributes[:klass].dispatch(*args) }
     end
   end
+
+  module ClassMethods
+    def command(name, klass, options = {})
+      command_name = name.is_a?(Symbol) ? name.to_s : name
+
+      Command.create({ name: command_name, klass: klass, options: options })
+    end
+  end
+
+  def self.included(receiver)
+    receiver.extend(ClassMethods)
+  end
 end

data/lib/vedeu/repository/command_repository.rb

@@ -4,11 +4,19 @@ module Vedeu
 
     class << self
       def by_keypress(input)
-        query(klass, :keypress, input)
+        command = query(klass, :keypress, input)
+
+        return nil if command.nil? || command.is_a?(Hash)
+
+        command
       end
 
       def by_keyword(input)
-        query(klass, :keyword, input)
+        command = query(klass, :keyword, input)
+
+        return nil if command.nil? || command.is_a?(Hash)
+
+        command
       end
 
       def klass

data/lib/vedeu/repository/dummy_command.rb

@@ -1,5 +1,7 @@
 module Vedeu
   class DummyCommand
+    attr_accessor :id
+
     def self.dispatch(value = :dummy)
       value || :dummy
     end

data/lib/vedeu/repository/dummy_interface.rb

@@ -1,3 +1,5 @@
 module Vedeu
-  class DummyInterface; end
+  class DummyInterface
+    attr_accessor :id
+  end
 end

data/lib/vedeu/repository/interface.rb

@@ -1,6 +1,6 @@
 module Vedeu
   class Interface
-    attr_accessor :id, :attributes, :active, :geometry, :name
+    attr_accessor :id, :attributes, :active, :name
 
     class << self
       def create(attributes = {})
@@ -12,7 +12,6 @@ module Vedeu
       @attributes = attributes || {}
 
       @active     = false
-      @geometry   = attributes[:geometry]
       @name       = attributes[:name]
     end
 
@@ -24,10 +23,38 @@ module Vedeu
       self
     end
 
-    def initial_state; end
+    def initial_state
+      Compositor.arrange([Array.new(geometry.height) { '' }], name)
+    end
 
     def geometry
-      Geometry.new(@geometry)
+      @geometry ||= Geometry.new(attributes)
+    end
+
+    def colour
+      @colour ||= Colour.new([foreground, background])
+    end
+
+    private
+
+    def foreground
+      attributes[:fg] || attributes[:foreground]
+    end
+
+    def background
+      attributes[:bg] || attributes[:background]
     end
   end
+
+  module ClassMethods
+    def interface(name, options = {})
+      interface_name = name.is_a?(Symbol) ? name.to_s : name
+
+      Interface.create({ name: interface_name }.merge!(options))
+    end
+  end
+
+  def self.included(receiver)
+    receiver.extend(ClassMethods)
+  end
 end

data/lib/vedeu/repository/interface_repository.rb

@@ -20,7 +20,11 @@ module Vedeu
       end
 
       def find_by_name(value)
-        query(klass, :name, value)
+        interface = query(klass, :name, value)
+
+        raise UndefinedInterface if interface.nil? || interface.is_a?(Hash)
+
+        interface
       end
 
       def initial_state

data/lib/vedeu/repository/storage.rb

@@ -20,7 +20,7 @@ module Vedeu
     end
 
     def find(klass, id)
-      map_for_class(klass).fetch(id)
+      map_for_class(klass).fetch(id, nil)
     end
 
     def all(klass)

data/lib/vedeu/support/terminal.rb

@@ -27,7 +27,10 @@ module Vedeu
 
       def close
         show_cursor
-        output(Position.set(height - 1, 1))
+
+        reset_colours
+
+        reset_position
       end
 
       def cooked(instance, &block)
@@ -58,8 +61,7 @@ module Vedeu
       end
 
       def clear_line(index)
-        output(Position.set(index, 0))
-        output(" " * width)
+        output(Position.set(index, 1) + (" " * width) + Position.set(index, 1))
       end
 
       def show_cursor
@@ -69,6 +71,14 @@ module Vedeu
       def hide_cursor
         output(Esc.hide_cursor)
       end
+
+      def reset_colours
+        output(Esc.reset)
+      end
+
+      def reset_position
+        clear_line(height - 1)
+      end
     end
 
     def initialize(options = {}, &block)

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/test/lib/vedeu/application_test.rb

@@ -6,7 +6,9 @@ module Vedeu
     let(:described_instance) { described_class.new(options) }
     let(:options)            { {} }
 
-    it { described_instance.must_be_instance_of(Application) }
+    it 'returns an Application instance' do
+      described_instance.must_be_instance_of(Application)
+    end
 
     describe '.start' do
       let(:subject) { described_class.start(options) }
@@ -18,7 +20,9 @@ module Vedeu
         Terminal.stubs(:close)
       end
 
-      it { subject.must_be_instance_of(NilClass) }
+      it 'returns a NilClass' do
+        subject.must_be_instance_of(NilClass)
+      end
     end
   end
 end

data/test/lib/vedeu/launcher_test.rb

@@ -8,7 +8,9 @@ module Vedeu
 
     before { Application.stubs(:start) }
 
-    it { described_instance.must_be_instance_of(Launcher) }
+    it 'returns a Launcher instance' do
+      described_instance.must_be_instance_of(Launcher)
+    end
 
     describe '#execute!' do
       let(:subject) { described_instance.execute! }

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

@@ -6,41 +6,61 @@ module Vedeu
     let(:described_instance) { described_class.new(colour) }
     let(:colour)             {}
 
-    it { described_instance.must_be_instance_of(Background) }
+    it 'returns a Background instance' do
+      described_instance.must_be_instance_of(Background)
+    end
 
     describe '#escape_sequence' do
       let(:subject) { described_instance.escape_sequence }
 
-      it { subject.must_be_instance_of(String) }
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
 
       context 'with no colour' do
-        it { subject.must_be_instance_of(String) }
+        it 'returns a String' do
+          subject.must_be_instance_of(String)
+        end
 
-        it { subject.must_equal("\e[48;5;49m") }
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[48;5;49m")
+        end
       end
 
       context 'with a named colour' do
         let(:colour) { :red }
 
-        it { subject.must_be_instance_of(String) }
+        it 'returns a String' do
+          subject.must_be_instance_of(String)
+        end
 
-        it { subject.must_equal("\e[48;5;41m") }
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[48;5;41m")
+        end
       end
 
       context 'with a html colour' do
         let(:colour) { '#aadd00' }
 
-        it { subject.must_be_instance_of(String) }
+        it 'returns a String' do
+          subject.must_be_instance_of(String)
+        end
 
-        it { subject.must_equal("\e[48;5;148m") }
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[48;5;148m")
+        end
       end
 
       context 'with a default colour' do
         let(:colour) { :undefined }
 
-        it { subject.must_be_instance_of(String) }
+        it 'returns a String' do
+          subject.must_be_instance_of(String)
+        end
 
-        it { subject.must_equal("\e[48;5;49m") }
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[48;5;49m")
+        end
       end
     end
   end

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

@@ -4,14 +4,23 @@ module Vedeu
   describe Colour do
     let(:described_class)    { Colour }
     let(:described_instance) { described_class.new }
+    let(:subject)            { described_instance }
     let(:pair)               { [] }
 
-    it { described_instance.must_be_instance_of(Colour) }
+    it 'returns a Colour instance' do
+      subject.must_be_instance_of(Colour)
+    end
+
+    it 'sets an instance variable' do
+      subject.instance_variable_get("@pair").must_equal([])
+    end
 
     describe '.set' do
       let(:subject) { described_class.set(pair) }
 
-      it { subject.must_be_instance_of(String) }
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
 
       context 'when the foreground and background are specified as symbols' do
         context 'when both the foreground and background is specified' do
@@ -63,5 +72,33 @@ module Vedeu
         end
       end
     end
+
+    describe '.reset' do
+      let(:subject) { described_class.reset }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[38;5;39m\e[48;5;49m")
+      end
+    end
+
+    describe '#foreground' do
+      let(:subject) { described_instance.foreground }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+    end
+
+    describe '#background' do
+      let(:subject) { described_instance.background }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+    end
   end
 end