vedeu 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f4d3d8682b701ed87f0984fefae3f3a4e62e7a
-  data.tar.gz: d1dbc4ba626a7f719ba6789905f51688fbdb1ba5
+  metadata.gz: 466d28a16f573a911f2e5c83cfd109dcb261399e
+  data.tar.gz: 701bcb2687c4b2d80562c8be9e44e3c3e1c16088
 SHA512:
-  metadata.gz: 8ec2bfeee749b873c1a768cabe45574aa98378a67402959dd0189aa0b181cebae81d8dadeb32a0f40d32a7c736880565c553b6ed78b9fd8d751d0ccd776ef927
-  data.tar.gz: 13fc99fc61a854fd5923034e663868da7070ffa54c3b6eabb784c42daba9eecf306a6c39a11c7f8662134d2bd5e62d9a22026eaf99fe9961366ee4925d46544c
+  metadata.gz: a38d99aa14a7b147c493571f01b0c699f122d50cc94b2e1cacb365a0159109f4688ca2b200ed349d89b74edac751e043b7e5a3b195cbd0961fd457c0ba541acc
+  data.tar.gz: 6592f6616ddaa92c8e004bfab81a77e673838a69e1614244f868d93c26e890685adf265c27cf7b5e2f4d14fb1cc512b697181a10d45977d513363fb5627871d0

data/README.md

@@ -33,56 +33,60 @@ TODO: Write detailed documentation
             |     |
             |     |-- Output
             |           |-- Compositor
-            |           |-- Queue
+            |           |
+            |           |-- Directive
+            |           |     |-- Colour
+            |           |     |     |-- Background < Base
+            |           |     |     |-- Foreground < Base
+            |           |     |
+            |           |     |-- Position
+            |           |     |     |-- Esc
+            |           |     |
+            |           |     |-- Style
+            |           |     |     |-- Cursor
+            |           |     |     |-- Esc
+            |           |     |
+            |           |     |-- Wordwrap
+            |           |
+            |           |-- InterfaceRepository
+            |           |-- Position
+            |           |     |-- Esc
+            |           |
+            |           |-- Renderer
+            |                 |-- Terminal
+            |                 |-- Queue
             |
             |-- InterfaceRepository
             |-- Terminal
 
     Base
-      |-- Translator
       |-- Esc
+      |-- Translator
+
+    Command
+      |-- CommandRepository
+
+    Exit
 
     Interface
-      |-- Commands
-      |     |-- Command
-      |     |     |-- CommandRepository
-      |     |
-      |     |-- Exit
-      |
-      |-- Compositor
-      |     |-- Directive
-      |     |     |-- Colour
-      |     |     |     |-- Foreground < Base
-      |     |     |     |-- Background < Base
-      |     |     |
-      |     |     |-- Position
-      |     |     |     |-- Esc
-      |     |     |
-      |     |     |-- Style
-      |     |           |-- Esc
-      |     |
-      |     |-- InterfaceRepository
-      |     |-- Position
-      |     |     |-- Esc
-      |     |
-      |     |-- Renderer
-      |           |-- Terminal
+      |-- Colour
+      |     |-- Background < Base
+      |     |-- Foreground < Base
       |
       |-- Geometry
       |     |-- Terminal
       |
-      |-- Input
       |-- InterfaceRepository
-      |-- Position
-      |-- Terminal
+
+    Repository
+      |-- Storage
 
     Terminal
+      |-- Cursor
       |-- Esc
       |-- Position
             |-- Esc
 
-    Wordwrap
-
 ### On Interfaces
 
 When we create the interface we define it's width, height, and origin (y, x).
@@ -108,7 +112,7 @@ Diagrams were produced using the Railroad Diagram Generator at `http://bottlecap
       include Vedeu
 
       interface 'status', { y: 1, x: 1, width: :auto, height: 1     }
-      interface 'main',   { y: 2, x: 1, width: :auto, height: :auto }
+      interface 'main',   { y: 2, x: 1, width: :auto, height: :auto, fg: :red, bg: :black }
 
       command 'exit', Vedeu::Exit.dispatch, { keyword: "exit", keypress: "q" }
       command 'help', MyApp.help,           { keyword: "help", keypress: "h" }
@@ -117,7 +121,11 @@ Diagrams were produced using the Railroad Diagram Generator at `http://bottlecap
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/vedeu/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+2. Clone it
+3. `bundle`
+4. `rake` or `bundle exec guard`
+5. Create your feature branch (`git checkout -b my-new-feature`)
+6. Write some tests, write some code, have some fun
+7. Commit your changes (`git commit -am 'Add some feature'`)
+8. Push to the branch (`git push origin my-new-feature`)
+9. Create new Pull Request

data/lib/vedeu.rb

@@ -6,7 +6,9 @@ require_relative 'vedeu/support/terminal'
 
 require_relative 'vedeu/output/base'
 require_relative 'vedeu/output/background'
+require_relative 'vedeu/output/buffer'
 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'

data/lib/vedeu/output/background.rb

@@ -3,7 +3,7 @@ module Vedeu
     private
 
     def prefix
-      '48;5;'
+      named? ? '48;2;' : '48;5;'
     end
 
     def codes

data/lib/vedeu/output/buffer.rb

@@ -0,0 +1,96 @@
+module Vedeu
+  class OutOfRangeError < StandardError; end
+
+  class Buffer
+    include Enumerable
+
+    attr_accessor :buffer
+
+    def initialize(options = {})
+      @options = options
+      @buffer  = Array.new(height) { Array.new(width) { :cell } }
+    end
+
+    def to_s
+      each { |row| puts row.inspect }
+      nil
+    end
+
+    def each(&block)
+      buffer.each(&block)
+    end
+
+    def cell(y, x)
+      raise OutOfRangeError if invalid_reference?(y, x)
+      buffer[y][x]
+    end
+
+    def set_cell(y, x, v = '')
+      raise OutOfRangeError if invalid_reference?(y, x)
+      buffer[y][x] = v
+    end
+
+    def set_row(y = 0, v = '')
+      if v.is_a?(String)
+        v.chars.each_with_index { |c, i| set_cell(y, i, c) }
+      else
+        v.each_with_index { |el, i| set_cell(y, i, el) }
+      end
+      row(y)
+    end
+
+    def row(y = 0)
+      buffer[y]
+    end
+    alias_method :y, :row
+
+    def set_column(x = 0, v = '')
+      if v.is_a?(String)
+        v.chars.each_with_index { |c, i| set_cell(i, x, c) }
+      else
+        v.each_with_index { |el, i| set_cell(i, x, el) }
+      end
+      column(x)
+    end
+
+    def column(x = 0)
+      buffer.inject([]) { |a, e| a << e[x] }
+    end
+    alias_method :x, :column
+
+    private
+
+    def invalid_reference?(y, x)
+      invalid_line?(y) || invalid_column?(x)
+    end
+
+    def invalid_line?(y)
+      y < 0 || y > (height - 1)
+    end
+
+    def invalid_column?(x)
+      x < 0 || x > (width - 1)
+    end
+
+    def width
+      options.fetch(:width)
+    end
+    alias_method :columns, :width
+
+    def height
+      options.fetch(:height)
+    end
+    alias_method :lines, :height
+
+    def options
+      defaults.merge!(@options)
+    end
+
+    def defaults
+      {
+        width:  Terminal.width,
+        height: Terminal.height
+      }
+    end
+  end
+end

data/lib/vedeu/output/compositor.rb

@@ -47,6 +47,7 @@ module Vedeu
       end
 
       container << colour.reset
+      container << cursor
 
       container
     end
@@ -75,6 +76,10 @@ module Vedeu
       interface.colour
     end
 
+    def cursor
+      interface.cursor
+    end
+
     def output
       return @output.split if @output.is_a?(String)
       @output

data/lib/vedeu/output/cursor.rb

@@ -0,0 +1,57 @@
+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
+    end
+  end
+end

data/lib/vedeu/output/esc.rb

@@ -1,32 +1,39 @@
 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 esc
-        [27.chr, '['].join
+      def clear_line
+        [esc, '2K'].join
       end
 
-      def hide_cursor
-        [esc, '?25l'].join
+      def esc
+        [27.chr, '['].join
       end
 
       def inverse
         [esc, '7m'].join
       end
+      alias_method :reverse, :inverse
 
-      def reset
-        [esc, '0m'].join
+      def normal
+        [esc, '2m'].join
       end
+      alias_method :dim, :normal
 
-      def show_cursor
-        [esc, '?25h'].join
+      def reset
+        [esc, '0m'].join
       end
 
       def underline

data/lib/vedeu/output/foreground.rb

@@ -3,7 +3,7 @@ module Vedeu
     private
 
     def prefix
-      '38;5;'
+      named? ? '38;2;' : '38;5;'
     end
 
     def codes

data/lib/vedeu/output/style.rb

@@ -14,11 +14,11 @@ module Vedeu
       case style
       when :bold        then Esc.bold
       when :clear       then Esc.clear
-      when :hide_cursor then Esc.hide_cursor
+      when :hide_cursor then Cursor.hide
       when :inverse     then Esc.inverse
       when :reset       then Esc.reset
       when :normal      then Esc.reset
-      when :show_cursor then Esc.show_cursor
+      when :show_cursor then Cursor.show
       when :underline   then Esc.underline
       else
         ''

data/lib/vedeu/repository/interface.rb

@@ -13,6 +13,7 @@ module Vedeu
 
       @active     = false
       @name       = attributes[:name]
+      @cursor     = attributes.fetch(:cursor, true)
     end
 
     def create
@@ -27,6 +28,9 @@ module Vedeu
       Compositor.arrange([Array.new(geometry.height) { '' }], name)
     end
 
+    def update
+    end
+
     def geometry
       @geometry ||= Geometry.new(attributes)
     end
@@ -35,6 +39,10 @@ module Vedeu
       @colour ||= Colour.new([foreground, background])
     end
 
+    def cursor
+      @cursor ? Cursor.show : Cursor.hide
+    end
+
     private
 
     def foreground

data/lib/vedeu/repository/interface_repository.rb

@@ -31,6 +31,10 @@ module Vedeu
         all.map { |interface| interface.initial_state }
       end
 
+      def update
+        all.map { |interface| interface.update }
+      end
+
       def klass
         Interface
       end

data/lib/vedeu/support/terminal.rb

@@ -65,11 +65,11 @@ module Vedeu
       end
 
       def show_cursor
-        output(Esc.show_cursor)
+        output(Cursor.show)
       end
 
       def hide_cursor
-        output(Esc.hide_cursor)
+        output(Cursor.hide)
       end
 
       def reset_colours

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

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

@@ -35,7 +35,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[48;5;41m")
+          subject.must_equal("\e[48;2;41m")
         end
       end
 
@@ -59,7 +59,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[48;5;49m")
+          subject.must_equal("\e[48;2;49m")
         end
       end
     end

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

@@ -0,0 +1,167 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Buffer do
+    let(:described_class)    { Buffer }
+    let(:described_instance) { described_class.new(options) }
+    let(:options)            { { width: 4, height: 3 } }
+    let(:subject)            { described_instance }
+
+    it 'returns a Buffer instance' do
+      subject.must_be_instance_of(Buffer)
+    end
+
+    it 'sets an instance variable' do
+      subject.instance_variable_get("@options").must_equal(options)
+    end
+
+    describe '#to_s' do
+      let(:subject) { capture_io { described_instance.to_s }.join }
+
+      # real method should return NilClass; want to capture io rather
+      # than have it spew into minitest output in terminal; see test
+      # below.
+      # it { subject.must_be_instance_of(NilClass) }
+
+      it "outputs the content of the buffer" do
+        subject.must_equal("[:cell, :cell, :cell, :cell]\n" \
+                           "[:cell, :cell, :cell, :cell]\n" \
+                           "[:cell, :cell, :cell, :cell]\n")
+      end
+    end
+
+    describe '#each' do
+      let(:subject) { described_instance.each }
+
+      it 'returns an Enumerator' do
+        subject.must_be_instance_of(Enumerator)
+      end
+    end
+
+    describe '#cell' do
+      let(:subject) { described_instance.cell(y, x) }
+      let(:y)       { 1 }
+      let(:x)       { 2 }
+
+      it 'returns a Symbol' do
+        subject.must_be_instance_of(Symbol)
+      end
+
+      context 'when the reference is in range' do
+        it 'returns the value at that location' do
+          subject.must_equal(:cell)
+        end
+      end
+
+      context 'when the reference is out of range' do
+        let(:y) { 4 }
+
+        it 'raises an exception' do
+          proc { subject }.must_raise(OutOfRangeError)
+        end
+      end
+    end
+
+    describe '#set_cell' do
+      let(:subject) { described_instance.set_cell(y, x, v) }
+      let(:y)       { 1 }
+      let(:x)       { 2 }
+      let(:v)       { '*' }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      context 'when the reference is in range' do
+        it 'returns the value at that location' do
+          subject.must_equal('*')
+        end
+      end
+
+      context 'when the reference is out of range' do
+        let(:y) { 3 }
+        let(:x) { 4 }
+
+        it 'raises an exception' do
+          proc { subject }.must_raise(OutOfRangeError)
+        end
+      end
+    end
+
+    describe '#set_row' do
+      let(:subject) { described_instance.set_row(y, v) }
+      let(:y)       { 1 }
+      let(:v)       { '****' }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      context 'when the value is a String' do
+        let(:v) { '****' }
+
+        it 'sets the row' do
+          subject.must_equal(['*', '*', '*', '*'])
+        end
+      end
+
+      context 'when the value is an Array' do
+        let(:v) { ['*','*','*','*'] }
+
+        it 'sets the row' do
+          subject.must_equal(['*', '*', '*', '*'])
+        end
+      end
+    end
+
+    describe '#row' do
+      let(:subject) { described_instance.row }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      it 'returns the content of the row at position y' do
+        subject.must_equal([:cell, :cell, :cell, :cell])
+      end
+    end
+
+    describe '#set_column' do
+      let(:subject) { described_instance.set_column(x, v) }
+      let(:x)       { 2 }
+      let(:v)       { '***' }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      context 'when the value is a String' do
+        let(:v) { '***' }
+
+        it 'sets the row' do
+          subject.must_equal(['*', '*', '*'])
+        end
+      end
+
+      context 'when the value is an Array' do
+        let(:v) { ['*', '*', '*'] }
+
+        it 'sets the row' do
+          subject.must_equal(['*', '*', '*'])
+        end
+      end
+    end
+
+    describe '#column' do
+      let(:subject) { described_instance.column }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      it 'returns the content of the column at position x' do
+        subject.must_equal([:cell, :cell, :cell])
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Vedeu
           let(:pair) { [:red, :yellow] }
 
           it 'returns the code for red on yellow' do
-            subject.must_equal("\e[38;5;31m\e[48;5;43m")
+            subject.must_equal("\e[38;2;31m\e[48;2;43m")
           end
         end
 
@@ -35,7 +35,7 @@ module Vedeu
           let(:pair) { [:blue] }
 
           it 'returns the code for blue on default' do
-            subject.must_equal("\e[38;5;34m\e[48;5;49m")
+            subject.must_equal("\e[38;2;34m\e[48;5;49m")
           end
         end
 
@@ -43,7 +43,7 @@ module Vedeu
           let(:pair) { [nil, :cyan] }
 
           it 'returns the code for default with cyan background' do
-            subject.must_equal("\e[38;5;39m\e[48;5;46m")
+            subject.must_equal("\e[38;5;39m\e[48;2;46m")
           end
         end
 
@@ -51,7 +51,7 @@ module Vedeu
           let(:pair) { [:melon, :raspberry] }
 
           it 'returns the default code' do
-            subject.must_equal("\e[38;5;39m\e[48;5;49m")
+            subject.must_equal("\e[38;2;39m\e[48;2;49m")
           end
         end
 
@@ -81,7 +81,7 @@ module Vedeu
       end
 
       it 'returns an escape sequence' do
-        subject.must_equal("\e[38;5;39m\e[48;5;49m")
+        subject.must_equal("\e[38;2;39m\e[48;2;49m")
       end
     end
 

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

@@ -0,0 +1,187 @@
+require_relative '../../../test_helper'
+
+module Vedeu
+  describe Cursor do
+    let(:described_class) { Cursor }
+
+    describe '.hide' do
+      let(:subject) { described_class.hide }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[?25l")
+      end
+    end
+
+    describe '.show' do
+      let(:subject) { described_class.show }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[?25h")
+      end
+    end
+
+    describe '.home' do
+      let(:subject) { described_class.home }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[H")
+      end
+    end
+
+    describe '.up' do
+      let(:subject) { described_class.up(count) }
+      let(:count)   {}
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[1A")
+      end
+
+      context 'with a count' do
+        let(:count) { 3 }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[3A")
+        end
+      end
+    end
+
+    describe '.down' do
+      let(:subject) { described_class.down(count) }
+      let(:count)   {}
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[1B")
+      end
+
+      context 'with a count' do
+        let(:count) { 3 }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[3B")
+        end
+      end
+    end
+
+    describe '.right' do
+      let(:subject) { described_class.right(count) }
+      let(:count)   {}
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[1C")
+      end
+
+      context 'with a count' do
+        let(:count) { 3 }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[3C")
+        end
+      end
+    end
+
+    describe '.left' do
+      let(:subject) { described_class.left(count) }
+      let(:count)   {}
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[1D")
+      end
+
+      context 'with a count' do
+        let(:count) { 3 }
+
+        it 'returns an escape sequence' do
+          subject.must_equal("\e[3D")
+        end
+      end
+    end
+
+    describe '.save' do
+      let(:subject) { described_class.save }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[s")
+      end
+    end
+
+    describe '.unsave' do
+      let(:subject) { described_class.unsave }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[u")
+      end
+    end
+
+    describe '.save_all' do
+      let(:subject) { described_class.save_all }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[7")
+      end
+    end
+
+    describe '.unsave_all' do
+      let(:subject) { described_class.unsave_all }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[8")
+      end
+    end
+
+    describe '.esc' do
+      let(:subject) { described_class.esc }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[")
+      end
+    end
+  end
+end

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

@@ -60,7 +60,7 @@ module Vedeu
         let(:colour) { [:red, :black] }
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[38;5;31m\e[48;5;40m")
+          subject.must_equal("\e[38;2;31m\e[48;2;40m")
         end
       end
 

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

@@ -4,6 +4,18 @@ module Vedeu
   describe Esc do
     let(:described_class) { Esc }
 
+    describe '.blink' do
+      let(:subject) { described_class.blink }
+
+      it 'returns a String' do
+        subject.must_be_instance_of(String)
+      end
+
+      it 'returns an escape sequence' do
+        subject.must_equal("\e[5m")
+      end
+    end
+
     describe '.bold' do
       let(:subject) { described_class.bold }
 
@@ -28,27 +40,27 @@ module Vedeu
       end
     end
 
-    describe '.esc' do
-      let(:subject) { described_class.esc }
+    describe '.clear_line' do
+      let(:subject) { described_class.clear_line }
 
       it 'returns a String' do
         subject.must_be_instance_of(String)
       end
 
       it 'returns an escape sequence' do
-        subject.must_equal("\e[")
+        subject.must_equal("\e[2K")
       end
     end
 
-    describe '.hide_cursor' do
-      let(:subject) { described_class.hide_cursor }
+    describe '.esc' do
+      let(:subject) { described_class.esc }
 
       it 'returns a String' do
         subject.must_be_instance_of(String)
       end
 
       it 'returns an escape sequence' do
-        subject.must_equal("\e[?25l")
+        subject.must_equal("\e[")
       end
     end
 
@@ -64,27 +76,27 @@ module Vedeu
       end
     end
 
-    describe '.reset' do
-      let(:subject) { described_class.reset }
+    describe '.normal' do
+      let(:subject) { described_class.normal }
 
       it 'returns a String' do
         subject.must_be_instance_of(String)
       end
 
       it 'returns an escape sequence' do
-        subject.must_equal("\e[0m")
+        subject.must_equal("\e[2m")
       end
     end
 
-    describe '.show_cursor' do
-      let(:subject) { described_class.show_cursor }
+    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[?25h")
+        subject.must_equal("\e[0m")
       end
     end
 

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

@@ -35,7 +35,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[38;5;31m")
+          subject.must_equal("\e[38;2;31m")
         end
       end
 
@@ -59,7 +59,7 @@ module Vedeu
         end
 
         it 'returns an escape sequence' do
-          subject.must_equal("\e[38;5;39m")
+          subject.must_equal("\e[38;2;39m")
         end
       end
     end

data/test/lib/vedeu/repository/interface_repository_test.rb

@@ -50,6 +50,14 @@ module Vedeu
       end
     end
 
+    describe '.update' do
+      let(:subject) { described_class.update }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+    end
+
     describe '.klass' do
       let(:subject) { described_class.klass }
 

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

@@ -13,7 +13,8 @@ module Vedeu
         x:      1,
         y:      1,
         fg:     :red,
-        bg:     :blue
+        bg:     :blue,
+        cursor: true,
       }
     }
     let(:result)             {}
@@ -67,5 +68,23 @@ module Vedeu
         subject.must_be_instance_of(Colour)
       end
     end
+
+    describe '#cursor' do
+      let(:subject) { described_instance.cursor }
+
+      context 'when the cursor is on' do
+        it 'returns an escape sequence' do
+          subject.must_be_instance_of(String)
+        end
+      end
+
+      context 'when the cursor is off' do
+        let(:attributes) { { cursor: false } }
+
+        it 'returns an escape sequence' do
+          subject.must_be_instance_of(String)
+        end
+      end
+    end
   end
 end

data/test/lib/vedeu/support/terminal_test.rb

@@ -77,22 +77,44 @@ module Vedeu
 
     describe '.open' do
       let(:subject) { described_class.open }
+
+      it 'returns a NilClass' do
+        subject.must_be_instance_of(NilClass)
+      end
     end
 
     describe '.close' do
       let(:subject) { described_class.close }
+
+      it 'returns a NilClass' do
+        subject.must_be_instance_of(NilClass)
+      end
     end
 
     describe '.cooked' do
-      let(:subject) { described_class.cooked }
+      let(:subject)  { described_class.cooked(instance) }
+      let(:instance) {}
+
+      it 'returns a NilClass' do
+        subject.must_be_instance_of(NilClass)
+      end
     end
 
     describe '.raw' do
-      let(:subject) { described_class.raw }
+      let(:subject)  { described_class.raw(instance) }
+      let(:instance) {}
+
+      it 'returns a NilClass' do
+        subject.must_be_instance_of(NilClass)
+      end
     end
 
     describe '.console' do
       let(:subject) { described_class.console }
+
+      it 'returns the console' do
+        subject.must_equal(console)
+      end
     end
 
     describe '.clear_screen' do

data/test/support/colours.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+30.upto(38) do |fg|
+  40.upto(48) do |bg|
+    print "\e[38;2;#{fg}m\e[48;2;#{bg}mVedeu\e[0m"
+  end
+  print "\n"
+end

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'simplecov'
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'pry'
-require 'pry-nav'
 
 SimpleCov.start do
   command_name 'MiniTest::Spec'

data/vedeu.gemspec

@@ -26,8 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest",           "5.3.4"
   spec.add_development_dependency "minitest-reporters", "1.0.4"
   spec.add_development_dependency "mocha",              "1.1.0"
-  spec.add_development_dependency "pry",                "0.9.12.6"
-  spec.add_development_dependency "pry-nav",            "0.2.3"
+  spec.add_development_dependency "pry",                "0.10.0"
   spec.add_development_dependency "rake",               "10.3.2"
   spec.add_development_dependency "simplecov",          "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -142,28 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12.6
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.12.6
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -227,8 +213,10 @@ files:
 - lib/vedeu/launcher.rb
 - lib/vedeu/output/background.rb
 - lib/vedeu/output/base.rb
+- lib/vedeu/output/buffer.rb
 - lib/vedeu/output/colour.rb
 - lib/vedeu/output/compositor.rb
+- lib/vedeu/output/cursor.rb
 - lib/vedeu/output/directive.rb
 - lib/vedeu/output/esc.rb
 - lib/vedeu/output/foreground.rb
@@ -258,8 +246,10 @@ files:
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/base_test.rb
+- test/lib/vedeu/output/buffer_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
+- test/lib/vedeu/output/cursor_test.rb
 - test/lib/vedeu/output/directive_test.rb
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
@@ -286,6 +276,7 @@ files:
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
 - test/lib/vedeu_test.rb
+- test/support/colours.rb
 - test/test_helper.rb
 - vedeu.gemspec
 homepage: http://www.gavinlaking.name/
@@ -320,8 +311,10 @@ test_files:
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/base_test.rb
+- test/lib/vedeu/output/buffer_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
+- test/lib/vedeu/output/cursor_test.rb
 - test/lib/vedeu/output/directive_test.rb
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
@@ -348,5 +341,6 @@ test_files:
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
 - test/lib/vedeu_test.rb
+- test/support/colours.rb
 - test/test_helper.rb
 has_rdoc: