vedeu 0.4.37 → 0.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29978c4b64039fc130cc5bad584e48e4ab08a6d
-  data.tar.gz: b88b3581a5d9db259b16536802ce766ac00fd524
+  metadata.gz: eba167b2296986a617d87379d671da43b1fdfde5
+  data.tar.gz: f680e8ca3c7fc1cf653a331b06f6b254069f1549
 SHA512:
-  metadata.gz: c2d7cf78b2fe8c5282fd1f3c4f3d25210d258a2db632d1cb7cdf6214c743e54141b104af5868f33fab97a0de017e0e17db663511ffb4d49ef805fa48032c3d12
-  data.tar.gz: d880b25648befe1cabb5441c2e62a5b08b2391abfdf684b25c8063233784c36252a86460dfeb0c52217d2600b1e318cb5ef8a20b22f22a6c640692a58a6c8b7c
+  metadata.gz: 62dfe9eec435c85f18d7b0556ae6d1f0549d4d442144a13dd816c80370b046e03566b0bc2f972a2e6f556832c9e4eb9cb807103f38cb25e77e9a09b4ca0cbbeb
+  data.tar.gz: aa1b63928e5bd9eed88413945780f5ba202a7f211d9abb96c71432d02cebaf8362c0617a69078af61d900a0c82868793531540824106560c6a063f60da02f6f8

data/examples/borders_app.rb

@@ -20,6 +20,9 @@ class VedeuBordersApp
   configure do
     # debug!
     log '/tmp/vedeu_borders_app.log'
+    raw!
+    run_once!
+    standalone!
   end
 
   interface 'default_border' do

data/examples/material_colours_app.rb

@@ -74,7 +74,7 @@ class VedeuMaterialColoursApp
     key('k') { Vedeu.trigger(:_view_up_, 'other_interface')    }
     key('l') { Vedeu.trigger(:_view_right_, 'other_interface') }
 
-    key('t')         do
+    key('t') do
       Vedeu.trigger(:_toggle_interface_, 'main_interface')
       Vedeu.trigger(:_toggle_interface_, 'other_interface')
     end

data/lib/vedeu/bindings.rb

@@ -125,6 +125,18 @@ module Vedeu
       Vedeu::Position.new(cursor.y, cursor.x) if cursor
     end
 
+    # Move the cursor to a relative position inside the interface.
+    #
+    # @todo
+    #   - The content of the interface needs to be a consideration.
+    #   - If the screen size changes, what should happen to the cursor.
+    #   - How do we represent cursors which are deliberately positioned outside
+    #     of the viewable area?
+    #
+    Vedeu.bind(:_cursor_reposition_) do |name, y, x|
+      Vedeu::Reposition.to(Vedeu::Cursor, name, y, x)
+    end
+
     # @see {Vedeu::Move}
     Vedeu.bind(:_cursor_reset_) { |name| Vedeu.trigger(:_cursor_origin_, name) }
 

data/lib/vedeu/cursor/all.rb

@@ -3,3 +3,4 @@ require 'vedeu/repositories/all'
 require_relative 'cursor'
 require_relative 'move'
 require_relative 'refresh_cursor'
+require_relative 'reposition'

data/lib/vedeu/cursor/cursor.rb

@@ -16,13 +16,13 @@ module Vedeu
     # @return [String]
     attr_reader :name
 
-    # @!attribute [r] ox
+    # @!attribute [rw] ox
     # @return [Fixnum]
-    attr_reader :ox
+    attr_accessor :ox
 
-    # @!attribute [r] oy
+    # @!attribute [rw] oy
     # @return [Fixnum]
-    attr_reader :oy
+    attr_accessor :oy
 
     # @!attribute [r] state
     # @return [Boolean|Symbol]
@@ -33,13 +33,13 @@ module Vedeu
     attr_reader :visible
     alias_method :visible?, :visible
 
-    # @!attribute [r] x
+    # @!attribute [rw] x
     # @return [Fixnum]
-    attr_reader :x
+    attr_accessor :x
 
-    # @!attribute [r] y
+    # @!attribute [rw] y
     # @return [Fixnum]
-    attr_reader :y
+    attr_accessor :y
 
     # Returns a new instance of Vedeu::Cursor.
     #

data/lib/vedeu/cursor/reposition.rb

@@ -0,0 +1,95 @@
+module Vedeu
+
+  # @api private
+  class Reposition
+
+    # @return [Vedeu::Cursor]
+    # @see Vedeu::Reposition.new
+    def self.to(entity, name, y, x)
+      new(entity, name, y, x).to
+    end
+
+    # @param entity []
+    # @param name [String]]
+    # @param y [Fixnum]
+    # @param x [Fixnum]
+    # @return [Vedeu::Reposition]
+    def initialize(entity, name, y, x)
+      @entity = entity
+      @name   = name
+      @y      = y
+      @x      = x
+    end
+
+    # @return [Vedeu::Cursor]
+    def to
+      result = @entity.new(name: name,
+                           y:    y_position,
+                           x:    x_position,
+                           oy:   y,
+                           ox:   x).store
+
+      Vedeu.trigger(:_clear_, name)
+      Vedeu.trigger(:_refresh_, name)
+      Vedeu.trigger(:_refresh_cursor_, name)
+
+      result
+    end
+
+    protected
+
+    # @!attribute [r] entity
+    # @return [String]
+    attr_reader :entity
+
+    # @!attribute [r] name
+    # @return [String]
+    attr_reader :name
+
+    # @!attribute [r] x
+    # @return [Fixnum]
+    attr_reader :x
+
+    # @!attribute [r] y
+    # @return [Fixnum]
+    attr_reader :y
+
+    private
+
+    # @return [Coordinate]
+    def coordinate
+      @coordinate ||= Vedeu::Coordinate.new(name)
+    end
+
+    # @return [Vedeu::Cursor]
+    def entity
+      @_entity ||= @entity.new
+    end
+
+    # @return [Vedeu::Cursor]
+    def model
+      @model ||= repository.by_name(name)
+    end
+
+    # @return [Vedeu::Cursors]
+    def repository
+      entity.repository
+    end
+
+    # Returns the cursors x position based on the desired x position.
+    #
+    # @return [Fixnum]
+    def x_position
+      coordinate.x_position(x)
+    end
+
+    # Returns the cursors y position based on the desired y position.
+    #
+    # @return [Fixnum]
+    def y_position
+      coordinate.y_position(y)
+    end
+
+  end # Reposition
+
+end # Vedeu

data/lib/vedeu/generator/application.rb

@@ -23,6 +23,7 @@ module Vedeu
         make_directory_structure
 
         copy_gemfile
+        copy_application_bootstrapper
         copy_application_controller
         copy_application_helper
         copy_global_keymap
@@ -37,9 +38,11 @@ module Vedeu
 
       # @return [void]
       def make_directory_structure
-        directories.each do |directory|
-          FileUtils.mkdir_p(name + directory)
-        end
+        directories.each { |directory| make_directory(name + directory) }
+      end
+
+      def copy_application_bootstrapper
+        make_file(source + '/application.erb', "#{name}/application.rb")
       end
 
       # @return [void]
@@ -49,21 +52,20 @@ module Vedeu
       end
 
       # @return [void]
-      def copy_application_helper
-        make_file(source + '/app/helpers/application_helper.erb',
-                  name + '/app/helpers/application_helper.rb')
+      def copy_application_executable
+        copy_file(source + '/bin/name', "#{name}/bin/#{name}")
       end
 
       # @return [void]
-      def copy_application_executable
-        FileUtils.cp(source + '/bin/name',
-                     "#{name}/bin/#{name}")
+      def copy_application_helper
+        make_file(source + '/app/helpers/application_helper.erb',
+                  name + '/app/helpers/application_helper.rb')
       end
 
       # @return [void]
       def copy_configuration
-        FileUtils.cp(source + '/config/configuration.rb',
-                     "#{name}/config/configuration.rb")
+        copy_file(source + '/config/configuration.rb',
+                  "#{name}/config/configuration.rb")
       end
 
       # @return [void]
@@ -74,7 +76,7 @@ module Vedeu
 
       # @return [void]
       def copy_gemfile
-        FileUtils.cp(source + '/Gemfile', "#{name}/Gemfile")
+        copy_file(source + '/Gemfile', "#{name}/Gemfile")
       end
 
       # @return [void]
@@ -84,14 +86,14 @@ module Vedeu
 
       # @return [void]
       def copy_global_keymap
-        FileUtils.cp(source + '/app/models/keymaps/_global_.rb',
-                     "#{name}/app/models/keymaps/_global_.rb")
+        copy_file(source + '/app/models/keymaps/_global_.rb',
+                  "#{name}/app/models/keymaps/_global_.rb")
       end
 
       # @return [void]
       def copy_system_keymap
-        FileUtils.cp(source + '/app/models/keymaps/_system_.rb',
-                     "#{name}/app/models/keymaps/_system_.rb")
+        copy_file(source + '/app/models/keymaps/_system_.rb',
+                  "#{name}/app/models/keymaps/_system_.rb")
       end
 
       # @return [Array<String>]

data/lib/vedeu/generator/helpers.rb

@@ -20,15 +20,40 @@ module Vedeu
         name
       end
 
+      # @param destination [String]
+      # @return [void]
+      def make_directory(destination)
+        Vedeu.log_stdout(type: :create, message: "#{destination}")
+
+        FileUtils.mkdir_p(destination)
+      end
+
+      # @param source [String]
+      # @param destination [String]
+      # @return [void]
+      def copy_file(source, destination)
+        Vedeu.log_stdout(type: :create, message: "#{destination}")
+
+        FileUtils.cp(source, destination)
+      end
+
       # @param source [String]
       # @param destination [String]
       # @return [void]
       def make_file(source, destination)
-        Vedeu.log_stdout(type: :create, message: "Writing: '#{destination}'")
+        Vedeu.log_stdout(type: :create, message: "#{destination}")
 
         File.write(destination, parse(source))
       end
 
+      # @param destination [String]
+      # @return [void]
+      def touch_file(destination)
+        Vedeu.log_stdout(type: :create, message: "#{destination}")
+
+        FileUtils.touch(destination)
+      end
+
       # @return [String]
       def name
         @_name ||= @name.downcase

data/lib/vedeu/generator/templates/application/{application.rb → application.erb}

@@ -1,4 +1,4 @@
-module YourAppName
+module <%= object.name_as_class %>
 
   class Application
 

data/lib/vedeu/generator/templates/application/bin/name

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 

data/lib/vedeu/generator/view.rb

@@ -55,7 +55,7 @@ module Vedeu
 
       # @return [void]
       def make_template_file
-        FileUtils.touch('.' + "/app/views/templates/#{name}.erb")
+        touch_file('.' + "/app/views/templates/#{name}.erb")
       end
 
       # @return [void]

data/lib/vedeu/models/focus.rb

@@ -95,8 +95,23 @@ module Vedeu
 
       update
     end
-    alias_method :next,       :next_item
-    alias_method :focus_next, :next_item
+    alias_method :next, :next_item
+
+    # Put the next visible interface relative to the current interfaces in
+    # focus.
+    #
+    # @return [String]
+    def next_visible_item
+      return update unless visible_items?
+
+      loop do
+        storage.rotate!
+        break if Vedeu.interfaces.by_name(current).visible?
+      end
+
+      update
+    end
+    alias_method :focus_next, :next_visible_item
 
     # Put the previous interface relative to the current interface in focus.
     #
@@ -109,9 +124,24 @@ module Vedeu
 
       update
     end
-    alias_method :prev,           :prev_item
-    alias_method :previous,       :prev_item
-    alias_method :focus_previous, :prev_item
+    alias_method :prev,     :prev_item
+    alias_method :previous, :prev_item
+
+    # Put the previous visible interface relative to the current interfaces in
+    # focus.
+    #
+    # @return [String]
+    def prev_visible_item
+      return update unless visible_items?
+
+      loop do
+        storage.rotate!(-1)
+        break if Vedeu.interfaces.by_name(current).visible?
+      end
+
+      update
+    end
+    alias_method :focus_previous, :prev_visible_item
 
     # Refresh the interface in focus.
     #
@@ -176,6 +206,11 @@ module Vedeu
       []
     end
 
+    # @return [Boolean]
+    def visible_items?
+      storage.any? { |name| Vedeu.interfaces.by_name(name).visible? }
+    end
+
   end # Focus
 
 end # Vedeu

data/lib/vedeu/output/colour.rb

@@ -40,7 +40,6 @@ module Vedeu
     # @param value []
     # @return [Object]
     def self.coerce(value)
-      # Vedeu::ColourCoercer.coerce(value)
       return value if value.is_a?(self)
       return new unless value.is_a?(Hash)
 

data/lib/vedeu/support/all.rb

@@ -1,4 +1,3 @@
-require_relative 'colour_coercer'
 require_relative 'common'
 require_relative 'options'
 require_relative 'template'

data/lib/vedeu/support/log.rb

@@ -97,8 +97,11 @@ module Vedeu
       #
       # @return [TrueClass]
       def log(message:, force: false, type: :info)
-        logger.debug([message_type(type),
-                      message_body(type, message)]) if enabled? || force
+        output = [message_type(type), message_body(type, message)]
+
+        logger.debug(output) if enabled? || force
+
+        output
       end
 
       # @return [TrueClass]
@@ -111,6 +114,8 @@ module Vedeu
         $stderr.puts [message_type(type), message_body(type, message)].join
       end
 
+      private
+
       # @return [TrueClass]
       def logger
         MonoLogger.new(log_file).tap do |log|
@@ -120,8 +125,6 @@ module Vedeu
         end
       end
 
-      private
-
       # @param message [String]
       # @return [String]
       def formatted_message(message)
@@ -183,7 +186,7 @@ module Vedeu
           @last = @now
         end
 
-        "[#{format(@time.to_s, '%7.4f')}] ".rjust(7)
+        "[#{format('%7.4f', @time.to_s)}] ".rjust(7)
       end
 
     end # Log eigenclass

data/lib/vedeu/support/timer.rb

@@ -28,12 +28,13 @@ module Vedeu
       @started = Time.now.to_f
     end
 
+    # Write an entry to the log file stating how long a section of code took in
+    # milliseconds. Useful for debugging performance.
+    #
     # @return [void]
     def measure
       work = yield
 
-      elapsed = ((Time.now.to_f - started) * 1000).round(3)
-
       Vedeu.log(type: :timer, message: "#{message} took #{elapsed}ms.")
 
       work
@@ -49,6 +50,13 @@ module Vedeu
     # @return [String]
     attr_reader :message
 
+    # Returns the elapsed time in milliseconds with 3 decimal places.
+    #
+    # @return [Float]
+    def elapsed
+      ((Time.now.to_f - started) * 1000).round(3)
+    end
+
   end # Timer
 
 end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.4.37'
+  VERSION = '0.4.38'
 
 end

data/test/lib/vedeu/bindings_test.rb

@@ -30,6 +30,8 @@ module Vedeu
       it { Vedeu.events.registered?(:_cursor_right_).must_equal(true) }
       it { Vedeu.events.registered?(:_cursor_up_).must_equal(true) }
       it { Vedeu.events.registered?(:_cursor_origin_).must_equal(true) }
+      it { Vedeu.events.registered?(:_cursor_position_).must_equal(true) }
+      it { Vedeu.events.registered?(:_cursor_reposition_).must_equal(true) }
       it { Vedeu.events.registered?(:_cursor_reset_).must_equal(true) }
     end
 

data/test/lib/vedeu/bootstrap_test.rb

@@ -22,7 +22,10 @@ module Vedeu
     describe '#start' do
       subject { instance.start }
 
-
+      it {
+        Vedeu::Launcher.expects(:execute!)
+        subject
+      }
     end
 
   end # Bootstrap

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

@@ -51,10 +51,18 @@ module Vedeu
       it { instance.must_respond_to(:ox) }
     end
 
+    describe '#ox=' do
+      it { instance.must_respond_to(:ox=) }
+    end
+
     describe '#oy' do
       it { instance.must_respond_to(:oy) }
     end
 
+    describe '#oy=' do
+      it { instance.must_respond_to(:oy=) }
+    end
+
     describe '#state' do
       it { instance.must_respond_to(:state) }
     end
@@ -68,10 +76,18 @@ module Vedeu
       it { instance.must_respond_to(:x) }
     end
 
+    describe '#x=' do
+      it { instance.must_respond_to(:x=) }
+    end
+
     describe '#y' do
       it { instance.must_respond_to(:y) }
     end
 
+    describe '#y=' do
+      it { instance.must_respond_to(:y=) }
+    end
+
     describe '#hide_cursor' do
       subject { instance.hide_cursor }
 

data/test/lib/vedeu/cursor/reposition_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Reposition do
+
+    let(:described) { Vedeu::Reposition }
+    let(:instance)  { described.new(entity, _name, y, x) }
+    let(:entity)    { Vedeu::Cursor }
+    let(:_name)     { 'reposition' }
+    let(:x)         { 4 }
+    let(:y)         { 7 }
+
+    before do
+      Vedeu::Cursor.new(name: _name, x: 1, y: 1, ox: 1, oy: 1)
+      Vedeu.stubs(:trigger)
+    end
+
+    after { Vedeu.cursors.reset }
+
+    describe '#initialize' do
+      subject { instance }
+
+      it { instance.must_be_instance_of(Vedeu::Reposition) }
+      it { instance.instance_variable_get('@entity').must_equal(entity) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
+      it { instance.instance_variable_get('@x').must_equal(x) }
+      it { instance.instance_variable_get('@y').must_equal(y) }
+    end
+
+    describe '.to' do
+      it { described.must_respond_to(:to) }
+    end
+
+    describe '#to' do
+      subject { instance.to }
+
+      it { subject.must_be_instance_of(entity) }
+      it { subject.x.must_equal(5) }
+      it { subject.y.must_equal(8) }
+      it { subject.ox.must_equal(4) }
+      it { subject.oy.must_equal(7) }
+    end
+
+  end # Reposition
+
+end # Vedeu

data/test/lib/vedeu/generator/application_test.rb

@@ -21,31 +21,11 @@ module Vedeu
       end
 
       describe '.generate' do
-        subject { described.generate(_name) }
+        it { described.must_respond_to(:generate) }
       end
 
       describe '#generate' do
-        it { instance.must_respond_to(:generate) }
-      end
-
-      describe '#name_as_class' do
-        subject { instance.name_as_class }
-
-        context 'when the name is a single value' do
-          let(:_name) { 'VEDEU' }
-
-          it { subject.must_equal('Vedeu') }
-        end
-
-        context 'when the name is an underscored value' do
-          it { subject.must_equal('MyFirstApp') }
-        end
-
-        context 'when the name contains hyphens' do
-          let(:_name) { 'hyphenated-APP' }
-
-          it { subject.must_equal('HyphenatedApp')}
-        end
+        subject { instance.generate }
       end
 
     end # Application

data/test/lib/vedeu/generator/helpers_test.rb

@@ -20,11 +20,11 @@ module Vedeu
       let(:instance)  { Vedeu::Generator::HelpersTestClass.new(_name) }
       let(:_name)     { 'my_first_app' }
 
-      # describe '#app_name' do
-      #   subject { instance.app_name }
+      describe '#app_name' do
+        subject { instance.app_name }
 
-      #   it { subject.must_equal('MyFirstApp') }
-      # end
+        # it { subject.must_equal('MyFirstApp') }
+      end
 
       describe '#app_name_as_snake_case' do
         let(:_name) { 'MyFirstApp' }
@@ -34,6 +34,19 @@ module Vedeu
         it { subject.must_equal('my_first_app') }
       end
 
+      describe '#make_directory' do
+        let(:destination) {}
+
+        subject { instance.make_directory(destination) }
+      end
+
+      describe '#copy_file' do
+        let(:source)      {}
+        let(:destination) {}
+
+        subject { instance.copy_file(source, destination) }
+      end
+
       describe '#make_file' do
         let(:source)      {}
         let(:destination) {}
@@ -41,6 +54,12 @@ module Vedeu
         subject { instance.make_file(source, destination) }
       end
 
+      describe '#touch_file' do
+        let(:destination) {}
+
+        subject { instance.touch_file(destination) }
+      end
+
       describe '#name' do
         let(:_name) { 'My_First_APP' }
 
@@ -54,15 +73,27 @@ module Vedeu
       describe '#name_as_class' do
         subject { instance.name_as_class }
 
-        it { subject.must_be_instance_of(String) }
+        context 'when the name is a single value' do
+          let(:_name) { 'VEDEU' }
+
+          it { subject.must_equal('Vedeu') }
+        end
+
+        context 'when the name is an underscored value' do
+          it { subject.must_equal('MyFirstApp') }
+        end
+
+        context 'when the name contains hyphens' do
+          let(:_name) { 'hyphenated-APP' }
 
-        it { subject.must_equal('MyFirstApp') }
+          it { subject.must_equal('HyphenatedApp')}
+        end
       end
 
-      describe '#parse_file' do
+      describe '#parse' do
         let(:source) {}
 
-        subject { instance.parse_file(source) }
+        subject { instance.parse(source) }
       end
 
       describe '#source' do

data/test/lib/vedeu/generator/view_test.rb

@@ -21,11 +21,11 @@ module Vedeu
       end
 
       describe '.generate' do
-        subject { described.generate(_name) }
+        it { described.must_respond_to(:generate) }
       end
 
       describe '#generate' do
-        it { instance.must_respond_to(:generate) }
+        subject { instance.generate }
       end
 
     end # View

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

@@ -9,9 +9,6 @@ module Vedeu
     before do
       Focus.reset
       Vedeu.interfaces.reset
-      Vedeu.interface('thallium') {}
-      Vedeu.interface('lead')     {}
-      Vedeu.interface('bismuth')  {}
     end
     after do
       Vedeu::Focus.reset
@@ -163,6 +160,36 @@ module Vedeu
       end
     end
 
+    describe '#next_visible_item' do
+      before do
+        Vedeu.interface('gold') { visible true }
+        Vedeu.interface('silver') { visible true }
+        Vedeu.interface('platinum') { visible false }
+      end
+
+      it 'the next visible interface is focussed when the method is called' do
+        Focus.next_visible_item.must_equal('silver')
+      end
+
+      context 'when there are no visible interfaces' do
+        before do
+          Vedeu.interface('gold') { visible false }
+          Vedeu.interface('silver') { visible false }
+          Vedeu.interface('platinum') { visible false }
+        end
+
+        it 'puts the first interface defined in focus' do
+          Focus.next_visible_item.must_equal('gold')
+        end
+      end
+
+      context 'when there are no interfaces' do
+        before { Vedeu::Focus.reset }
+
+        it { Focus.next_visible_item.must_equal(false) }
+      end
+    end
+
     describe '#prev_item' do
       it 'the previous interface is focussed when the method is called' do
         Focus.add('thallium')
@@ -178,6 +205,36 @@ module Vedeu
       end
     end
 
+    describe '#prev_visible_item' do
+      before do
+        Vedeu.interface('gold') { visible true }
+        Vedeu.interface('silver') { visible true }
+        Vedeu.interface('platinum') { visible false }
+      end
+
+      it 'the previous visible interface is focussed when the method is called' do
+        Focus.prev_visible_item.must_equal('silver')
+      end
+
+      context 'when there are no visible interfaces' do
+        before do
+          Vedeu.interface('gold') { visible false }
+          Vedeu.interface('silver') { visible false }
+          Vedeu.interface('platinum') { visible false }
+        end
+
+        it 'puts the first interface defined in focus' do
+          Focus.prev_visible_item.must_equal('gold')
+        end
+      end
+
+      context 'when there are no interfaces' do
+        before { Vedeu::Focus.reset }
+
+        it { Focus.prev_visible_item.must_equal(false) }
+      end
+    end
+
     describe '#refresh' do
       before do
         Focus.add('thallium')

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

@@ -43,6 +43,7 @@ module Vedeu
 
         it { subject.must_be_instance_of(described) }
         it { subject.attributes.must_equal(attributes) }
+        it { subject.to_s.must_equal("\e[38;2;34;0;34m\e[48;2;255;0;255m") }
       end
 
       context 'when the value is a Hash' do
@@ -62,6 +63,7 @@ module Vedeu
 
             it { subject.must_be_instance_of(described) }
             it { subject.attributes.must_equal(attributes) }
+            it { subject.to_s.must_equal("\e[38;2;0;255;0m\e[48;2;0;34;0m") }
           end
 
           context 'when the value of :colour is a Hash' do
@@ -79,6 +81,9 @@ module Vedeu
                 background: '#7700ff',
                 foreground: '',
               }) }
+              it {
+                subject.to_s.must_equal("\e[48;2;119;0;255m")
+              }
             end
 
             context 'and a :foreground is defined' do
@@ -95,6 +100,9 @@ module Vedeu
                 background: '',
                 foreground: '#220077',
               }) }
+              it {
+                subject.to_s.must_equal("\e[38;2;34;0;119m")
+              }
             end
 
             context 'and neither a :background or :foreground is defined' do
@@ -109,6 +117,7 @@ module Vedeu
                 background: '',
                 foreground: '',
               }) }
+              it { subject.to_s.must_equal('') }
             end
           end
         end
@@ -126,6 +135,7 @@ module Vedeu
               background: '#000022',
               foreground: '',
             }) }
+            it { subject.to_s.must_equal("\e[48;2;0;0;34m") }
           end
 
           context 'when the hash has a :foreground defined' do
@@ -140,6 +150,7 @@ module Vedeu
               background: '',
               foreground: '#aadd00',
             }) }
+            it { subject.to_s.must_equal("\e[38;2;170;221;0m") }
           end
 
           context 'when neither a :background or :foreground is defined' do
@@ -154,6 +165,7 @@ module Vedeu
               background: '',
               foreground: '',
             }) }
+            it { subject.to_s.must_equal('') }
           end
         end
       end

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

@@ -5,26 +5,16 @@ module Vedeu
   describe Log do
 
     let(:described) { Vedeu::Log }
-    let(:_message) {}
-    let(:force) {}
-    let(:type) {}
+    let(:_message)  { 'Some message...' }
+    let(:force)     { false }
+    let(:type)      { :info }
 
     describe '.log' do
       subject { described.log(message: _message, force: force, type: type) }
 
-      context 'when logging has been forced' do
-        # it { skip }
-      end
-
-      context 'when logging has not been forced' do
-        context 'when the configuration requests logging' do
-          # it { skip }
-        end
-
-        context 'when the configuration does not request logging' do
-          # it { skip }
-        end
-      end
+      it { subject.must_equal(
+        ["\e[97m[info]   \e[39m", "\e[39mSome message...\e[39m"]
+      ) }
     end
 
     describe '.log_stdout' do
@@ -53,12 +43,6 @@ module Vedeu
       }
     end
 
-    describe '.logger' do
-      subject { described.logger }
-
-      # it { skip }
-    end
-
   end # Log
 
 end # Vedeu

data/vedeu.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'aruba',              '0.6.2'
   spec.add_development_dependency 'cucumber',           '2.0.0'
-  spec.add_development_dependency 'guard',              '2.12.6'
+  spec.add_development_dependency 'guard',              '2.12.7'
   spec.add_development_dependency 'guard-bundler',      '2.1.0'
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'inch',               '0.6.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.37
+  version: 0.4.38
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.6
+        version: 2.12.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.6
+        version: 2.12.7
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +340,7 @@ files:
 - lib/vedeu/cursor/cursor.rb
 - lib/vedeu/cursor/move.rb
 - lib/vedeu/cursor/refresh_cursor.rb
+- lib/vedeu/cursor/reposition.rb
 - lib/vedeu/debug.rb
 - lib/vedeu/distributed/all.rb
 - lib/vedeu/distributed/client.rb
@@ -386,7 +387,7 @@ files:
 - lib/vedeu/generator/templates/application/app/views/interfaces/name.erb
 - lib/vedeu/generator/templates/application/app/views/name.erb
 - lib/vedeu/generator/templates/application/app/views/templates/name.erb
-- lib/vedeu/generator/templates/application/application.rb
+- lib/vedeu/generator/templates/application/application.erb
 - lib/vedeu/generator/templates/application/bin/name
 - lib/vedeu/generator/templates/application/config/app_name.erb
 - lib/vedeu/generator/templates/application/config/configuration.rb
@@ -484,7 +485,6 @@ files:
 - lib/vedeu/storage/fifo_store.rb
 - lib/vedeu/storage/store.rb
 - lib/vedeu/support/all.rb
-- lib/vedeu/support/colour_coercer.rb
 - lib/vedeu/support/common.rb
 - lib/vedeu/support/log.rb
 - lib/vedeu/support/options.rb
@@ -515,6 +515,7 @@ files:
 - test/lib/vedeu/cursor/cursor_test.rb
 - test/lib/vedeu/cursor/move_test.rb
 - test/lib/vedeu/cursor/refresh_cursor_test.rb
+- test/lib/vedeu/cursor/reposition_test.rb
 - test/lib/vedeu/distributed/client_test.rb
 - test/lib/vedeu/distributed/server_test.rb
 - test/lib/vedeu/distributed/subprocess_test.rb
@@ -617,7 +618,6 @@ files:
 - test/lib/vedeu/storage/conveyor_store_test.rb
 - test/lib/vedeu/storage/fifo_store_test.rb
 - test/lib/vedeu/storage/store_test.rb
-- test/lib/vedeu/support/colour_coercer_test.rb
 - test/lib/vedeu/support/common_test.rb
 - test/lib/vedeu/support/log_test.rb
 - test/lib/vedeu/support/options_test.rb
@@ -679,6 +679,7 @@ test_files:
 - test/lib/vedeu/cursor/cursor_test.rb
 - test/lib/vedeu/cursor/move_test.rb
 - test/lib/vedeu/cursor/refresh_cursor_test.rb
+- test/lib/vedeu/cursor/reposition_test.rb
 - test/lib/vedeu/distributed/client_test.rb
 - test/lib/vedeu/distributed/server_test.rb
 - test/lib/vedeu/distributed/subprocess_test.rb
@@ -781,7 +782,6 @@ test_files:
 - test/lib/vedeu/storage/conveyor_store_test.rb
 - test/lib/vedeu/storage/fifo_store_test.rb
 - test/lib/vedeu/storage/store_test.rb
-- test/lib/vedeu/support/colour_coercer_test.rb
 - test/lib/vedeu/support/common_test.rb
 - test/lib/vedeu/support/log_test.rb
 - test/lib/vedeu/support/options_test.rb

data/lib/vedeu/support/colour_coercer.rb

@@ -1,97 +0,0 @@
-module Vedeu
-
-  class ColourCoercer
-
-    # @param value [Vedeu::Colour|Hash<Symbol => Fixnum|String|Symbol>]
-    # @return [Vedeu::Colour]
-    def self.coerce(value)
-      new(value).coerce
-    end
-
-    # @param value [Hash<Symbol => Fixnum|String|Symbol>]
-    def self.from_hash(value)
-      new(value).from_hash
-    end
-
-    # @param value [Vedeu::Colour|Hash<Symbol => Fixnum|String|Symbol]
-    # @return [Vedeu::ColourCoercer]
-    def initialize(value)
-      @value = value
-    end
-
-    # @return [Vedeu::Colour]
-    def coerce
-      return value if colour?
-
-      if hash?
-        Vedeu::ColourCoercer.from_hash(value)
-
-      else
-        build
-
-      end
-    end
-
-    # @return [Vedeu::Colour]
-    def from_hash
-      return build unless value
-
-      if colour_key?
-        Vedeu::ColourCoercer.coerce(value[:colour])
-
-      elsif background? || foreground?
-        build_from_hash(value)
-
-      else
-        build
-
-      end
-    end
-
-    protected
-
-    # @!attribute [r] colour
-    # @return [void]
-    attr_reader :value
-
-    private
-
-    # @return [Vedeu::Colour]
-    def build
-      Vedeu::Colour.new
-    end
-
-    # @param value [Hash<Symbol => Fixnum|String|Symbol>]
-    # @return [Vedeu::Colour]
-    def build_from_hash(value)
-      Vedeu::Colour.new(value)
-    end
-
-    # @return [Boolean]
-    def colour?
-      value.is_a?(Vedeu::Colour)
-    end
-
-    # @return [Boolean]
-    def hash?
-      value.is_a?(Hash)
-    end
-
-    # @return [Boolean]
-    def background?
-      value.key?(:background)
-    end
-
-    # @return [Boolean]
-    def colour_key?
-      value.key?(:colour)
-    end
-
-    # @return [Boolean]
-    def foreground?
-      value.key?(:foreground)
-    end
-
-  end # ColourCoercer
-
-end # Vedeu

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

@@ -1,85 +0,0 @@
-require 'test_helper'
-
-module Vedeu
-
-  describe ColourCoercer do
-
-    let(:described) { Vedeu::ColourCoercer }
-    let(:instance)  { described.new(_value) }
-    let(:_value)    { }
-
-    describe '#initialize' do
-      subject { instance }
-    end
-
-    describe '.coerce' do
-      it { described.must_respond_to(:coerce) }
-    end
-
-    describe '.from_hash' do
-      it { described.must_respond_to(:from_hash) }
-    end
-
-    describe '#coerce' do
-      subject { instance.coerce }
-
-      context 'when no value is given' do
-        it { subject.must_be_instance_of(Vedeu::Colour) }
-      end
-
-      context 'when a value is given' do
-        context 'when the value is a Vedeu::Colour' do
-          let(:_value) { Vedeu::Colour.new }
-
-          it { subject.must_equal(_value) }
-        end
-
-        context 'when the value is a Hash' do
-          let(:_value) { { } }
-
-          it {
-            Vedeu::ColourCoercer.expects(:from_hash).with(_value)
-            subject
-          }
-        end
-      end
-    end
-
-    describe '#from_hash' do
-      subject { instance.from_hash }
-
-      context 'when no value is given' do
-        it { subject.must_be_instance_of(Vedeu::Colour) }
-      end
-
-      context 'when a value is given' do
-        context 'when the value has a :colour key' do
-          let(:_value) { { colour: colour_value } }
-          let(:colour_value) { Vedeu::Colour.new }
-
-          it {
-            Vedeu::ColourCoercer.expects(:coerce).with(colour_value)
-            subject
-          }
-        end
-
-        context 'when the value has a :background or :foreground key' do
-          let(:_value) { { background: '#000000', foreground: '#ffffff' } }
-
-          it {
-            Vedeu::Colour.expects(:new).with(_value)
-            subject
-          }
-        end
-
-        context 'when the value is empty or has unhandled keys' do
-          let(:_value) { { unhandled: :some_value } }
-
-          it { subject.must_be_instance_of(Vedeu::Colour) }
-        end
-      end
-    end
-
-  end # ColourCoercer
-
-end # Vedeu