vedeu 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f601ff87eda4c07701dfc42940bbed9c30879fc3
-  data.tar.gz: cbf134f3d4aa31bacec4dbc26ac059e4cec15f1b
+  metadata.gz: 30086255eba975054c131f5aa42aeff7e4ab4d4c
+  data.tar.gz: 338f9940b945d89ee8bc4e21cb068d8e5eccc3b6
 SHA512:
-  metadata.gz: 3c4d5ef111d1f43f66c3fa1a4acc31a7066405fa5aed113b7b9fabed117290757d42d7972f847eeb2c009262b2c50a7504ca0f28e8741ec7f27c72ed1754b336
-  data.tar.gz: 1d663a4f0a1d69cca7abf7aa1f91346bc47be0578fdba37e7627e0df5a8e9109980fc5bc01bd31493f29f9e2ba20ecdbc8adfab4a7cf8581b1ad80060c4c6275
+  metadata.gz: df5e8b21200f6197027e7a8430729fea7e1dcf5cfdc757119aedbff3a6179b6a6754fdd4088063980f6881dd650bbd30eeb42f0a732c27e2602fc65725b37f9e
+  data.tar.gz: 0bd5207420d3d37e1383d44a8fd88e5dc97bb1f07450f162eee30e0bb0cabd98ece969c59536651ed29f624ab412aa1490faed55399063d920a12997715b2417

data/README.md

@@ -29,9 +29,28 @@ Expect proper documentation soon!
 
       interface :main, { }
 
-      command   :exit, { entity:   SomeClass,
-                         keypress: 'q',
-                         keyword:  'quit' }
+      command :thing, { entity:   SomeClass,
+                        keypress: 't',
+                        keyword:  'thing' }
+
+      event :some_event do
+        # ...
+      end
+
+      event :other_event do |hash_args, array_args, args|
+        # ...
+      end
+
+      event :key do |key|
+        case key
+        when 'a' then puts "Apple"
+        when 'b' then puts "Banana"
+        # ...
+        when :f1 then run(:some_event)
+        when :f2 then
+          run(:other_event, { args: here }, [:or, :here], :etc)
+        end
+      end
     end
 
 
@@ -91,6 +110,22 @@ Referring to the above example, interfaces have a name, and various default attr
 As above, commands have a name, a class which performs the action
 (you define this), and they can be invoked with a keypress or a keyword. At this time, Vedeu will call the `.dispatch` method on your class, passing any arguments you originally defined in the command. In the future, both the method called and the arguments could be dynamic.
 
+### On Defining Events
+
+    event :event_name do |arg1, arg2|
+
+    end
+
+One can define events which perform work or trigger other events. Vedeu has 3 built-in events which are namespaced with underscores as to hopefully not cause a collision with events you wish to create:
+
+- `:_exit_` when triggered, Vedeu will attempt to exit.
+
+- `:_keypress_` triggering this event will cause the triggering of the `key` event; which you should define to 'do things'. If the `escape` key is pressed, then `key` is triggered with the argument `:escape`, also an internal event `_mode_switch_` is triggered.
+
+- `:_mode_switch_` when triggered (after the user presses `escape`), Vedeu switches from a "raw mode" terminal to a "cooked mode" terminal. The idea here being that the raw mode is for single keypress actions, whilst cooked mode allows the user to enter more elaborate commands- such as commands with arguments.
+
+Note: Overriding or adding additional events to the Vedeu event namespace may cause unpredictable results.
+
 
 ### Geometry
 

data/deps.md

@@ -0,0 +1,269 @@
+----------------------------------------------------------------------
+By class
+----------------------------------------------------------------------
+
+Application
+  Input
+  Output
+  Process
+  Terminal
+
+ClearInterface
+
+Collection
+
+Colour
+  Esc
+
+Command
+
+CommandRepository
+  Command
+  Repository
+
+Composition
+  InterfaceCollection
+
+Compositor
+  Composition
+
+Configuration
+
+Coordinate
+  Esc
+  Terminal
+
+Esc
+  Translator
+
+EventRepository
+
+Exit
+  EventRepository
+
+HashParser
+  TextAdaptor
+
+Input
+  EventRepository
+  Queue
+  Terminal
+
+Interface
+  ClearInterface
+  Coordinate
+  LineCollection
+  Presentation
+  Queue
+  RenderInterface
+  Style
+  Terminal
+
+InterfaceCollection
+  InterfaceRepository
+
+InterfaceRepository
+  Interface
+  Repository
+
+JSONParser
+
+Launcher
+  Application
+  Configuration
+
+Line
+  Presentation
+  StreamCollection
+  Style
+
+LineCollection
+  Collection
+  Line
+
+Menu
+
+Output
+  InterfaceRepository
+  Terminal
+
+Parser
+  Compositor
+  HashParser
+  JSONParser
+
+Presentation
+  Colour
+
+Process
+  CommandRepository
+  Parser
+  Queue
+
+Queue
+
+RenderInterface
+  ClearInterface
+
+Repository
+  Storage
+
+Storage
+
+Stream
+  Presentation
+  Style
+
+StreamCollection
+  Collection
+  Stream
+
+Style
+  Esc
+
+Template
+
+Terminal
+  Esc
+  Application
+
+TextAdaptor
+
+Translator
+
+Wordwrap
+
+
+----------------------------------------------------------------------
+Orphans
+----------------------------------------------------------------------
+
+Template - orphaned
+Wordwrap - orphaned
+Menu     - orphaned
+
+Exit     - orphaned
+  EventRepository
+
+
+----------------------------------------------------------------------
+Grouped
+----------------------------------------------------------------------
+
+Launcher
+  Application
+    Input
+      EventRepository
+      Queue
+      Terminal
+        Esc
+          Translator
+    Output
+      InterfaceRepository
+        Interface
+          ClearInterface
+          Coordinate
+            Esc
+              Translator
+            Terminal
+              Esc
+                Translator
+          LineCollection
+            Collection
+            Line
+              Presentation
+                Colour
+                  Esc
+                    Translator
+              StreamCollection
+                Collection
+                Stream
+                  Presentation
+                    Colour
+                      Esc
+                        Translator
+                  Style
+                    Esc
+                      Translator
+              Style
+                Esc
+                  Translator
+          Presentation
+            Colour
+              Esc
+                Translator
+          Queue
+          RenderInterface
+            ClearInterface
+          Style
+            Esc
+              Translator
+          Terminal
+            Esc
+              Translator
+        Repository
+          Storage
+      Terminal
+        Esc
+          Translator
+    Process
+      CommandRepository
+        Command
+        Repository
+          Storage
+      Parser
+        Compositor
+          Composition
+            InterfaceCollection
+              InterfaceRepository
+                Interface
+                  ClearInterface
+                  Coordinate
+                    Esc
+                      Translator
+                    Terminal
+                      Esc
+                        Translator
+                  LineCollection
+                    Collection
+                    Line
+                      Presentation
+                        Colour
+                          Esc
+                            Translator
+                      StreamCollection
+                        Collection
+                        Stream
+                          Presentation
+                            Colour
+                              Esc
+                                Translator
+                          Style
+                            Esc
+                              Translator
+                      Style
+                        Esc
+                          Translator
+                  Presentation
+                    Colour
+                      Esc
+                        Translator
+                  Queue
+                  RenderInterface
+                    ClearInterface
+                  Style
+                    Esc
+                      Translator
+                  Terminal
+                    Esc
+                      Translator
+                Repository
+                  Storage
+        HashParser
+          TextAdaptor
+        JSONParser
+      Queue
+    Terminal
+      Esc
+        Translator
+  Configuration

data/lib/vedeu/application.rb

@@ -54,9 +54,15 @@ module Vedeu
 
     def interactive
       loop { yield }
-    rescue StopIteration
+
     rescue ModeSwitch
-      Terminal.mode_switch
+      if Terminal.raw_mode?
+        Application.start({ mode: :cooked })
+
+      else
+        Application.start({ mode: :raw })
+
+      end
     end
 
     def run_once

data/lib/vedeu/configuration.rb

@@ -18,6 +18,14 @@ module Vedeu
         opts.on('-1', '--run-once', 'Run application once.') do
           @options[:interactive] = false
         end
+
+        opts.on('-c', '--cooked', 'Run application in cooked mode.') do
+          @options[:mode] = :cooked
+        end
+
+        opts.on('-r', '--raw', 'Run application in raw mode (default).') do
+          @options[:mode] = :raw
+        end
       end
       parser.parse!(args)
 

data/lib/vedeu/models/interface.rb

@@ -4,7 +4,8 @@ require 'virtus'
 require_relative 'attributes/line_collection'
 require_relative 'presentation'
 require_relative 'style'
-require_relative '../output/interface_renderer'
+require_relative '../output/clear_interface'
+require_relative '../output/render_interface'
 require_relative '../support/coordinate'
 require_relative '../support/queue'
 require_relative '../support/terminal'
@@ -40,7 +41,7 @@ module Vedeu
         self.current = dequeue
 
       elsif no_content?
-        self.current = clear_interface
+        self.current = ClearInterface.call(self)
 
       else
         self.current
@@ -64,7 +65,7 @@ module Vedeu
     end
 
     def to_s
-      clear_interface + render_content
+      RenderInterface.call(self)
     end
 
     private
@@ -73,14 +74,6 @@ module Vedeu
       self.current.nil? || self.current.empty?
     end
 
-    def render_content
-      InterfaceRenderer.render(self)
-    end
-
-    def clear_interface
-      InterfaceRenderer.clear(self)
-    end
-
     def geometry
       @_geometry ||= Coordinate.new(attributes)
     end

data/lib/vedeu/output/{interface_renderer.rb → clear_interface.rb}

@@ -1,13 +1,9 @@
 module Vedeu
-  class InterfaceRenderer
-    def self.clear(interface)
+  class ClearInterface
+    def self.call(interface)
       new(interface).clear
     end
 
-    def self.render(interface)
-      new(interface).render
-    end
-
     def initialize(interface)
       @interface = interface
     end
@@ -16,23 +12,10 @@ module Vedeu
       set_colour + clear_lines
     end
 
-    def render
-      out = []
-      content_lines.each_with_index do |line, index|
-        out << origin(index)
-        out << line.to_s
-      end
-      out.join
-    end
-
     private
 
     attr_reader :interface
 
-    def content_lines
-      interface.lines
-    end
-
     def set_colour
       interface.colour.to_s
     end
@@ -44,10 +27,8 @@ module Vedeu
     end
 
     def clear_line(index)
-      origin(index) + (' ' * interface.width) + origin(index)
-    end
-
-    def origin(index)
+      interface.origin(index) +
+      (' ' * interface.width) +
       interface.origin(index)
     end
   end

data/lib/vedeu/output/render_interface.rb

@@ -0,0 +1,27 @@
+require_relative 'clear_interface'
+
+module Vedeu
+  class RenderInterface
+    def self.call(interface)
+      new(interface).render
+    end
+
+    def initialize(interface)
+      @interface = interface
+    end
+
+    def render
+      out = []
+      out << ClearInterface.call(interface)
+      interface.lines.each_with_index do |line, index|
+        out << interface.origin(index)
+        out << line.to_s
+      end
+      out.join
+    end
+
+    private
+
+    attr_reader :interface
+  end
+end

data/lib/vedeu/{support/parsing → parsing}/hash_parser.rb

@@ -1,4 +1,4 @@
-require_relative '../../output/text_adaptor'
+require_relative 'text_adaptor'
 
 module Vedeu
   class HashParser

data/lib/vedeu/{support → parsing}/parser.rb

@@ -1,6 +1,6 @@
-require_relative 'compositor'
-require_relative 'parsing/hash_parser'
-require_relative 'parsing/json_parser'
+require_relative '../support/compositor'
+require_relative 'hash_parser'
+require_relative 'json_parser'
 
 module Vedeu
   class ParseError < StandardError; end

data/lib/vedeu/process/process.rb

@@ -1,6 +1,6 @@
 require_relative '../repository/command_repository'
 require_relative '../support/queue'
-require_relative '../support/parser'
+require_relative '../parsing/parser'
 
 module Vedeu
   class Process

data/lib/vedeu/repository/event_repository.rb

@@ -1,5 +1,3 @@
-require_relative '../support/terminal'
-
 module Vedeu
   module EventRepository
     extend self
@@ -29,9 +27,9 @@ module Vedeu
     end
 
     def keypress(key)
-      trigger(:_mode_switch_) if key == :escape
-
       trigger(:key, key)
+
+      trigger(:_mode_switch_) if key == :escape
     end
   end
 end

data/lib/vedeu/support/esc.rb

@@ -1,4 +1,3 @@
-require_relative 'terminal'
 require_relative 'translator'
 
 module Vedeu
@@ -11,10 +10,6 @@ module Vedeu
       ["\e[48;5;", colour_translator(value), 'm'].join
     end
 
-    def clear_last_line
-      set_position((Terminal.height - 1), 1) + "\e[2K"
-    end
-
     def foreground_colour(value = '#ffffff')
       return '' if value.empty?
 

data/lib/vedeu/support/terminal.rb

@@ -56,28 +56,22 @@ module Vedeu
     def restore_screen
       output Esc.string 'show_cursor'
       output Esc.string 'reset'
-      output Esc.clear_last_line
+      output clear_last_line
     end
 
     def set_cursor_mode
       output Esc.string 'show_cursor' unless raw_mode?
     end
 
-    def mode_switch
-      if raw_mode?
-        Application.start({ mode: :cooked })
-
-      else
-        Application.start({ mode: :raw })
-
-      end
-    end
-
     def raw_mode?
       @mode == :raw
     end
     # :nocov:
 
+    def clear_last_line
+      Esc.set_position((height - 1), 1) + "\e[2K"
+    end
+
     def centre
       [(height / 2), (width / 2)]
     end

data/test/example_app/bin/app

@@ -6,4 +6,4 @@ trap('INT') { exit! }
 
 require_relative '../lib/app'
 
-Example::App.start
+Example::App.start(ARGV.dup)

data/test/example_app/lib/app.rb

@@ -78,12 +78,13 @@ module Example
       when 'v' then puts "v was pressed."
       when :f1 then puts "F1 was pressed."
       when :f2 then run(:some_event, [:args, :go, :here])
+      when 'x' then run(:_exit_)
       else
       end
     end
 
-    def self.start
-      Vedeu::Launcher.new([]).execute!
+    def self.start(args = [])
+      Vedeu::Launcher.new(args).execute!
     end
   end
 end

data/test/lib/vedeu/configuration_test.rb

@@ -12,6 +12,16 @@ module Vedeu
         Configuration.configure(['--run-once'])
           .must_equal({ interactive: false })
       end
+
+      it 'returns the options which instructs Vedeu to run in cooked mode' do
+        Configuration.configure(['--cooked'])
+          .must_equal({ mode: :cooked })
+      end
+
+      it 'returns the options which instructs Vedeu to run in raw mode' do
+        Configuration.configure(['--raw'])
+          .must_equal({ mode: :raw })
+      end
     end
   end
 end

data/test/lib/vedeu/models/attributes/collection_test.rb

@@ -11,19 +11,9 @@ module Vedeu
   describe Collection do
     describe '#coercer' do
       it 'returns an empty collection when nil or empty' do
-        Collection.coercer(nil, TestClass, :key).must_equal([])
-      end
-
-      it 'returns an empty collection when nil or empty' do
-        Collection.coercer('', TestClass, :key).must_equal([])
-      end
-
-      it 'returns an empty collection when nil or empty' do
-        Collection.coercer([], TestClass, :key).must_equal([])
-      end
-
-      it 'returns an empty collection when nil or empty' do
-        Collection.coercer({}, TestClass, :key).must_equal([])
+        [nil, '', [], {}].each do |empty_value|
+          Collection.coercer(empty_value, TestClass, :key).must_equal([])
+        end
       end
 
       it 'returns a single model in a collection when a String' do

data/test/lib/vedeu/models/attributes/line_collection_test.rb

@@ -4,6 +4,8 @@ require_relative '../../../../../lib/vedeu/models/interface'
 
 module Vedeu
   describe LineCollection do
+    let(:interface) { Interface.new(attributes) }
+
     describe '#coerce' do
       it 'returns an empty collection when there are no lines' do
         Interface.new({ lines: {} }).lines.must_equal([])

data/test/lib/vedeu/models/stream_test.rb

@@ -3,31 +3,31 @@ require_relative '../../../../lib/vedeu/models/stream'
 
 module Vedeu
   describe Stream do
-    it 'has a colour attribute' do
-      stream = Stream.new({
-        colour: { foreground: '#ff0000', background: '#000000' }
+    let(:stream) {
+      Stream.new({
+        colour: {
+          foreground: '#ff0000',
+          background: '#000000'
+        },
+        text:  'Some text',
+        style: 'normal'
       })
+    }
+
+    it 'has a colour attribute' do
       stream.colour.must_be_instance_of(Colour)
     end
 
     it 'has a text attribute' do
-      stream = Stream.new({ text: 'Some text' })
       stream.text.must_equal('Some text')
     end
 
     it 'has a style attribute' do
-      stream = Stream.new({ style: 'normal' })
       stream.style.must_equal("\e[24m\e[21m\e[27m")
     end
 
     describe '#to_s' do
       it 'returns a String' do
-        stream = Stream.new({
-          colour: { foreground: '#ff0000', background: '#000000' },
-          style:  'normal',
-          text:   'Some text'
-        })
-
         stream.to_s.must_equal(
           "\e[38;5;196m\e[48;5;16m" \
           "\e[24m\e[21m\e[27m" \
@@ -38,12 +38,6 @@ module Vedeu
 
     describe '#to_json' do
       it 'returns a String' do
-        stream = Stream.new({
-          colour: { foreground: '#ff0000', background: '#000000' },
-          style:  'normal',
-          text:   'Some text'
-        })
-
         stream.to_json.must_equal("{\"colour\":{\"foreground\":\"#ff0000\",\"background\":\"#000000\"},\"style\":[\"normal\"],\"text\":\"Some text\"}")
       end
     end

data/test/lib/vedeu/output/{interface_renderer_test.rb → clear_interface_test.rb}

@@ -1,20 +1,20 @@
 require_relative '../../../test_helper'
 require_relative '../../../../lib/vedeu/repository/interface_repository'
-require_relative '../../../../lib/vedeu/output/interface_renderer'
+require_relative '../../../../lib/vedeu/output/clear_interface'
 require_relative '../../../../lib/vedeu/models/interface'
 
 module Vedeu
-  describe InterfaceRenderer do
+  describe ClearInterface do
     before { InterfaceRepository.reset }
 
-    describe '.clear' do
+    describe '.call' do
       it 'returns the escape sequence to clear the whole interface' do
         interface = Interface.new({
-          name:   '.clear',
+          name:   'ClearInterface.call',
           width:  5,
           height: 2
         })
-        InterfaceRenderer.clear(interface).must_equal(
+        ClearInterface.call(interface).must_equal(
           "\e[1;1H     \e[1;1H" \
           "\e[2;1H     \e[2;1H"
         )
@@ -22,7 +22,7 @@ module Vedeu
 
       it 'returns the escape sequence to clear the whole interface with specified colours' do
         interface = Interface.new({
-          name:   '.clear',
+          name:   'ClearInterface.call',
           width:  5,
           height: 2,
           colour: {
@@ -30,24 +30,12 @@ module Vedeu
             background: '#ffff00'
           }
         })
-        InterfaceRenderer.clear(interface).must_equal(
+        ClearInterface.call(interface).must_equal(
           "\e[38;5;46m\e[48;5;226m" \
           "\e[1;1H     \e[1;1H" \
           "\e[2;1H     \e[2;1H"
         )
       end
     end
-
-    describe '.render' do
-      it 'returns the content for the interface' do
-        interface = Interface.new({
-          name:   '.render',
-          width:  5,
-          height: 2,
-          lines:  'InterfaceRenderer.render'
-        })
-        InterfaceRenderer.render(interface).must_equal("\e[1;1HInterfaceRenderer.render")
-      end
-    end
   end
 end

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

@@ -0,0 +1,27 @@
+require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/repository/interface_repository'
+require_relative '../../../../lib/vedeu/output/clear_interface'
+require_relative '../../../../lib/vedeu/output/render_interface'
+require_relative '../../../../lib/vedeu/models/interface'
+
+module Vedeu
+  describe RenderInterface do
+    before { InterfaceRepository.reset }
+
+    describe '.call' do
+      it 'returns the content for the interface' do
+        interface = Interface.new({
+          name:   '.call',
+          width:  5,
+          height: 2,
+          lines:  'RenderInterface.call'
+        })
+        RenderInterface.call(interface).must_equal(
+          "\e[1;1H     \e[1;1H" \
+          "\e[2;1H     \e[2;1H" \
+          "\e[1;1HRenderInterface.call"
+        )
+      end
+    end
+  end
+end

data/test/lib/vedeu/{support/parsing → parsing}/hash_parser_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/support/parsing/hash_parser'
+require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/parsing/hash_parser'
 
 module Vedeu
   describe HashParser do

data/test/lib/vedeu/{support/parsing → parsing}/json_parser_test.rb

@@ -1,5 +1,5 @@
-require_relative '../../../../test_helper'
-require_relative '../../../../../lib/vedeu/support/parsing/json_parser'
+require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/parsing/json_parser'
 
 module Vedeu
   describe JSONParser do

data/test/lib/vedeu/{support → parsing}/parser_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/parser'
+require_relative '../../../../lib/vedeu/parsing/parser'
 
 module Vedeu
   describe Parser do

data/test/lib/vedeu/{output → parsing}/text_adaptor_test.rb

@@ -1,5 +1,5 @@
 require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/output/text_adaptor'
+require_relative '../../../../lib/vedeu/parsing/text_adaptor'
 
 module Vedeu
   describe TextAdaptor do

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

@@ -25,31 +25,31 @@ module Vedeu
 
   describe Process do
     describe '.evaluate' do
-      it 'returns false when there is no input' do
+      before do
+        CommandRepository.reset
         Queue.reset
+      end
+
+      it 'returns false when there is no input' do
         Process.evaluate.must_be_instance_of(FalseClass)
       end
 
       it 'raises an exception when the result is :stop' do
-        CommandRepository.reset
         CommandRepository.create({
           name:     'quit',
           entity:   QuitCommand,
           keypress: 'q'
         })
-        Queue.reset
         Queue.enqueue('q')
         proc { Process.evaluate }.must_raise(StopIteration)
       end
 
       it 'returns a collection of interfaces when there is a result' do
-        CommandRepository.reset
         CommandRepository.create({
           name:     'test',
           entity:   TestCommand,
           keypress: 't'
         })
-        Queue.reset
         Queue.enqueue('t')
         evaluation = Process.evaluate
 
@@ -58,13 +58,11 @@ module Vedeu
       end
 
       it 'returns a NilClass when there is no result' do
-        CommandRepository.reset
         CommandRepository.create({
           name:     'no_result',
           entity:   NoResultCommand,
           keypress: 'n'
         })
-        Queue.reset
         Queue.enqueue('n')
         Process.evaluate.must_be_instance_of(NilClass)
       end

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

@@ -13,14 +13,6 @@ module Vedeu
       end
     end
 
-    describe '.clear_last_line' do
-      it 'returns an escape sequence to clear the last line' do
-        IO.console.stub :winsize, [25, 25] do
-          Esc.clear_last_line.must_equal("\e[24;1H\e[2K")
-        end
-      end
-    end
-
     describe '.foreground_colour' do
       it 'returns an escape sequence' do
         Esc.foreground_colour.must_equal("\e[38;5;231m")

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

@@ -3,14 +3,14 @@ require_relative '../../../../lib/vedeu/support/queue'
 
 module Vedeu
   describe Queue do
+    before { Queue.reset }
+
     describe '.dequeue' do
       it 'returns a NilClass when the queue is empty' do
-        Queue.reset
         Queue.dequeue.must_be_instance_of(NilClass)
       end
 
       it 'returns the first entry added when the queue is not empty' do
-        Queue.reset
         Queue.enqueue(:result)
         Queue.dequeue.must_be_instance_of(Symbol)
       end
@@ -18,32 +18,27 @@ module Vedeu
 
     describe '.enqueue' do
       it 'contains the enqueued item' do
-        Queue.reset
         Queue.enqueue(:result).size.must_equal(1)
       end
     end
 
     describe '.enqueued?' do
       it 'returns true when the queue is not empty' do
-        Queue.reset
         Queue.enqueue(:result)
         Queue.enqueued?.must_be_instance_of(TrueClass)
       end
 
       it 'returns false when the queue is empty' do
-        Queue.reset
         Queue.enqueued?.must_be_instance_of(FalseClass)
       end
     end
 
     describe '.entries' do
       it 'returns an empty collection when the queue is empty' do
-        Queue.reset
         Queue.entries.must_equal([])
       end
 
       it 'returns all the enqueue items when the queue is not empty' do
-        Queue.reset
         Queue.enqueue(:queued_entry)
         Queue.entries.must_equal([:queued_entry])
       end
@@ -51,12 +46,10 @@ module Vedeu
 
     describe '.size' do
       it 'returns the size of the queue when the queue is empty' do
-        Queue.reset
         Queue.size.must_equal(0)
       end
 
       it 'returns the size of the queue when the queue is not empty' do
-        Queue.reset
         Queue.enqueue(:result).enqueue(:result)
         Queue.size.must_equal(2)
       end
@@ -64,7 +57,6 @@ module Vedeu
 
     describe '.clear' do
       it 'returns an empty array' do
-        Queue.reset
         Queue.enqueue(:result)
         Queue.reset.must_be_empty
       end
@@ -72,12 +64,10 @@ module Vedeu
 
     describe '.view' do
       it 'returns the queue as a String when the queue is empty' do
-        Queue.reset
         Queue.view.must_equal('[]')
       end
 
       it 'returns the queue as a String when the queue is not empty' do
-        Queue.reset
         Queue.enqueue(:result)
         Queue.view.must_equal('[:result]')
       end

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

@@ -3,9 +3,10 @@ require_relative '../../../../lib/vedeu/support/terminal'
 
 module Vedeu
   describe Terminal do
+    let(:console) { IO.console }
+
     describe '.input' do
       it 'returns the entered string' do
-        console = IO.console
         console.stub :gets, "test\n" do
           Terminal.input.must_equal('test')
         end
@@ -18,9 +19,16 @@ module Vedeu
       end
     end
 
+    describe '.clear_last_line' do
+      it 'returns an escape sequence to clear the last line' do
+        console.stub :winsize, [25, 25] do
+          Terminal.clear_last_line.must_equal("\e[24;1H\e[2K")
+        end
+      end
+    end
+
     describe '.centre' do
       it 'returns the centre point on the terminal' do
-        console = IO.console
         console.stub :winsize, [25, 80] do
           Terminal.centre.must_equal([12, 40])
         end
@@ -29,7 +37,6 @@ module Vedeu
 
     describe '.width' do
       it 'returns the width of the terminal' do
-        console = IO.console
         console.stub :winsize, [25, 80] do
           Terminal.width.must_equal(80)
         end
@@ -38,7 +45,6 @@ module Vedeu
 
     describe '.height' do
       it 'returns the height of the terminal' do
-        console = IO.console
         console.stub :winsize, [25, 80] do
           Terminal.height.must_equal(25)
         end
@@ -47,7 +53,6 @@ module Vedeu
 
     describe '.size' do
       it 'returns the width and height of the terminal' do
-        console = IO.console
         console.stub :winsize, [25, 80] do
           Terminal.size.must_equal([25, 80])
         end
@@ -56,7 +61,6 @@ module Vedeu
 
     describe '.console' do
       it 'returns the console' do
-        console = IO.console
         Terminal.console.must_equal(console)
       end
     end

data/test/stats.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+function main {
+  for rev in `revisions`; do
+    echo "`number_of_lines ^lib` `number_of_lines ^test` `commit_description`"
+  done
+}
+
+function revisions {
+  git rev-list --reverse HEAD
+}
+
+function commit_description {
+  git log --oneline -1 $rev
+}
+
+function number_of_lines () {
+  git ls-tree -r $rev |
+  awk '{print $4, $3}' |
+  grep "$1" |
+  grep "\.rb" |
+  awk '{print $2}' |
+  xargs git show |
+  wc -l
+}
+
+main

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.0.36'
+  spec.version       = '0.0.37'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,6 +167,7 @@ files:
 - README.md
 - Rakefile
 - bin/vedeu
+- deps.md
 - lib/vedeu.rb
 - lib/vedeu/application.rb
 - lib/vedeu/configuration.rb
@@ -184,10 +185,14 @@ files:
 - lib/vedeu/models/presentation.rb
 - lib/vedeu/models/stream.rb
 - lib/vedeu/models/style.rb
-- lib/vedeu/output/interface_renderer.rb
+- lib/vedeu/output/clear_interface.rb
 - lib/vedeu/output/output.rb
+- lib/vedeu/output/render_interface.rb
 - lib/vedeu/output/template.rb
-- lib/vedeu/output/text_adaptor.rb
+- lib/vedeu/parsing/hash_parser.rb
+- lib/vedeu/parsing/json_parser.rb
+- lib/vedeu/parsing/parser.rb
+- lib/vedeu/parsing/text_adaptor.rb
 - lib/vedeu/process/process.rb
 - lib/vedeu/repository/command_repository.rb
 - lib/vedeu/repository/event_repository.rb
@@ -199,9 +204,6 @@ files:
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/exit.rb
 - lib/vedeu/support/menu.rb
-- lib/vedeu/support/parser.rb
-- lib/vedeu/support/parsing/hash_parser.rb
-- lib/vedeu/support/parsing/json_parser.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/support/translator.rb
@@ -225,29 +227,31 @@ files:
 - test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
-- test/lib/vedeu/output/interface_renderer_test.rb
+- test/lib/vedeu/output/clear_interface_test.rb
 - test/lib/vedeu/output/output_test.rb
+- test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/template.rb
-- test/lib/vedeu/output/text_adaptor_test.rb
+- test/lib/vedeu/parsing/hash_parser_test.rb
+- test/lib/vedeu/parsing/json_parser_test.rb
+- test/lib/vedeu/parsing/parser_test.rb
+- test/lib/vedeu/parsing/text_adaptor_test.rb
 - test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/repository/command_repository_test.rb
+- test/lib/vedeu/repository/event_repository_test.rb
 - test/lib/vedeu/repository/interface_repository_test.rb
 - test/lib/vedeu/repository/repository_test.rb
 - test/lib/vedeu/repository/storage_test.rb
 - test/lib/vedeu/support/compositor_test.rb
 - test/lib/vedeu/support/coordinate_test.rb
 - test/lib/vedeu/support/esc_test.rb
-- test/lib/vedeu/support/event_repository_test.rb
 - test/lib/vedeu/support/exit_test.rb
 - test/lib/vedeu/support/menu_test.rb
-- test/lib/vedeu/support/parser_test.rb
-- test/lib/vedeu/support/parsing/hash_parser_test.rb
-- test/lib/vedeu/support/parsing/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb
 - test/lib/vedeu/support/wordwrap_test.rb
 - test/lib/vedeu_test.rb
+- test/stats.sh
 - test/support/colours.rb
 - test/support/dummy_command.rb
 - test/support/dummy_interface.rb
@@ -307,29 +311,31 @@ test_files:
 - test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/models/style_test.rb
-- test/lib/vedeu/output/interface_renderer_test.rb
+- test/lib/vedeu/output/clear_interface_test.rb
 - test/lib/vedeu/output/output_test.rb
+- test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/template.rb
-- test/lib/vedeu/output/text_adaptor_test.rb
+- test/lib/vedeu/parsing/hash_parser_test.rb
+- test/lib/vedeu/parsing/json_parser_test.rb
+- test/lib/vedeu/parsing/parser_test.rb
+- test/lib/vedeu/parsing/text_adaptor_test.rb
 - test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/repository/command_repository_test.rb
+- test/lib/vedeu/repository/event_repository_test.rb
 - test/lib/vedeu/repository/interface_repository_test.rb
 - test/lib/vedeu/repository/repository_test.rb
 - test/lib/vedeu/repository/storage_test.rb
 - test/lib/vedeu/support/compositor_test.rb
 - test/lib/vedeu/support/coordinate_test.rb
 - test/lib/vedeu/support/esc_test.rb
-- test/lib/vedeu/support/event_repository_test.rb
 - test/lib/vedeu/support/exit_test.rb
 - test/lib/vedeu/support/menu_test.rb
-- test/lib/vedeu/support/parser_test.rb
-- test/lib/vedeu/support/parsing/hash_parser_test.rb
-- test/lib/vedeu/support/parsing/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb
 - test/lib/vedeu/support/wordwrap_test.rb
 - test/lib/vedeu_test.rb
+- test/stats.sh
 - test/support/colours.rb
 - test/support/dummy_command.rb
 - test/support/dummy_interface.rb