vedeu 0.8.7 → 0.8.8

data/lib/vedeu/renderers/file.rb

@@ -10,11 +10,6 @@ module Vedeu
 
       include Vedeu::Renderers::Options
 
-      # @return [String]
-      def clear
-        render('')
-      end
-
       # Render the output (either content or clearing) to a file.
       #
       # @return [String]

data/lib/vedeu/renderers/json.rb

@@ -12,7 +12,7 @@ module Vedeu
 
       # Render a cleared output.
       #
-      # @return [void]
+      # @return [Hash]
       def clear
         render({})
       end

data/lib/vedeu/renderers/options.rb

@@ -36,7 +36,9 @@ module Vedeu
         @options = defaults.merge!(opts || {})
       end
 
-      # @return [void]
+      # Render a cleared output.
+      #
+      # @return [String]
       def clear
         render('')
       end

data/lib/vedeu/renderers/text.rb

@@ -12,13 +12,6 @@ module Vedeu
 
       include Vedeu::Renderers::Options
 
-      # Render a cleared output.
-      #
-      # @return [String]
-      def clear
-        render('')
-      end
-
       private
 
       # Combine all characters in a row to produce a line, then all

data/lib/vedeu/runtime/bootstrap.rb

@@ -82,7 +82,7 @@ module Vedeu
           Vedeu.trigger(:_goto_, *Vedeu.config.root)
 
         else
-          Vedeu.log_stderr(type: :debug, message: client_initialize_error)
+          Vedeu.log_stderr(message: client_initialize_error)
 
         end
       end

data/lib/vedeu/runtime/launcher.rb

@@ -69,15 +69,18 @@ module Vedeu
       terminate!
 
     rescue StandardError => uncaught_exception
+      message = uncaught_exception.message + "\n"
+      trace   = uncaught_exception.backtrace.join("\n")
+
       output = if Vedeu.config.debug?
-                 uncaught_exception.message + "\n" +
-                 uncaught_exception.backtrace.join("\n")
+                 message + Vedeu.esc.screen_colour_reset + trace
+
                else
-                 uncaught_exception.message
+                 message
+
                end
 
-      Vedeu.log(type: :error, message: output)
-      Vedeu.log_stdout(type: :error, message: output)
+      Vedeu.log_stderr(message: output)
     end
 
     protected

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.7'.freeze
+  VERSION = '0.8.8'.freeze
 
 end

data/test/lib/vedeu/application/application_controller_test.rb

@@ -11,10 +11,8 @@ module Vedeu
     let(:params)    { {} }
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@params').must_equal(params) }
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@params').must_equal(params) }
     end
 
     describe '#redirect_to' do

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

@@ -61,18 +61,16 @@ module Vedeu
       end
 
       describe '#initialize' do
-        subject { instance }
-
-        it { subject.must_be_instance_of(described) }
-        it { subject.instance_variable_get('@name').must_equal( _name) }
-        it { subject.instance_variable_get('@ox').must_equal(ox) }
-        it { subject.instance_variable_get('@oy').must_equal(oy) }
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@name').must_equal( _name) }
+        it { instance.instance_variable_get('@ox').must_equal(ox) }
+        it { instance.instance_variable_get('@oy').must_equal(oy) }
         it do
-          subject.instance_variable_get('@repository').must_equal(repository)
+          instance.instance_variable_get('@repository').must_equal(repository)
         end
-        it { subject.instance_variable_get('@visible').must_equal(true) }
-        it { subject.instance_variable_get('@x').must_equal(x) }
-        it { subject.instance_variable_get('@y').must_equal(y) }
+        it { instance.instance_variable_get('@visible').must_equal(true) }
+        it { instance.instance_variable_get('@x').must_equal(x) }
+        it { instance.instance_variable_get('@y').must_equal(y) }
       end
 
       describe '#attributes' do
@@ -147,8 +145,7 @@ module Vedeu
 
       describe '#inspect' do
         let(:expected) {
-          "<Vedeu::Cursors::Cursor name:'vedeu_cursors_cursor', x:19, y:8, ox:3, oy:2, " \
-          "visible:true>"
+          "name:'vedeu_cursors_cursor' x:19 y:8 ox:3 oy:2 visible:true"
         }
 
         subject { instance.inspect }

data/test/lib/vedeu/cursors/move_test.rb

@@ -9,15 +9,19 @@ module Vedeu
     describe Move do
 
       let(:described) { Vedeu::Cursors::Move }
-      let(:instance)  { described.new(_name, direction) }
+      let(:instance)  { described.new(_name, direction, offset) }
       let(:_name)     {}
       let(:direction) {}
+      let(:offset)    { 1 }
       let(:visible)   { true }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@name').must_equal(_name) }
-        it { instance.instance_variable_get('@direction').must_equal(direction) }
+        it do
+          instance.instance_variable_get('@direction').must_equal(direction)
+        end
+        it { instance.instance_variable_get('@offset').must_equal(offset) }
       end
 
       describe '.move' do
@@ -29,7 +33,7 @@ module Vedeu
           Vedeu.stubs(:trigger).with(:_refresh_cursor_, _name)
         end
 
-        subject { described.move(_name, direction) }
+        subject { described.move(_name, direction, offset) }
 
         context 'when a name is given' do
           let(:_name) { :vedeu_cursors_move }

data/test/lib/vedeu/geometries/move_test.rb

@@ -12,7 +12,7 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:direction)  {}
       let(:_name)      { :vedeu_geometries_move }
-      let(:offset)     {}
+      let(:offset)     { 1 }
       let(:attributes) {
         {
           direction: direction,
@@ -24,14 +24,7 @@ module Vedeu
         Vedeu::Geometries::Geometry.new(name: _name, x: 2, xn: 8, y: 2, yn: 8)
       }
 
-      before do
-        Vedeu.stubs(:trigger).with(:_movement_refresh_, _name)
-        Vedeu.stubs(:trigger).with(:_cursor_down_, _name)
-        Vedeu.stubs(:trigger).with(:_cursor_left_, _name)
-        Vedeu.stubs(:trigger).with(:_cursor_origin_, _name)
-        Vedeu.stubs(:trigger).with(:_cursor_right_, _name)
-        Vedeu.stubs(:trigger).with(:_cursor_up_, _name)
-      end
+      before { Vedeu.stubs(:trigger).with(:_movement_refresh_, _name) }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -81,6 +74,10 @@ module Vedeu
         context 'when the direction is :down' do
           let(:direction) { :down }
 
+          before do
+            Vedeu.stubs(:trigger).with(:_cursor_down_, _name, 0)
+          end
+
           context 'when y + offset > terminal height' do
             let(:offset) { 3 }
 
@@ -99,6 +96,10 @@ module Vedeu
         context 'when the direction is :left' do
           let(:direction) { :left }
 
+          before do
+            Vedeu.stubs(:trigger).with(:_cursor_left_, _name, 0)
+          end
+
           context 'when x - offset < 1' do
             let(:offset) { 3 }
 
@@ -124,6 +125,10 @@ module Vedeu
         context 'when the direction is :origin' do
           let(:direction) { :origin }
 
+          before do
+            Vedeu.stubs(:trigger).with(:_cursor_origin_, _name)
+          end
+
           it { subject.must_be_instance_of(Vedeu::Geometries::Geometry) }
           it { subject.x.must_equal(1) }
           it { subject.xn.must_equal(7) }
@@ -134,6 +139,10 @@ module Vedeu
         context 'when the direction is :right' do
           let(:direction) { :right }
 
+          before do
+            Vedeu.stubs(:trigger).with(:_cursor_right_, _name, 0)
+          end
+
           context 'when xn + offset > terminal width' do
             let(:offset) { 3 }
 
@@ -152,6 +161,10 @@ module Vedeu
         context 'when the direction is :up' do
           let(:direction) { :up }
 
+          before do
+            Vedeu.stubs(:trigger).with(:_cursor_up_, _name, 0)
+          end
+
           context 'when y - offset < 1' do
             let(:offset) { 3 }
 

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

@@ -39,105 +39,103 @@ module Vedeu
       let(:zindex)         { 1 }
 
       describe '#initialize' do
-        subject { instance }
-
-        it { subject.must_be_instance_of(described) }
-        it { subject.instance_variable_get('@client').must_equal(client) }
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@client').must_equal(client) }
         it do
-          subject.instance_variable_get('@cursor_visible').
+          instance.instance_variable_get('@cursor_visible').
             must_equal(cursor_visible)
         end
-        it { subject.instance_variable_get('@delay').must_equal(delay) }
-        it { subject.instance_variable_get('@editable').must_equal(editable) }
-        it { subject.instance_variable_get('@group').must_equal(group) }
-        it { subject.instance_variable_get('@name').must_equal(_name) }
-        it { subject.instance_variable_get('@parent').must_equal(parent) }
+        it { instance.instance_variable_get('@delay').must_equal(delay) }
+        it { instance.instance_variable_get('@editable').must_equal(editable) }
+        it { instance.instance_variable_get('@group').must_equal(group) }
+        it { instance.instance_variable_get('@name').must_equal(_name) }
+        it { instance.instance_variable_get('@parent').must_equal(parent) }
         it do
-          subject.instance_variable_get('@repository').must_equal(repository)
+          instance.instance_variable_get('@repository').must_equal(repository)
         end
-        it { subject.instance_variable_get('@visible').must_equal(visible) }
-        it { subject.instance_variable_get('@zindex').must_equal(zindex) }
+        it { instance.instance_variable_get('@visible').must_equal(visible) }
+        it { instance.instance_variable_get('@zindex').must_equal(zindex) }
       end
 
-          describe '#client' do
-it { instance.must_respond_to(:client) }
-end
+      describe '#client' do
+        it { instance.must_respond_to(:client) }
+      end
 
-          describe '#client=' do
-it { instance.must_respond_to(:client=) }
-end
+      describe '#client=' do
+        it { instance.must_respond_to(:client=) }
+      end
 
-          describe '#cursor_visible' do
-it { instance.must_respond_to(:cursor_visible) }
-end
+      describe '#cursor_visible' do
+        it { instance.must_respond_to(:cursor_visible) }
+      end
 
-          describe '#cursor_visible=' do
-it { instance.must_respond_to(:cursor_visible=) }
-end
+      describe '#cursor_visible=' do
+        it { instance.must_respond_to(:cursor_visible=) }
+      end
 
-          describe '#delay' do
-it { instance.must_respond_to(:delay) }
-end
+      describe '#delay' do
+        it { instance.must_respond_to(:delay) }
+      end
 
-          describe '#delay=' do
-it { instance.must_respond_to(:delay=) }
-end
+      describe '#delay=' do
+        it { instance.must_respond_to(:delay=) }
+      end
 
-          describe '#editable' do
-it { instance.must_respond_to(:editable) }
-end
+      describe '#editable' do
+        it { instance.must_respond_to(:editable) }
+      end
 
-          describe '#editable=' do
-it { instance.must_respond_to(:editable=) }
-end
+      describe '#editable=' do
+        it { instance.must_respond_to(:editable=) }
+      end
 
-          describe '#editable?' do
-it { instance.must_respond_to(:editable?) }
-end
+      describe '#editable?' do
+        it { instance.must_respond_to(:editable?) }
+      end
 
-          describe '#group' do
-it { instance.must_respond_to(:group) }
-end
+      describe '#group' do
+        it { instance.must_respond_to(:group) }
+      end
 
-          describe '#group=' do
-it { instance.must_respond_to(:group=) }
-end
+      describe '#group=' do
+        it { instance.must_respond_to(:group=) }
+      end
 
-          describe '#name' do
-it { instance.must_respond_to(:name) }
-end
+      describe '#name' do
+        it { instance.must_respond_to(:name) }
+      end
 
-          describe '#name=' do
-it { instance.must_respond_to(:name=) }
-end
+      describe '#name=' do
+        it { instance.must_respond_to(:name=) }
+      end
 
-          describe '#parent' do
-it { instance.must_respond_to(:parent) }
-end
+      describe '#parent' do
+        it { instance.must_respond_to(:parent) }
+      end
 
-          describe '#parent=' do
-it { instance.must_respond_to(:parent=) }
-end
+      describe '#parent=' do
+        it { instance.must_respond_to(:parent=) }
+      end
 
-          describe '#zindex' do
-it { instance.must_respond_to(:zindex) }
-end
+      describe '#zindex' do
+        it { instance.must_respond_to(:zindex) }
+      end
 
-          describe '#zindex=' do
-it { instance.must_respond_to(:zindex=) }
-end
+      describe '#zindex=' do
+        it { instance.must_respond_to(:zindex=) }
+      end
 
-          describe '#visible' do
-it { instance.must_respond_to(:visible) }
-end
+      describe '#visible' do
+        it { instance.must_respond_to(:visible) }
+      end
 
-          describe '#visible=' do
-it { instance.must_respond_to(:visible=) }
-end
+      describe '#visible=' do
+        it { instance.must_respond_to(:visible=) }
+      end
 
-          describe '#visible?' do
-it { instance.must_respond_to(:visible?) }
-end
+      describe '#visible?' do
+        it { instance.must_respond_to(:visible?) }
+      end
 
       describe '#attributes' do
         subject { instance.attributes }

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

@@ -49,7 +49,7 @@ module Vedeu
         end
       end
 
-      describe '.log_stdout' do
+      describe '.log_stderr' do
         let(:type)     { :debug }
         let(:_message) { 'Logging to stderr...' }
 

data/test/lib/vedeu/runtime/launcher_test.rb

@@ -39,7 +39,6 @@ module Vedeu
 
     describe '#execute!' do
       before do
-        Vedeu.stubs(:log_stdout)
         Vedeu::Runtime::Application.stubs(:start)
         Kernel.stubs(:exit)
         Kernel.stubs(:puts)
@@ -63,8 +62,10 @@ module Vedeu
         context 'but debugging is disabled' do
           let(:debug) { false }
 
+          before { Vedeu.stubs(:log_stderr).with(message: "Oops!\n") }
+
           it do
-            Vedeu.expects(:log_stdout).with(type: :error, message: 'Oops!')
+            Vedeu.expects(:log_stderr).with(message: "Oops!\n")
             subject
           end
         end
@@ -72,9 +73,9 @@ module Vedeu
         context 'and debugging is enabled' do
           let(:debug) { true }
 
-          # Need to stub a backtrace.
+          # @todo Need to stub a backtrace.
           # it do
-          #   Vedeu.expects(:log_stdout).with(type: :error, message: 'Oops!')
+          #   Vedeu.expects(:log_stderr).with(message: "Oops!\n")
           #   subject
           # end
         end